Adding tuscany's website to their svn repo for svnpubsub

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1640879 13f79535-47bb-0310-9956-ffa450edef68
author: coreyg <coreyg@13f79535-47bb-0310-9956-ffa450edef68> 2014-11-21 09:30:19 +0000
committer: coreyg <coreyg@13f79535-47bb-0310-9956-ffa450edef68> 2014-11-21 09:30:19 +0000
commit: 200a40b332420f94992eb39a6d0ea1cf1490ffc4 (patch)
tree: 1c76ef1d254c7bfc91128a313d319bd60da9d01e
parent: 85f53ab6ab4f664d63774c94b672a875c9e52b8a (diff)
2138 files changed, 153760 insertions, 0 deletions
diff --git a/site/trunk/site-publish/2.html b/site/trunk/site-publish/2.html
new file mode 100644
index 0000000000..d2f886b54a
--- /dev/null
+++ b/site/trunk/site-publish/2.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : 2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54970">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="2">2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/2007/02/07/news.html b/site/trunk/site-publish/2007/02/07/news.html
new file mode 100644
index 0000000000..667b3e0c7a
--- /dev/null
+++ b/site/trunk/site-publish/2007/02/07/news.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : news?</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44716">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="../../../home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;2007&nbsp;&gt;&nbsp;02&nbsp;&gt;&nbsp;07&nbsp;&gt;&nbsp;<A href="" title="news?">news?</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>what is news feature?</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/2008/11/11/menuall.html b/site/trunk/site-publish/2008/11/11/menuall.html
new file mode 100644
index 0000000000..db7d392c2a
--- /dev/null
+++ b/site/trunk/site-publish/2008/11/11/menuall.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/2008/11/11/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : MenuAll</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot&postingDay=2008%2F11%2F11"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=101633">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="../../../home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;2008&nbsp;&gt;&nbsp;11&nbsp;&gt;&nbsp;11&nbsp;&gt;&nbsp;<A href="" title="MenuAll">MenuAll</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>subproject</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/adding-the-spring-component-type.html b/site/trunk/site-publish/adding-the-spring-component-type.html
new file mode 100644
index 0000000000..e8542603fb
--- /dev/null
+++ b/site/trunk/site-publish/adding-the-spring-component-type.html
@@ -0,0 +1,157 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Adding the Spring Component Type : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=53225">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">SCA Java Extension Development Guide</A>&nbsp;&gt;&nbsp;<A href="mike-edwards-ramble-through-adding-a-new-component-type.html" title="Mike Edwards Ramble through Adding a New Component Type">Mike Edwards Ramble through Adding a New Component Type</A>&nbsp;&gt;&nbsp;<A href="" title="Adding the Spring Component Type">Adding the Spring Component Type</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>(3rd May 2007) This pages and the pages hung off it describe the creation of the module which supports the Spring Component Type that I am working on for a demo.  This might be useful to anyone looking to build their own Component Type implementation.</P>
+
+<H3><A name="AddingtheSpringComponentType-Sequence"></A>Sequence</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Order </TH>
+<TH class="confluenceTh"> Work Item <BR clear="all"> </TH>
+<TH class="confluenceTh"> Comment </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> 0 <BR clear="all"> </TD>
+<TD class="confluenceTd"> implementation-spring module created <BR clear="all">
+<BR clear="all">
+org.apache.tuscany.implementation.spring package </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> Created ModuleActivator file <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> Create SpringModuleActivator class </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3 <BR clear="all"> </TD>
+<TD class="confluenceTd"> Create SpringArtifactProcessor class <BR clear="all"> </TD>
+<TD class="confluenceTd"> Reads the implementation.spring xml <BR clear="all">
+ &#45; one required attribute = location, which specifies the location of the Spring application context<BR clear="all">
+ Creates the implementationSpring instance<BR clear="all">
+ Initiates resolution of the componentType of the Spring application context </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="AddingtheSpringComponentType-ModuleActivatorfile"></A>ModuleActivator file</H3>
+
+<P>Placed into the resources/META-INF/services directory:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"># Implementation class <SPAN class="code-keyword">for</SPAN> the ExtensionActivator
+org.apache.tuscany.implementation.script.ScriptModuleActivator</PRE>
+</DIV></DIV>
+
+<H3><A name="AddingtheSpringComponentType-ResolutionoftheComponentTypeofSpringapplicationcontext"></A>Resolution of the ComponentType of Spring application context</H3>
+
+<P>ComponentType of the Spring application-context is performed by reading the application-context.xml file and by introspecting the Java beans which it references.&nbsp;</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/adding-the-spring-implementation-type.html b/site/trunk/site-publish/adding-the-spring-implementation-type.html
new file mode 100644
index 0000000000..e9718e06cc
--- /dev/null
+++ b/site/trunk/site-publish/adding-the-spring-implementation-type.html
@@ -0,0 +1,273 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Adding the Spring Implementation Type</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53225">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">SCA Java Extension Development Guide</A>&nbsp;&gt;&nbsp;<A href="mike-edwards-ramble-through-adding-a-new-implementation-type.html" title="Mike Edwards Ramble through Adding a New Implementation Type">Mike Edwards Ramble through Adding a New Implementation Type</A>&nbsp;&gt;&nbsp;<A href="" title="Adding the Spring Implementation Type">Adding the Spring Implementation Type</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>(3rd May 2007) This pages and the pages hung off it describe the creation of the module which supports the Spring Component Type that I am working on for a demo.  This might be useful to anyone looking to build their own Component Type implementation.</P>
+
+<H2><A name="AddingtheSpringImplementationType-Sequence"></A>Sequence</H2>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Order </TH>
+<TH class="confluenceTh"> Work Item <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Comment </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> 0 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> implementation-spring module created <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+org.apache.tuscany.implementation.spring package </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> Created ModuleActivator file <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Points at the SpringModuleActivator class <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> Create SpringModuleActivator class </TD>
+<TD class="confluenceTd"> Core of the Spring implementation module </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Create SpringArtifactProcessor class <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Reads the implementation.spring xml in the composite file <BR class="atl-forced-newline">
+ &#45; one required attribute = location, which specifies the location of the Spring application context <BR class="atl-forced-newline">
+ Creates the implementationSpring instance <BR class="atl-forced-newline">
+ Initiates resolution of the componentType of the Spring application context by calling SpringXMLComponentTypeLoader <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Create SpringXMLComponentTypeLoader class <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Reads the Spring application context and introspects the Beans referenced from it to determine the component type of the Spring implementation (ie Services, References, Properties) <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="AddingtheSpringImplementationType-ModuleActivatorfile"></A>ModuleActivator file</H2>
+
+<P>Placed into the resources/META-INF/services directory:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"># Implementation class <SPAN class="code-keyword">for</SPAN> the ExtensionActivator
+org.apache.tuscany.implementation.script.ScriptModuleActivator
+</PRE>
+</DIV></DIV>
+
+<H2><A name="AddingtheSpringImplementationType-SpringModuleActivatorclass%26nbsp%3B"></A>SpringModuleActivator class&nbsp;</H2>
+
+
+<H4><A name="AddingtheSpringImplementationType-Constructor"></A>Constructor</H4>
+
+<P>Creates resources used by other parts of the Module implementation:</P>
+<UL>
+	<LI>AssemblyFactory</LI>
+	<LI>JavaInterfaceFactory</LI>
+	<LI>PolicyFactory</LI>
+</UL>
+
+
+<H4><A name="AddingtheSpringImplementationType-start%28%29"></A>start()</H4>
+
+<P>Takes an ExtensionPointRegistry as input parameter, which provides access to configuration of the core.</P>
+<UL>
+	<LI>Creates a SpringArtifactProcessor and adds to the registry StAXArtifactProcessors</LI>
+	<LI>Creates a SpringImplementationProviderFactory and adds to the registry ProviderFactories</LI>
+</UL>
+
+
+<P>Creates a series of artifacts that are required by the SpringArtifactProcessor and SpringImplementationProviderFactory:</P>
+<UL>
+	<LI>ExtensibleJavaInterfaceIntrospector (used to introspect Spring Beans)</LI>
+	<LI>JavaPropertyValueObjectFactory</LI>
+</UL>
+
+
+<H4><A name="AddingtheSpringImplementationType-stop%28%29"></A>stop()</H4>
+
+<P>Removes the SpringArtifactProcessor from the registry StAXArtifactProcessors&nbsp;</P>
+
+<H4><A name="AddingtheSpringImplementationType-getExtensionPoints%28%29%26nbsp%3B"></A>getExtensionPoints()&nbsp;</H4>
+
+<P>Returns a very simple DefaultJavaClassIntrospectorExtensionPoint.&nbsp;</P>
+
+<H2><A name="AddingtheSpringImplementationType-SpringArtifactProcessorclass%26nbsp%3B"></A>SpringArtifactProcessor class&nbsp;</H2>
+
+<P>Handles the &lt;implementation.spring..../&gt; element used in composite files.</P>
+
+<H4><A name="AddingtheSpringImplementationType-Constructor"></A>Constructor</H4>
+
+<P>Takes a series of classes used&nbsp; in loading &amp; resolution:</P>
+<UL>
+	<LI>AssemblyFactory</LI>
+	<LI>JavaInterfaceFactory</LI>
+	<LI>JavaInterfaceIntrospector</LI>
+	<LI>PolicyFactory&nbsp;</LI>
+	<LI>JavaPropertyValueObjectFactor</LI>
+</UL>
+
+
+<H4><A name="AddingtheSpringImplementationType-read%28%29"></A>read()</H4>
+
+<P>Reads the &lt;implementation.spring.../&gt; element from the composite.</P>
+
+<P>Gets the <B><EM>location</EM></B> attribute - throws an exception if the attribute is missing.&nbsp;</P>
+
+<P>Creates a SpringImplementation instance, sets its location field and returns it.&nbsp;</P>
+
+<H4><A name="AddingtheSpringImplementationType-resolve%28%29%26nbsp%3B"></A>resolve()&nbsp;</H4>
+
+<P>Given the SpringImplementation instance and a ModelResolver, gets the ComponentType for the implementation.</P>
+
+<P>Does this by invoking&nbsp; SpringXMLComponentTypeLoader.load() - will follow up by reading a side file if this does not fully resolve the component type.</P>
+
+
+<H4><A name="AddingtheSpringImplementationType-getArtifactType%28%29%26nbsp%3B"></A>getArtifactType()&nbsp;</H4>
+
+<P>Returns the fully qualified name of the implementation.spring element (includes the SCA namespace...) &nbsp;</P>
+
+<H2><A name="AddingtheSpringImplementationType-%26nbsp%3BSpringXMLComponentTypeLoaderclass"></A>&nbsp;SpringXMLComponentTypeLoader class</H2>
+
+
+<OL>
+	<LI>&nbsp;</LI>
+</OL>
+
+
+<H3><A name="AddingtheSpringImplementationType-ResolutionoftheComponentTypeofSpringapplicationcontext"></A>Resolution of the ComponentType of Spring application context</H3>
+
+<P>ComponentType of the Spring application-context is performed by reading the application-context.xml file and by introspecting the Java beans which it references. This is done by the SpringXMLComponentTypeLoader class.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/all.html b/site/trunk/site-publish/all.html
new file mode 100644
index 0000000000..a55cc6c487
--- /dev/null
+++ b/site/trunk/site-publish/all.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>All : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55498">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="All">All</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/archetype-catalog.xml b/site/trunk/site-publish/archetype-catalog.xml
new file mode 100644
index 0000000000..15e2fe7eea
--- /dev/null
+++ b/site/trunk/site-publish/archetype-catalog.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?><archetype-catalog>
+  <archetypes>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-contribution-jar</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create an SCA JAR contribution project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-contribution-zip</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create an SCA ZIP contribution project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a simple SCA webapp project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart-jsf</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a Webapp using SCA and JSF</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart-bpel</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a Webapp using SCA and BPEL</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart-jsonp</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a Webapp using SCA and JSONP</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart-stripes</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a Webapp using SCA and the Stripes Web Framework</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-binding-archetype</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a Tuscany binding extension project</description>
+    </archetype>
+  </archetypes>
+</archetype-catalog>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/archetypes/archetype-catalog.xml b/site/trunk/site-publish/archetypes/archetype-catalog.xml
new file mode 100644
index 0000000000..e332b83465
--- /dev/null
+++ b/site/trunk/site-publish/archetypes/archetype-catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><archetype-catalog>
+  <archetypes>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a simple Tuscany SCA webapp project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.tuscany.sca</groupId>
+      <artifactId>tuscany-quickstart-stripes</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <description>Create a simple Tuscany SCA and Stripes Web Framework project</description>
+    </archetype>
+  </archetypes>
+</archetype-catalog>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/architecture-guide.html b/site/trunk/site-publish/architecture-guide.html
new file mode 100644
index 0000000000..ba9ca7e970
--- /dev/null
+++ b/site/trunk/site-publish/architecture-guide.html
@@ -0,0 +1,133 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Architecture Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51125">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Architecture Guide">Architecture Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-faq.html" title="SCA Native FAQ">FAQ</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="ArchitectureGuide-HighlevelarchitectureviewofSCANative"></A>High level architecture view of SCA Native</H1>
+
+<P>Tuscany SCA Native consists of the <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca/runtime/core/" title="Visit page outside Confluence" rel="nofollow">kernel<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca/runtime/extensions/" title="Visit page outside Confluence" rel="nofollow">extensions<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<P>The kernel loads any .composite, .xsd, .wsdl or<BR>
+.componentType files found under a directory defined by the<BR>
+TUSCANY_SCACPP_ROOT environment variable. The kernel also loads any<BR>
+extensions found in the Tuscany extensions directory (found in the<BR>
+directory specified by the TUSCANY_SCACPP env variable). The kernel<BR>
+inspects the .composite files and checks that any required extensions<BR>
+that the SCA app uses are loaded, works out how the components are<BR>
+wired together, and then passes the details of the composite to the<BR>
+appropriate extensions. E.g. if the SCDL contains a<BR>
+&lt;implementation.python&gt; element, the contents of that element are<BR>
+passed to the Python extension which will load a defined script, etc.<BR>
+When the SCA app is invoked (via a local client call or a SOAP or REST<BR>
+service binding being called) the kernel uses the appropriate<BR>
+extension to invoke the right methods in the component implementation<BR>
+code.</P>
+
+<P>The language binding extensions (C++, Ruby, Python, PHP) provide<BR>
+wrapper and proxy code. The wrapper code wraps the component<BR>
+implemented in that language, initialising the component<BR>
+implementation, converting method arguments to the correct types and<BR>
+invoking the defined method with the converted arguments. The proxy<BR>
+code allows the component to call it's references, providing objects<BR>
+that look like standard objects in the component language, but which,<BR>
+when called, convert the method arguments from the language types and<BR>
+invoke the referenced component's wrapper code to invoke the component<BR>
+itself.</P>
+
+<P>The service and reference binding extensions (SOAP/Axis2C, REST)<BR>
+provide service and reference code. The service code allows Tuscany to<BR>
+run within a container as a service that can be invoked (e.g. as an<BR>
+Axis2C SOAP web service). The reference code allows Tuscany to call<BR>
+other services (that may or may not be other Tuscany services) using<BR>
+that technology to make the call out (e.g. a SOAP call to a Web<BR>
+Service).<BR>
+See the various samples we have for examples of all this.</P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg b/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg
new file mode 100644
index 0000000000..2812734d83
--- /dev/null
+++ b/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg
diff --git a/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg.jpeg b/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg.jpeg
new file mode 100644
index 0000000000..d94aa9c136
--- /dev/null
+++ b/site/trunk/site-publish/assembly-model-for-event-processing.data/Component_Diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg b/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg
new file mode 100644
index 0000000000..1be892bd55
--- /dev/null
+++ b/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg
diff --git a/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg.jpeg b/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg.jpeg
new file mode 100644
index 0000000000..ed3b4b93e5
--- /dev/null
+++ b/site/trunk/site-publish/assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg.jpeg
diff --git a/site/trunk/site-publish/assembly-model-for-event-processing.html b/site/trunk/site-publish/assembly-model-for-event-processing.html
new file mode 100644
index 0000000000..a997b91cc4
--- /dev/null
+++ b/site/trunk/site-publish/assembly-model-for-event-processing.html
@@ -0,0 +1,187 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Assembly Model for Event Processing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99637">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-event-processing.html" title="SCA Java Event Processing">SCA Java Event Processing</A>&nbsp;&gt;&nbsp;<A href="" title="Assembly Model for Event Processing">Assembly Model for Event Processing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page describes the SCA Assembly model for event processing.</P>
+
+<P>The SCA Assembly model for Event Processing is an extension of the standard SCA Assembly model.  All the standard SCA Assembly model features continue to be available.  The Event Processing model adds the following extensions:</P>
+<UL>
+	<LI>Component Type is extended so that the Component Type can have zero or more &lt;producer/&gt; elements and zero or more &lt;consumer/&gt; elements, alongside &lt;service/&gt; and &lt;reference/&gt; elements</LI>
+	<LI>Component elements are extended so that a Component can have zero or more &lt;consumer/&gt; elements and zero or more &lt;producer/&gt; elements, which can be used to configure the consumer and producer elements of the implementation used by the Component</LI>
+	<LI>Component producers can be linked to component consumers in the assembly through @target attribute in the component producer elements or @source attribute in the component consumer elements</LI>
+</UL>
+
+
+<H2><A name="AssemblyModelforEventProcessing-ComponentTypeEventProcessingExtensions"></A>Component Type - Event Processing Extensions</H2>
+
+<P>The component type of an implementation is extended to include zero or more <B><EM>consumer</EM></B> elements and zero or more <B><EM>producer</EM></B> elements:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;componentType&gt;
+        &lt;implementation ... /&gt;?
+	&lt;service ... /&gt;*
+	&lt;reference ... /&gt;*
+	&lt;property ... /&gt;*
+        &lt;consumer name=<SPAN class="code-quote">&quot;xs:NCName&quot;</SPAN> eventTypes=<SPAN class="code-quote">&quot;list of xs:QName&quot;</SPAN>?/&gt;*
+	&lt;producer name=<SPAN class="code-quote">&quot;xs:NCName&quot;</SPAN> eventTypes=<SPAN class="code-quote">&quot;list of xs:QName&quot;</SPAN>?/&gt;*
+&lt;/componentType&gt;
+</PRE>
+</DIV></DIV>
+<P>Each consumer and each producer has a Name.  The Name must be unique amongst the names of consumers, producers, services, references of the componentType.</P>
+
+<P>Each consumer and each producer has an optional list of event types.  For a producer, the list of event types indicates which event types can be produced by the producer. If no event types are listed, the producer may produce events of any type. For a consumer, the list of event types indicates which event types can be consumed by the consumer - and this list is used to filter messages received by the consumer - only events with event types that are in the list will be sent to the consumer.  If no event types are listed, then all event types are consumed by the consumer.</P>
+
+<H2><A name="AssemblyModelforEventProcessing-ComponentEventProcessingExtensions"></A>Component - Event Processing Extensions</H2>
+
+<P>The component element within an SCA composite is extended to include zero or more consumer elements and zero or more producer elements.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component ... &gt;*
+	&lt;implementation/&gt;
+	&lt;service ... /&gt;*
+	&lt;reference ... /&gt;*
+	&lt;property ... /&gt;*
+	&lt;consumer name=<SPAN class="code-quote">&quot;xs:NCName&quot;</SPAN> source=<SPAN class="code-quote">&quot;list of xs:anyURI&quot;</SPAN>? eventTypes=<SPAN class="code-quote">&quot;list of xs:QName&quot;</SPAN>?&gt;
+		&lt;filters/&gt;*
+	&lt;/consumer&gt;
+	&lt;producer name=<SPAN class="code-quote">&quot;xs:NCName&quot;</SPAN> target=<SPAN class="code-quote">&quot;list of xs:anyURI&quot;</SPAN>? eventTypes=<SPAN class="code-quote">&quot;list of xs:QName&quot;</SPAN>?&gt;
+	&lt;/producer&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+<P>The component consumer and producer elements configure the consumer and producer elements of the implementation as described by its component type.<BR>
+Component producer elements declare where events from the producer are sent, through the @target attribute.  The target attribute lists one or more target consumers, in the form of a space separated list of the form &quot;ComponentName/ConsumerName&quot;, where &quot;ComponentName&quot; is the name of a component within the same composite and &quot;ConsumerName&quot; is the name of a consumer on that component.</P>
+
+<P>Component consumer elements can declare from where the events are received by the consumer, through the @source attribute.  The source attribute lists one or more source producers, in the form of a space separated list of the form &quot;ComponentName/ProducerName&quot;, where &quot;ComponentName&quot; is the name of a component within the same composite and &quot;ProducerName&quot; is the name of a producer on that component.</P>
+
+<P>Both consumer and producer elements can declare a list of event types, using the @eventTypes attribute. For a producer, the list of event types indicates which event types can be produced by the producer. If no event types are listed, the producer may produce events of any type. For a consumer, the list of event types indicates which event types can be consumed by the consumer - and this list is used to filter messages received by the consumer - only events with event types that are in the list will be sent to the consumer.  If no event types are listed, then all event types are consumed by the consumer.</P>
+
+<H2><A name="AssemblyModelforEventProcessing-ComponentDiagramincludingProducerandConsumer"></A>Component Diagram including Producer and Consumer</H2>
+
+<P>The following is a diagram for a component which has services, references, producers and consumers:<SPAN class="image-wrap" style=""><IMG src="assembly-model-for-event-processing.data/Component_Diagram.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H2><A name="AssemblyModelforEventProcessing-CompositewithProducerlinkedtoaConsumer"></A>Composite with Producer linked to a Consumer</H2>
+
+<P>The following diagram shows a composite with a component producer linked to a component consumer:<SPAN class="image-wrap" style=""><IMG src="assembly-model-for-event-processing.data/Producer_linked_to_Consumer.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;The composite corresponding to this is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite name=<SPAN class="code-quote">&quot;Composite_X&quot;</SPAN>&gt;
+    &lt;component name=<SPAN class="code-quote">&quot;Component1&quot;</SPAN>&gt;
+        &lt;producer name=<SPAN class="code-quote">&quot;Producer1&quot;</SPAN> target=<SPAN class="code-quote">&quot;Component1/Consumer1&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;Component2&quot;</SPAN>&gt;
+        &lt;consumer name=<SPAN class="code-quote">&quot;Consumer1&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_Templates.zip b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_Templates.zip
new file mode 100644
index 0000000000..ae827905b6
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_Templates.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v1.xml b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v1.xml
new file mode 100644
index 0000000000..071ce76a19
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v1.xml
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+##
+#set ($pageContentHeaderEnabled = false)
+##
+#macro (spacer $width $height)
+    ##
+    ## Note: Replaced the spacer.gif with a table because IE wont honor the image height
+    ## 
+    ## <img src="$images/spacer.gif" width="$width" height="$height" border="0">
+    ##
+    <table> <!-- spacer -->
+        <tr>
+            <td width="$width" height="$height"></td>
+        </tr>
+    </table>
+#end
+##
+#macro (renderPage $title)
+    #set($globalHelper = $action.getGlobalHelper())
+    #set($renderer = $globalHelper.getWikiStyleRenderer())
+    
+    ##
+    ## FIXME: Must be a more efficient way to find a page...
+    ##
+    
+    #foreach ($child in $page.space.pages)
+        #if ($child.title.equals($title))
+            #set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+            
+            ##
+            ## HACK: Remove the leading <P> and trailing </P>
+            ##
+            
+            #set ($content = $content.substring(3, $content.length()))
+            #set ($end = $content.length() - 4)
+            #set ($content = $content.substring(0, $end))
+            
+            $content
+        #end
+    #end
+#end
+##
+#macro (topNav)
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <tr>
+            <td valing="top" align="left">
+                <a href="$siteroot"><img src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></a>
+            </td>
+            
+            <td width="100%">
+                &nbsp;
+            </td>
+            <!-- Adds the edit page link to the top banner-->
+            <td valign="bottom">
+                <div style="padding: 2px 10px; margin: 0px;">
+                    <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+                    <img src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+                </div>
+            </td>
+
+        </tr>
+    </table>
+#end
+##
+#macro (pageControls)
+   <div align="right" style="padding: 2px 10px; margin: 0px;">
+        <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>    
+   </div>
+#end
+##
+#macro (breadCrumbs)
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+        <tr class="topBar">
+            <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;$autoexport.breadcrumbs($page)
+            </td>
+            
+            <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <a href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</a> | <a href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</a> | <a href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </table>
+#end
+##
+#macro (pageContent)
+    <div id="PageContent">
+        #if ($pageContentHeaderEnabled)
+            <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+                <div style="margin: 0px 10px 0px 10px" class="smalltext">$page.space.name</div>
+                <div style="margin: 0px 10px 8px 10px" class="pagetitle">$page.title</div>
+            </div>
+        #end
+        
+        <div class="pagecontent">
+            <div class="wiki-content">
+                $body
+            </div>
+        </div>
+    </div>
+#end
+##
+#macro (footer)
+    <div class="footer">
+        Copyright � 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </div>
+#end
+##
+<html>
+    <head>
+        <link type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <link rel="SHORTCUT ICON" href="$images/favicon.ico">   
+        <title>$page.title : Apache Tuscany</title>
+    </head>
+    
+    <body onload="init()">
+        
+        #topNav()
+
+        #breadCrumbs()
+
+        <table border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <tr>
+                <td align="left" valign="top">
+                    #pageContent()
+                </td>
+            </tr>
+        </table>
+
+        #footer()
+
+    </body>
+</html>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v2.zip b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v2.zip
new file mode 100644
index 0000000000..70b3f8d5bb
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v2.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v3.zip b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v3.zip
new file mode 100644
index 0000000000..a4144b8781
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v3.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/Tuscany_template_2007_5_25_v1.zip b/site/trunk/site-publish/autoexport-plugin-template.data/Tuscany_template_2007_5_25_v1.zip
new file mode 100644
index 0000000000..04d4be95a1
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/Tuscany_template_2007_5_25_v1.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.css b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.css
new file mode 100644
index 0000000000..a87d27d6b0
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.css
@@ -0,0 +1,1387 @@
+/*
+ * $Id: default.css 522548 2007-03-26 15:36:28Z hcunico $
+ */
+
+body, p, td, table, tr, .bodytext, .stepfield { font-family: Verdana, arial, sans-serif; font-size: 11px; line-height: 16px; color: #000000; font-weight: normal; }
+
+#PageContent {
+    text-align: left;
+    background-color: #fff;
+    padding: 0px;
+    margin: 0px;
+    padding-bottom:20px;
+}
+
+/*
+** when this stylesheet is used for the Tiny MCE Wysiwyg editor's edit area, we can't
+** use an id=PageContent or class=wiki-content, so we must
+** set the body style to that used for PageContent, and p to that used for wiki-content.
+*/
+
+body {
+    margin: 0px;
+    padding: 0px;
+    text-align: center;
+    background-color: #f0f0f0;
+}
+
+.monospaceInput {
+    font:12px monospace
+}
+
+.wiki-content p, .commentblock p {
+    margin: 16px 0px 16px 0px;
+    padding: 0px;
+}
+
+.wiki-content-preview {
+    padding: 5px;
+    border-left: 1px solid #a6c7f2;
+    border-right: 1px solid #a6c7f2;
+}
+
+ul, ol {
+    margin-top: 2px;
+    margin-bottom: 2px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+pre {
+    padding: 0px;
+    margin-top: 5px;
+    margin-left: 15px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    text-align: left;
+}
+
+.helpheading {
+    font-weight: bold;
+    background-color: #D0D9BD;
+    border-bottom: 1px solid #a6c7f2;
+    padding: 4px 4px 4px 4px;
+    margin: 0px;
+    margin-top: 10px;
+}
+.helpcontent {
+    padding: 4px 4px 20px 4px;
+    background-color: #f5f7f1;
+}
+
+.code {
+    border: 1px dashed #a6c7f2;
+    font-size: 11px;
+    font-family: Courier;
+    margin: 10px;
+    line-height: 13px;
+}
+
+.focusedComment {
+    background: #ffffce;
+}
+
+.commentBox, .focusedComment {
+    padding: 10px;
+    margin: 5px 0 5px 0;
+    border: 1px #bbb solid;
+}
+
+.codeHeader {
+    background-color: #f0f0f0;
+    border-bottom: 1px dashed #a6c7f2;
+    padding: 3px;
+    text-align: center;
+}
+
+.codeContent {
+    text-align: left;
+    background-color: #f0f0f0;
+    padding: 3px;
+}
+
+.preformatted {
+    border: 1px dashed #a6c7f2;
+    font-size: 11px;
+    font-family: Courier;
+    margin: 10px;
+    line-height: 13px;
+}
+
+.preformattedHeader {
+    background-color: #f0f0f0;
+    border-bottom: 1px dashed #a6c7f2;
+    padding: 3px;
+    text-align: center;
+}
+
+.preformattedContent {
+    background-color: #f0f0f0;
+    padding: 3px;
+}
+
+.panel {
+    border: 1px dashed #a6c7f2;
+    margin: 10px;
+    margin-top: 0px;
+}
+
+.panelHeader {
+    background-color: #f0f0f0;
+    border-bottom: 1px dashed #a6c7f2;
+    padding: 3px;
+    text-align: center;
+}
+
+.panelContent {
+    background-color: #f0f0f0;
+    padding: 5px;
+}
+
+.anonymousAlert {
+    background-color: #f0f0f0;
+    border: 1px dashed red;
+    font-size: 11px;
+    padding: 10px 5px 10px 5px;
+    margin: 4px;
+    line-height: 13px;
+}
+
+.lockAlert {
+    background-color: #f0f0f0;
+    width: 50%;
+    border: 1px dashed red;
+    font-size: 11px;
+    padding: 10px 5px 10px 5px;
+    margin: 4px;
+    line-height: 13px;
+}
+
+.code-keyword {
+    color: #000091;
+    background-color: inherit;
+}
+
+.code-object {
+    color: #910091;
+    background-color: inherit;
+}
+
+.code-quote {
+    color: #009100;
+    background-color: inherit;
+}
+
+.code-comment {
+    color: #808080;
+    background-color: inherit;
+}
+
+.code-xml .code-keyword {
+    color: inherit;
+    font-weight: bold;
+}
+
+.code-tag {
+    color: #000091;
+    background-color: inherit;
+}
+
+.breadcrumbs {
+    background-color: #f0f0f0;
+    border-width: 1px 0;
+    border-style: solid;
+    font-size: 11px;
+    padding: 3px 0;
+}
+
+.navmenu {
+    border: 1px solid #ccc;
+}
+
+.menuheading {
+    font-weight: bold;
+    background-color: #f0f0f0;
+    border-bottom: 1px solid #a6c7f2;
+    padding: 4px 4px 2px 4px;
+}
+
+.menuitems {
+    padding: 4px 4px 20px 4px;
+}
+
+.rightpanel {
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+#helpheading {
+    text-align: left;
+    font-weight: bold;
+    background-color: #D0D9BD;
+    border-bottom: 1px solid #a6c7f2;
+    padding: 4px 4px 4px 4px;
+    margin: 0px;
+}
+
+#helpcontent {
+    padding: 4px 4px 4px 4px;
+    background-color: #f5f7f1;
+}
+
+.helptab-unselected {
+    font-weight: bold;
+    padding: 5px;
+    background-color: #f5f7f1;
+}
+
+.helptab-selected {
+    font-weight: bold;
+    background-color: #D0D9BD;
+    padding: 5px;
+}
+
+.helptabs {
+    margin: 0px;
+    background-color: #f5f7f1;
+    padding: 5px;
+}
+
+.infopanel-heading {
+    font-weight: bold;
+    padding: 4px 0px 2px 0px;
+}
+
+.pagebody {
+}
+
+.pageheader {
+    padding: 5px 5px 5px 0px;
+    border-bottom: 1px solid #a6c7f2;
+}
+
+.pagetitle {
+    font-size: 22px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    color: #003366;
+}
+
+.steptitle {
+    font-size: 18px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    color: #003366;
+    margin-bottom: 7px;
+}
+
+.substeptitle {
+    font-size: 12px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    color: #003366;
+    margin: 2px 4px 4px 4px;
+    padding: 2px 4px 1px 4px;
+}
+
+.stepdesc {
+    font-family: Verdana, arial, sans-serif;
+    font-size: 11px;
+    line-height: 16px;
+    font-weight: normal;
+    color: #666666;
+    margin-top: 7px;
+    margin-bottom: 7px;
+}
+
+.steplabel {
+    font-weight: bold;
+    margin-right: 4px;
+    color: black;
+    float: left;
+    width: 15%;
+    text-align: right;
+}
+
+.stepfield {
+    background: #f0f0f0;
+    padding: 5px;
+}
+
+.submitButtons{
+    margin-top:5px;
+    text-align:right;
+}
+
+.formtitle {
+    font-size: 12px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    color: #003366;
+}
+
+.sectionbottom {
+    border-bottom: 1px solid #a6c7f2;
+}
+
+.topRow {
+    border-top: 2px solid #a6c7f2;
+}
+
+.tabletitle {
+    font-size: 14px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    padding: 3px 0px 2px 0px;
+    margin: 8px 4px 2px 0px;
+    color: #003366;
+    border-bottom: 2px solid #a6c7f2;
+}
+
+.pagesubheading { color: #666666; font-size: 10px; padding: 0 0 5px; list-style-type: none; list-style-image: none; display: none; }
+
+HR {
+    color: a6c7f2;
+    height: 1;
+}
+
+A:link, A:visited, A:active, A:hover {
+    color: #003366;
+}
+
+h1 A:link, h1 A:visited, h1 A:active {
+    text-decoration: none;
+}
+
+h1 A:hover {
+    border-bottom: 1px dotted #003366;
+}
+
+.wiki-content > :first-child, .commentblock > :first-child {
+    margin-top: 3px;
+}
+
+.logocell {
+    padding: 10px;
+}
+
+input {
+    font-family: verdana, geneva, arial, sans-serif;
+    font-size: 11px;
+    color: #000000;
+}
+
+textarea, textarea.editor {
+    font-family: verdana, geneva, arial, sans-serif;
+    font-size: 11px;
+    color: #333333;
+}
+
+.spacenametitle-printable {
+    font: 20px/25px Impact, Arial, Helvetica;
+    font-weight: 100;
+    color: #999999;
+    margin: 0px;
+}
+
+.spacenametitle-printable a {
+    text-decoration: none;
+    color: #999999;
+}
+
+.spacenametitle-printable a:visited {
+    text-decoration: none;
+    color: #999999;
+}
+
+.blogSurtitle { margin: 1em 0 0; padding: 10px 10px 0; background: #ffffff; border-color: #5fa3d6; border-style: solid; border-width: 0 0 0 1px; list-style-type: none; list-style-image: none; display: none; }
+.blogpost { margin: 0 0 1em; padding: 0 10px 5px; background: #ffffff; border-bottom: 1px solid #5fa3d6; border-left: 1px solid #5fa3d6; border-top-color: #5fa3d6; border-right-color: #5fa3d6; }
+.blogpost p {
+	margin: 0;
+	margin-left: 20px;
+	}
+a.blogDate { color: #999999; font-size: 90%; }
+.blogHeading { margin: 0 0 0.3em; padding: 0.5em 0 3px; font-size: 110%; color: #004d94; font-weight: bold; border-bottom: 1px solid #eaeaea; }
+.blogHeading a:link, 
+.blogHeading a:visited {
+	color: #004d94;
+	background: none;
+	}
+.blogHeading a:focus,
+.blogHeading a:hover, 
+.blogHeading a:active {
+	color: #000;
+	background: none;
+	}
+
+.endsection { align: right; color: #666666; margin-top: 10px; display: none; }
+
+.endsectionleftnav {
+    align: right;
+    color: #666666;
+    margin-top: 10px;
+}
+
+h1 { font-size: 20px; line-height: normal; font-weight: bold; background-color: #ecf4d1; color: #000; text-align: left; vertical-align: top; padding: 2px; margin: 36px 0 4px; border-bottom: 1px solid #b4b4b5; border-left: 1px solid #b4b4b5; }
+
+h2 { font-size: 18px; line-height: normal; font-weight: bold; background-color: #ecf4d1; border-bottom: 1px solid #b4b4b5; padding: 2px; margin: 15px 0 4px; border-left: 1px solid #b4b4b5; border-top-color: #b4b4b5; border-right-color: #b4b4b5; list-style-image: none; list-style-position: inside; display: block; }
+
+h3 { font-size: 14px; line-height: normal; font-weight: bold; background-color: #ecf4d1; padding: 2px; margin: 21px 0 4px; border-bottom: 1px solid #b4b4b5; border-left: 1px solid #b4b4b5; border-top-color: #b4b4b5; border-right-color: #b4b4b5  }
+
+h4 { font-size: 12px; line-height: normal; font-weight: bold; background-color: #f0f0f0; padding: 2px; margin: 18px 0 4px; }
+
+h4.search {
+    font-size: 12px;
+    line-height: normal;
+    font-weight: normal;
+    background-color: #f0f0f0;
+    padding: 4px;
+    margin: 18px 0px 4px 0px;
+}
+
+h5 {
+    font-size: 10px;
+    line-height: normal;
+    font-weight: bold;
+    background-color: #f0f0f0;
+    padding: 2px;
+    margin: 14px 0px 4px 0px;
+}
+
+h6 {
+    font-size: 8px;
+    line-height: normal;
+    font-weight: bold;
+    background-color: #f0f0f0;
+    padding: 2px;
+    margin: 14px 0px 4px 0px;
+}
+
+.smallfont {
+    font-size: 10px;
+}
+
+.descfont {
+    font-size: 10px;
+    color: #666666;
+}
+
+.smallerfont {
+    font-size: 9px;
+}
+
+.smalltext {
+    color: #666666;
+    font-size: 10px;
+}
+
+.smalltext a {
+    color: #666666;
+}
+
+.smalltext-blue {
+    color: #a6c7f2;
+    font-size: 10px;
+}
+
+.surtitle {
+    margin-left: 1px;
+    margin-bottom: 5px;
+    font-size: 14px;
+    color: #666666;
+}
+
+/* css hack found here:  http://www.fo3nix.pwp.blueyonder.co.uk/tutorials/css/hacks/ */
+.navItemOver { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #003366; cursor: hand; voice-family: '\'}\''; voice-family:inherit; cursor: pointer;}
+.navItemOver a { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItemOver a:visited { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItemOver a:hover { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItem { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #a6c7f2; }
+.navItem a { color: #ffffff; text-decoration: none; }
+.navItem a:hover { color: #ffffff; text-decoration: none; }
+.navItem a:visited { color: #ffffff; text-decoration: none; }
+
+div.padded { padding: 4px; }
+div.thickPadded { padding: 10px; }
+h3.macrolibrariestitle {
+    margin: 0px 0px 0px 0px;
+}
+
+div.centered { text-align: center; margin: 10px; }
+div.centered table { margin: 0 auto; text-align: left; border: solid 1px #5fa3d6; }
+
+.tableview table { margin: 0; }
+
+.tableview th {
+    text-align: left;
+    color: #003366;
+    font-size: 12px;
+    padding: 5px 0px 0px 5px;
+    border-bottom: 2px solid #a6c7f2;
+}
+.tableview td {
+    text-align: left;
+    border-color: #ccc;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    margin: 0;
+    padding: 4px 10px 4px 5px;
+}
+
+.grid {
+    margin: 2px 0px 5px 0px;
+    border-collapse: collapse;
+}
+.grid th  { padding: 2px 4px; background: #f0f0f0; text-align: center; border: solid 1px #ccc; }
+.grid td  {
+    border: 1px solid #ccc;
+    padding: 3px 4px 3px 4px;
+}
+.gridHover {
+    background-color: #f9f9f9;
+}
+
+td.infocell {
+    background-color: #f0f0f0;
+}
+.label {
+    font-weight: bold;
+    color: #003366;
+}
+.error {
+    background-color: #fcc;
+}
+
+.errorBox {
+    background-color: #fcc;
+    border: 1px solid #c00;
+    padding: 5px;
+    margin: 5px;
+}
+
+.errorMessage {
+    color: #c00;
+}
+
+.success {
+    background-color: #dfd;
+}
+
+.successBox {
+    background-color: #dfd;
+    border: 1px solid #090;
+    padding: 5px;
+    margin-top:5px;
+    margin-bottom:5px;
+}
+
+blockquote {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin-left: 5px;
+    margin-right: 0;
+    border-left: 1px solid #5fa3d6;
+}
+
+table.confluenceTable
+{
+    margin: 5px;
+    border-collapse: collapse;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+table.confluenceTable td.confluenceTd
+{
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ccc;
+    padding: 3px 4px 3px 4px;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+table.confluenceTable th.confluenceTh
+{
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ccc;
+    padding: 3px 4px 3px 4px;
+    background-color: #f0f0f0;
+    text-align: center;
+}
+
+td.confluenceTd
+{ padding: 3px 4px; }
+
+th.confluenceTh
+{
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ccc;
+    padding: 3px 4px 3px 4px;
+    background-color: #f0f0f0;
+    text-align: center;
+}
+
+DIV.small {
+    font-size: 9px;
+}
+
+H1.pagename {
+    margin-top: 0px;
+}
+
+IMG.inline  {}
+
+.loginform {
+    margin: 5px;
+    border: 1px solid #ccc;
+}
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote {
+    text-align: center;
+    font-size: 11px;
+    color: red;
+}
+
+/* How the preview content should be shown */
+.previewcontent { background: #E0E0E0; }
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent { background: #E0E0E0; }
+
+/* How the "This page has been modified..." -comment should be shown. */
+.conflictnote { }
+
+.createlink {
+    color: maroon;
+}
+a.createlink {
+    color: maroon;
+}
+.templateparameter {
+    font-size: 9px;
+    color: darkblue;
+}
+
+.diffadded {
+    background: #ddffdd;
+    padding: 1px 1px 1px 4px;
+	border-left: 4px solid darkgreen;
+}
+.diffdeleted {
+    color: #999;
+    background: #ffdddd;
+    padding: 1px 1px 1px 4px;
+    border-left: 4px solid darkred;
+}
+.diffnochange {
+    padding: 1px 1px 1px 4px;
+    border-left: 4px solid lightgrey;
+}
+.differror {
+    background: brown;
+}
+.diff {
+    font-family: lucida console, courier new, fixed-width;
+    font-size: 12px;
+    line-height: 14px;
+}
+.diffaddedchars {
+    background-color:#99ff99;
+    font-weight:bolder;
+}
+.diffremovedchars {
+    background-color:#ff9999;
+    text-decoration: line-through;
+    font-weight:bolder;
+}
+
+.greybackground {
+    background: #f0f0f0
+}
+
+.greybox {
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.borderedGreyBox {
+    border: 1px solid #cccccc;
+    background-color: #f0f0f0;
+    padding: 10px;
+}
+
+.greyboxfilled {
+    border: 1px solid #ddd;
+    padding: 5px;
+    margin: 10px 1px 10px 1px;
+    background: #f0f0f0;
+}
+
+.navBackgroundBox {
+    padding: 5px 5px 5px 5px;
+    font-size: 22px;
+    font-weight: bold;
+    font-family: Arial, sans-serif;
+    color: white;
+    background: #a6c7f2;
+    text-decoration: none;
+}
+
+.previewBoxTop {
+    background-color: #f0f0f0;
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+    border-color: #a6c7f2;
+    padding: 5px;
+    margin: 5px 0px 0px 0px;
+    text-align: center;
+}
+.previewContent {
+    background-color: #fff;
+    border-color: #a6c7f2;
+    border-width: 0px 1px 0px 1px;
+    border-style: solid;
+    padding: 10px;
+    margin: 0px;
+}
+.previewBoxBottom {
+    background-color: #f0f0f0;
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: #a6c7f2;
+    padding: 5px;
+    margin: 0px 0px 5px 0px;
+    text-align: center;
+}
+
+.functionbox {
+    background-color: #f0f0f0;
+    border: 1px solid #a6c7f2;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.functionbox-greyborder {
+    background-color: #f0f0f0;
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.search-highlight {
+    background-color: #ffffcc;
+}
+
+/* normal (white) background */
+.rowNormal { background-color: #ffffff; border: solid 1px #5fa3d6; }
+
+/* alternate (pale yellow) background */
+.rowAlternate { background-color: #f7f7f7; border: solid 1px #5fa3d6; }
+
+/* used in the list attachments table */
+.rowAlternateNoBottomColor {
+    background-color: #f7f7f7;
+}
+
+.rowAlternateNoBottomNoColor {
+}
+
+.rowAlternateNoBottomColor td { border-bottom: 0 no; border-top-color: #5fa3d6; border-right-color: #5fa3d6; border-left-color: #5fa3d6;ne #5fa3d6;
+}
+
+.rowAlternateNoBottomNoColor td {
+    border-bottom: 0px;
+}
+
+/* row highlight (grey) background */
+.rowHighlight {
+    background-color: #f0f0f0;
+
+}
+
+TD.greenbar {FONT-SIZE: 2px; BACKGROUND: #00df00; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+TD.redbar {FONT-SIZE: 2px; BACKGROUND: #df0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+TD.darkredbar {FONT-SIZE: 2px; BACKGROUND: #af0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+
+TR.testpassed {FONT-SIZE: 2px; BACKGROUND: #ddffdd; PADDING: 0px; }
+TR.testfailed {FONT-SIZE: 2px; BACKGROUND: #ffdddd; PADDING: 0px; }
+
+.toolbar  {
+    margin: 0px;
+    border-collapse: collapse;
+}
+
+.toolbar td  {
+    border: 1px solid #ccc;
+    padding: 2px 2px 2px 2px;
+    color: #ccc;
+}
+
+td.noformatting {
+    border-width: 0px;
+    border-style: none;
+    text-align: center;
+    padding: 0px;
+}
+
+.commentblock {
+    margin: 12px 0 12px 0;
+}
+
+/*
+ * Divs displaying the license information, if necessary.
+ */
+.license-eval, .license-none, .license-nonprofit {
+    border-top: 1px solid #bbbbbb;
+    text-align: center;
+    font-size: 10px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+.license-eval, .license-none {
+    background-color: #ffcccc;
+}
+
+.license-eval b, .license-none b {
+    color: #990000
+}
+
+.license-nonprofit {
+    background-color: #ffffff;
+}
+
+/*
+ * The shadow at the bottom of the page between the main content and the
+ * "powered by" section.
+ */
+.bottomshadow {
+    height: 12px;
+    background-image: url("$req.contextPath/images/border/border_bottom.gif");
+    background-repeat: repeat-x;
+}
+
+/*
+ * Styling of the operations box
+ */
+.navmenu .operations li, .navmenu .operations ul {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.navmenu .operations ul {
+    margin-bottom: 9px;
+}
+
+.navmenu .label {
+    font-weight: inherit;
+}
+
+/*
+ * Styling of ops as a toolbar
+ */
+.toolbar div {
+    display: none;
+}
+
+.toolbar .label {
+    display: none;
+}
+
+.toolbar .operations {
+    display: block;
+}
+
+.toolbar .operations ul {
+    display: inline;
+    list-style: none;
+    margin-left: 10px;
+    padding-left: 0;
+}
+
+.toolbar .operations li {
+    list-style: none;
+    display: inline;
+}
+
+/* list page navigational tabs */
+#foldertab {
+    padding: 3px 0px 3px 8px;
+    margin-left: 0;
+    border-bottom: 1px solid #a6c7f2;
+    font: bold 11px Verdana, sans-serif;
+}
+
+#foldertab li {
+    list-style: none;
+    margin: 0;
+    display: inline;
+}
+
+#foldertab li a {
+    padding: 3px 0.5em;
+    margin-left: 3px;
+    border: 1px solid #a6c7f2;
+    border-bottom: none;
+    background: #a6c7f2;
+    text-decoration: none;
+}
+
+#foldertab li a:link { color: #ffffff; }
+#foldertab li a:visited { color: #ffffff; }
+
+#foldertab li a:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+#foldertab li a.current {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+
+#foldertab li a.current:link { color: black; }
+#foldertab li a.current:visited { color: black; }
+#foldertab li a.current:hover {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+
+/* alphabet list */
+ul#squaretab {
+    margin-left: 0;
+    padding-left: 0;
+    white-space: nowrap;
+    font: bold 8px Verdana, sans-serif;
+}
+
+#squaretab li {
+    display: inline;
+    list-style-type: none;
+}
+
+#squaretab a {
+    padding: 2px 6px;
+    border: 1px solid #a6c7f2;
+}
+
+#squaretab a:link, #squaretab a:visited {
+    color: #fff;
+    background-color: #a6c7f2;
+    text-decoration: none;
+}
+
+#squaretab a:hover {
+    color: #ffffff;
+    background-color: #003366;
+    border-color: #003366;
+    text-decoration: none;
+}
+
+#squaretab li a#current {
+    background: white;
+    color: black;
+}
+
+.blogcalendar * {
+    font-family:verdana, arial, sans-serif;
+    font-size:x-small;
+    font-weight:normal;
+    line-height:140%;
+    padding:2px;
+}
+
+table.blogcalendar {
+    border: 1px solid #a6c7f2;
+}
+
+.blogcalendar th.calendarhead, a.calendarhead {
+    font-size:x-small;
+    font-weight:bold;
+    padding:2px;
+    text-transform:uppercase;
+    background-color: #a6c7f2;
+    color: #ffffff;
+    letter-spacing: .3em;
+    text-transform: uppercase;
+}
+
+.calendarhead:visited {color: white;}
+.calendarhead:active {color: white;}
+.calendarhead:hover {color: white;}
+
+.blogcalendar th {
+    font-size:x-small;
+    font-weight:bold;
+    padding:2px;
+    background-color:#f0f0f0;
+}
+
+.blogcalendar td {
+    font-size:x-small;
+    font-weight:normal;
+}
+
+.searchGroup { padding: 0 0 10px 0; background: #f0f0f0; }
+.searchGroupHeading { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #a6c7f2; padding: 2px 4px 1px 4px; }
+.searchItem { padding: 1px 4px 1px 4px; }
+.searchItemSelected { padding: 1px 4px 1px 4px; font-weight: bold; background: #ddd; }
+
+/* permissions page styles */
+.permissionHeading {
+    border-bottom: #bbb; border-width: 0 0 1px 0; border-style: solid; font-size: 16px; text-align: left;
+}
+.permissionTab {
+    border-width: 0 0 0 1px; border-style: solid; background: #a6c7f2; color: #ffffff; font-size: 10px;
+}
+.permissionSuperTab {
+    border-width: 0 0 0 1px; border-style: solid; background: #003366; color: #ffffff;
+}
+.permissionCell {
+    border-left: #bbb; border-width: 0 0 0 1px; border-style: solid;
+}
+
+/* warning panel */
+.warningPanel { background: #FFFFCE; border:#F0C000 1px solid; padding: 8px; margin: 10px; }
+/* alert panel */
+.alertPanel { background: #FFCCCC; border:#C00 1px solid; padding: 8px; margin: 10px; }
+
+/* side menu highlighting (e.g. space content screen) */
+.optionPadded { padding: 2px; }
+.optionSelected { background-color: #ffffcc; padding: 2px; border: 1px solid #ddd; margin: -1px; }
+.optionSelected a { font-weight: bold; text-decoration: none; color: black; }
+
+/* information macros */
+.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.warningMacro { border-style: solid; border-width: 1px; border-color: #c00; background-color: #fcc; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.infoMacro { border-style: solid; border-width: 1px; border-color: #a6c7f2; background-color: #D8E4F1; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.informationMacroPadding { padding: 5px 0 0 5px; }
+
+table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td, table.sectionMacro td {
+    border: none;
+}
+
+table.sectionMacroWithBorder td.columnMacro { border-style: dashed; border-width: 1px; border-color: #cccccc;}
+
+.pagecontent
+{
+    padding: 10px;
+    text-align: left;
+}
+
+/* styles for links in the top bar */
+.topBarDiv a:link {color: #000000;}
+.topBarDiv a:visited {color: #000000;}
+.topBarDiv a:active {color: #000000;}
+.topBarDiv a:hover {color: #000000;}
+.topBarDiv { color: #000000; font-style: normal; }
+
+.topBar {
+    background-color: #a6c7f2;
+}
+
+
+/* styles for extended operations */
+.greyLinks a:link {color: #666666; text-decoration:underline;}
+.greyLinks a:visited {color: #666666; text-decoration:underline;}
+.greyLinks a:active {color: #666666; text-decoration:underline;}
+.greyLinks a:hover {color: #666666; text-decoration:underline;}
+.greyLinks {color: #666666; display:block; padding: 10px}
+
+.logoSpaceLink {color: #999999; text-decoration: none}
+.logoSpaceLink a:link {color: #999999; text-decoration: none}
+.logoSpaceLink a:visited {color: #999999; text-decoration: none}
+.logoSpaceLink a:active {color: #999999; text-decoration: none}
+.logoSpaceLink a:hover {color: #003366; text-decoration: none}
+
+/* basic panel (basicpanel.vmd) style */
+.basicPanelContainer {border: 1px solid #a6c7f2; margin-top: 2px; margin-bottom: 8px; width: 100%}
+.basicPanelTitle {padding: 5px; margin: 0px; background-color: #f0f0f0; color: black; font-weight: bold;}
+.basicPanelBody {padding: 5px; margin: 0px}
+
+.separatorLinks a:link {color: white}
+.separatorLinks a:visited {color: white}
+.separatorLinks a:active {color: white}
+
+.greynavbar {background-color: #f0f0f0; border-top: 1px solid #a6c7f2; margin-top: 2px}
+
+div.headerField {
+    float: left;
+    width: auto;
+    height: 100%;
+}
+
+.headerFloat {
+    margin-left: auto;
+    width: 50%;
+}
+
+.headerFloatLeft {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 10px;
+}
+
+#headerRow {
+    padding: 10px;
+}
+
+div.license-personal {
+   background-color: #003366;
+   color: #ffffff;
+}
+
+div.license-personal a {
+   color: #ffffff;
+}
+
+.greyFormBox {
+    border: 1px solid #cccccc;
+    padding: 5px;
+}
+
+/* IE automatically adds a margin before and after form tags. Use this style to remove that */
+.marginlessForm {
+    margin: 0px;
+}
+
+.openPageHighlight {
+    background-color: #ffffcc;
+    padding: 2px;
+    border: 1px solid #ddd;
+}
+
+.editPageInsertLinks, .editPageInsertLinks a
+{
+    color: #666666;
+    font-weight: bold;
+    font-size: 10px;
+}
+
+/* Style for label heatmap. */
+.top10 a {
+    font-weight: bold;
+    font-size: 2em;
+    color: #003366;
+}
+.top25 a {
+    font-weight: bold;
+    font-size: 1.6em;
+    color: #003366;
+}
+.top50 a {
+    font-size: 1.4em;
+    color: #003366;
+}
+.top100 a {
+    font-size: 1.2em;
+    color: #003366;
+}
+
+.heatmap {
+    list-style:none;
+    width: 95%;
+    margin: 0px auto;
+}
+
+.heatmap a {
+    text-decoration:none;
+}
+
+.heatmap a:hover {
+    text-decoration:underline;
+}
+
+.heatmap li {
+    display: inline;
+}
+
+.minitab {
+    padding: 3px 0px 3px 8px;
+    margin-left: 0;
+    margin-top: 1px;
+    margin-bottom: 0px;
+    border-bottom: 1px solid #a6c7f2;
+    font: bold 9px Verdana, sans-serif;
+    text-decoration: none;
+    float:none;
+}
+.selectedminitab {
+    padding: 3px 0.5em;
+    margin-left: 3px;
+    margin-top: 1px;
+    border: 1px solid #a6c7f2;
+    background: white;
+    border-bottom: 1px solid white;
+    color: #000000;
+    text-decoration: none;
+}
+.unselectedminitab {
+    padding: 3px 0.5em;
+    margin-left: 3px;
+    margin-top: 1px;
+    border: 1px solid #a6c7f2;
+    border-bottom: none;
+    background: #a6c7f2;
+    color: #ffffff;
+    text-decoration: none;
+}
+
+a.unselectedminitab:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+a.unselectedminitab:link { color: white; }
+a.unselectedminitab:visited { color: white; }
+
+a.selectedminitab:link { color: black; }
+a.selectedminitab:visited { color: black; }
+
+.linkerror { background-color: #fcc;}
+
+a.labelOperationLink:link {text-decoration: underline}
+a.labelOperationLink:active {text-decoration: underline}
+a.labelOperationLink:visited {text-decoration: underline}
+a.labelOperationLink:hover {text-decoration: underline}
+
+a.newLabel:link {background-color: #ddffdd}
+a.newLabel:active {background-color: #ddffdd}
+a.newLabel:visited {background-color: #ddffdd}
+a.newLabel:hover {background-color: #ddffdd}
+
+ul.square {list-style-type: square}
+
+.inline-control-link {
+    background: #ffc;
+    font-size: 9px;
+    color: #666;
+    padding: 2px;
+    text-transform: uppercase;
+    text-decoration: none;
+}
+
+
+.inline-control-link a:link {text-decoration: none}
+.inline-control-link a:active {text-decoration: none}
+.inline-control-link a:visited {text-decoration: none}
+.inline-control-link a:hover {text-decoration: none}
+
+.inline-control-link {
+    background: #ffc;
+    font-size: 9px;
+    color: #666;
+    padding: 2px;
+    text-transform: uppercase;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+div.auto_complete {
+    width: 350px;
+    background: #fff;
+}
+div.auto_complete ul {
+    border: 1px solid #888;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style-type: none;
+}
+div.auto_complete ul li {
+    margin: 0;
+    padding: 3px;
+}
+div.auto_complete ul li.selected {
+    background-color: #ffb;
+}
+div.auto_complete ul strong.highlight {
+    color: #800;
+    margin: 0;
+    padding: 0;
+}
+
+/******* Edit Page Styles *******/
+.toogleFormDiv{
+    border:1px solid #A7A6AA;
+    background-color:white;
+    padding:5px;
+    margin-top: 5px;
+}
+
+.toogleInfoDiv{
+    border:1px solid #A7A6AA;
+    background-color:white;
+    display:none;
+    padding:5px;
+    margin-top: 10px;
+}
+
+.inputSection{
+    margin-bottom:20px;
+}
+
+#editBox{
+    border:1px solid lightgray;
+    background-color:#F0F0F0;
+}
+
+/******* Left Navigation Theme Styles ********/
+.leftnav li a {
+    text-decoration:none;
+    color:white;
+    margin:0px;
+    display:block;
+    padding:2px;
+    padding-left:5px;
+    background-color: #a6c7f2;
+    border-top:1px solid #a6c7f2;
+}
+
+.leftnav li a:active {color:white;}
+.leftnav li a:visited {color:white;}
+.leftnav li a:hover {background-color: #003366; color:white;}
+
+.quicklinks {
+    font-size: smaller;
+}
+.sideNavSectionTitle {
+    text-align: left;
+}
+.quicklinks a:link, .quicklinks a:visited, .quicklinks a:active, .quicklinks a:hover  {
+    color: #FFFFFF;
+    text-decoration: none;
+}
+.gfxbyepiq {
+    text-align: center;
+    font-size: smaller;
+}
+.gfxbyepiq a:link, .gfxbyepiq a:visited, .gfxbyepiq a:active, .gfxbyepiq a:hover {
+    color: #AAAAAA;
+    text-decoration: none;
+}
+
+.grayed{
+    text-align: center;
+    font-size: smaller;
+    color: #aaa;
+    text-decoration: none;
+}
+
+.footer {
+    background-image:      url('http://localhost/images/border_bottom.gif');
+    background-repeat:     repeat-x;
+    background-position:   left top;
+    padding-top:           6px;
+    color:                 #666;
+    font-size: smaller;
+    text-align: right;
+}
+\ No newline at end of file
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.zip b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.zip
new file mode 100644
index 0000000000..37399c5de7
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-24.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-25.zip b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-25.zip
new file mode 100644
index 0000000000..12d84ee9dd
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/default_2007-05-25.zip
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif
new file mode 100644
index 0000000000..c8b147fef4
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif.jpeg b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif.jpeg
new file mode 100644
index 0000000000..501d20adf0
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16.gif.jpeg
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif
new file mode 100644
index 0000000000..c8b147fef4
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif
diff --git a/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif.jpeg b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif.jpeg
new file mode 100644
index 0000000000..501d20adf0
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.data/notep_16_2007-05-24.gif.jpeg
diff --git a/site/trunk/site-publish/autoexport-plugin-template.html b/site/trunk/site-publish/autoexport-plugin-template.html
new file mode 100644
index 0000000000..90e5fdb5dc
--- /dev/null
+++ b/site/trunk/site-publish/autoexport-plugin-template.html
@@ -0,0 +1,392 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Autoexport plugin template</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55047">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="Autoexport plugin template">Autoexport plugin template</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Here is a sample template to use with the autoexport plugin. I have also included in the zip file a css and some images.<BR>
+As a minimum, the template has to be modified with the correct URLs for the referenced resources.<BR>
+<A href="autoexport-plugin-template.data/TUSCANY_Templates.zip">TUSCANY_Templates.zip</A></P>
+
+
+<P>Available attachments:</P>
+
+
+    
+
+<DIV class="plugin_attachments_container">
+    <DIV class="plugin_attachments_table_container">
+        <FIELDSET class="hidden">
+            <INPUT type="hidden" class="plugin_attachments_macro_render_param" name="pageId" value="55047">
+            <INPUT type="hidden" name="deleteConfirmMessage" value="Are you sure you want to remove the attached file {0}?">
+            <INPUT type="hidden" name="i18n-notpermitted" value="You are not permitted to perform this operation.">
+                                                    <INPUT type="hidden" name="outputType" value="display">
+        </FIELDSET>
+                    <FIELDSET class="hidden parameters">
+    <INPUT type="hidden" id="removeAttachmentWarning" value="Are you sure you want to remove the attached file {0}?">
+</FIELDSET>
+
+<TABLE class="tableview attachments">
+    <TR>
+                <TH class="filename-column">            <A href="">Name</A>
+    </TH>
+        <TH>            <A href="">Size</A>
+    </TH>
+        <TH>Creator</TH>
+        <TH>            <A href="">Creation Date</A>
+    </TH>
+        <TH class="comment">Comment</TH>
+                    <TH>&nbsp;</TH>
+            </TR>
+
+    
+    
+                
+        
+                <TR id="attachment-4359">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-unknown" title="File">File</SPAN>                <A class="filename" href="autoexport-plugin-template.data/TUSCANY_Templates.zip" title="TUSCANY_Templates.zip" data-filename="TUSCANY_Templates.zip">
+                    TUSCANY_Templates.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">27 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 24, 2007 07:42</TD>
+            <TD class="comment">
+                                    template for autoexport plugin + css + some images
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=TUSCANY_Templates.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=TUSCANY_Templates.zip&version=1" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4363">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-unknown" title="File">File</SPAN>                <A class="filename" href="autoexport-plugin-template.data/Tuscany_template_2007_5_25_v1.zip" title="Tuscany_template_2007_5_25_v1.zip" data-filename="Tuscany_template_2007_5_25_v1.zip">
+                    Tuscany_template_2007_5_25_v1.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">2 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 24, 2007 12:49</TD>
+            <TD class="comment">
+                                    &nbsp;
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=Tuscany_template_2007_5_25_v1.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=Tuscany_template_2007_5_25_v1.zip&version=2" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4365">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-unknown" title="File">File</SPAN>                <A class="filename" href="autoexport-plugin-template.data/default_2007-05-24.zip" title="default_2007-05-24.zip" data-filename="default_2007-05-24.zip">
+                    default_2007-05-24.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">6 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 24, 2007 12:25</TD>
+            <TD class="comment">
+                                    &nbsp;
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=default_2007-05-24.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=default_2007-05-24.zip&version=1" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4367">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-image" title="GIF" file="">GIF File</SPAN>                <A class="filename" href="autoexport-plugin-template.data/notep_16.gif" title="notep_16.gif" data-filename="notep_16.gif">
+                    notep_16.gif
+                </A>
+            </TD>
+            <TD class="attachment-size">0.4 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 24, 2007 12:50</TD>
+            <TD class="comment">
+                                    &nbsp;
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=notep_16.gif" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=notep_16.gif&version=1" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4386">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-zip" title="ZIP" archive="">ZIP Archive</SPAN>                <A class="filename" href="autoexport-plugin-template.data/default_2007-05-25.zip" title="default_2007-05-25.zip" data-filename="default_2007-05-25.zip">
+                    default_2007-05-25.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">6 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 25, 2007 12:30</TD>
+            <TD class="comment">
+                                    &nbsp;
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=default_2007-05-25.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=default_2007-05-25.zip&version=2" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4387">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-zip" title="ZIP" archive="">ZIP Archive</SPAN>                <A class="filename" href="autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v2.zip" title="TUSCANY_template_2007_5_25_v2.zip" data-filename="TUSCANY_template_2007_5_25_v2.zip">
+                    TUSCANY_template_2007_5_25_v2.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">2 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=hcunico" class="url fn confluence-userlink" data-username="hcunico">Hernan Cunico</A></TD>
+            <TD>May 25, 2007 12:30</TD>
+            <TD class="comment">
+                                    &nbsp;
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=TUSCANY_template_2007_5_25_v2.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=TUSCANY_template_2007_5_25_v2.zip&version=1" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            
+                
+        
+                <TR id="attachment-4423">
+                                <TD class="filename-column">
+                
+<SPAN class="icon icon-file-zip" title="ZIP" archive="">ZIP Archive</SPAN>                <A class="filename" href="autoexport-plugin-template.data/TUSCANY_template_2007_5_25_v3.zip" title="TUSCANY_template_2007_5_25_v3.zip" data-filename="TUSCANY_template_2007_5_25_v3.zip">
+                    TUSCANY_template_2007_5_25_v3.zip
+                </A>
+            </TD>
+            <TD class="attachment-size">2 kB</TD>
+            <TD><A href="https://cwiki.apache.org/confluence/users/viewuserprofile.action?username=svkrish" class="url fn confluence-userlink" data-username="svkrish">S Venkatakrishnan</A></TD>
+            <TD>May 27, 2007 10:45</TD>
+            <TD class="comment">
+                                    Template updated for Incubator Logo
+                            </TD>
+                        <TD class="attachment-actions">
+                                                <UL>
+                                            <LI class="first">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/editattachment.action?pageId=$page.id&fileName=TUSCANY_template_2007_5_25_v3.zip" class="editAttachmentLink" title="">
+                   <SPAN>Properties</SPAN></A>        </LI>
+                                            <LI class="">
+    
+        
+    
+    <A href="https://cwiki.apache.org/confluence/pages/removeattachment.action?pageId=$page.id&fileName=TUSCANY_template_2007_5_25_v3.zip&version=1" class="removeAttachmentLink" title="">
+                   <SPAN>Remove</SPAN></A>        </LI>
+                                    </UL>
+                            </TD>
+                    </TR>
+
+            </TABLE>            </DIV>
+
+    <DIV class="plugin_attachments_upload_container">
+            </DIV>
+</DIV>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/binding-ws.html b/site/trunk/site-publish/binding-ws.html
new file mode 100644
index 0000000000..77dca806a2
--- /dev/null
+++ b/site/trunk/site-publish/binding-ws.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : binding-ws</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52069">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="binding-ws">binding-ws</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The binding.ws assembly model...</P>
+
+<P>under construction.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png
new file mode 100644
index 0000000000..48bf481e1d
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png.jpeg
new file mode 100644
index 0000000000..4a05eb3baa
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png
new file mode 100644
index 0000000000..656465d618
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg
new file mode 100644
index 0000000000..268ad62251
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png
new file mode 100644
index 0000000000..80b2822afa
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png.jpeg
new file mode 100644
index 0000000000..5273a016d2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/New_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png
new file mode 100644
index 0000000000..796f560dd8
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png.jpeg
new file mode 100644
index 0000000000..3af6676b6f
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/Tuscany_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png
new file mode 100644
index 0000000000..c1da921ee5
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png.jpeg
new file mode 100644
index 0000000000..779e369a2e
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feed.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png
new file mode 100644
index 0000000000..6e7c4bb227
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png.jpeg
new file mode 100644
index 0000000000..82fe4d8111
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/atom_feeds_page.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png
new file mode 100644
index 0000000000..f7c0fd012b
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png.jpeg
new file mode 100644
index 0000000000..dd108d061a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png
new file mode 100644
index 0000000000..84f439c41c
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png.jpeg
new file mode 100644
index 0000000000..a0828163fd
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/calculator_proj_dlg.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png
new file mode 100644
index 0000000000..60bce5ee98
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png.jpeg
new file mode 100644
index 0000000000..cab8b0264b
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/class_btn.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png
new file mode 100644
index 0000000000..9ef69db7d0
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png.jpeg
new file mode 100644
index 0000000000..99dd341348
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png
new file mode 100644
index 0000000000..00d3edd3d8
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png.jpeg
new file mode 100644
index 0000000000..58e4733cf4
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/first_composite.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg
new file mode 100644
index 0000000000..534748845b
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg.jpeg
new file mode 100644
index 0000000000..6d63cd1c5d
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png
new file mode 100644
index 0000000000..85a24d4a27
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png.jpeg
new file mode 100644
index 0000000000..71c6705477
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/folder_structure.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg
new file mode 100644
index 0000000000..0357e5a253
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg.jpeg
new file mode 100644
index 0000000000..d71bfe84b1
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg
new file mode 100644
index 0000000000..457b4e7983
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg.jpeg
new file mode 100644
index 0000000000..e488e74fd2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_license.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg
new file mode 100644
index 0000000000..23ded64414
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg.jpeg
new file mode 100644
index 0000000000..8e88737cea
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_feature_verification.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg
new file mode 100644
index 0000000000..190036e382
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg.jpeg
new file mode 100644
index 0000000000..bbb6a5ef56
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_finish.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg
new file mode 100644
index 0000000000..ef1bd53888
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg.jpeg
new file mode 100644
index 0000000000..2fd587e991
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_installation.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg
new file mode 100644
index 0000000000..ced23f111a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg.jpeg
new file mode 100644
index 0000000000..83c882dbd7
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_new_site.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg
new file mode 100644
index 0000000000..995daba70d
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg.jpeg
new file mode 100644
index 0000000000..369f562ef2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_restart_eclipse.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg
new file mode 100644
index 0000000000..dcb2ce7afd
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg.jpeg
new file mode 100644
index 0000000000..77ae3d0f92
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_search_results.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg
new file mode 100644
index 0000000000..c32031adcf
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg.jpeg
new file mode 100644
index 0000000000..b929427c48
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/install_update_sites.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png
new file mode 100644
index 0000000000..5c342b8194
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png.jpeg
new file mode 100644
index 0000000000..ee25c45cba
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/interface_btn.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png
new file mode 100644
index 0000000000..902fe75507
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png.jpeg
new file mode 100644
index 0000000000..9ed36e4e23
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png
new file mode 100644
index 0000000000..95b51cf26a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png.jpeg
new file mode 100644
index 0000000000..be327e7e1f
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_dlg.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png
new file mode 100644
index 0000000000..07cd5a0502
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png.jpeg
new file mode 100644
index 0000000000..6b4cd2b9b4
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_pkg_folder.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png
new file mode 100644
index 0000000000..50297b3afa
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png.jpeg
new file mode 100644
index 0000000000..8fdf13e716
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png
new file mode 100644
index 0000000000..5f051094b9
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png.jpeg
new file mode 100644
index 0000000000..22d226ce07
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_dlg.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png
new file mode 100644
index 0000000000..8329b143de
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png.jpeg
new file mode 100644
index 0000000000..90231cf672
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_folder.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png
new file mode 100644
index 0000000000..c0b12eea7a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png.jpeg
new file mode 100644
index 0000000000..4537f7d914
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/new_java_project_lib.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png
new file mode 100644
index 0000000000..9de01ff4d5
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png.jpeg
new file mode 100644
index 0000000000..745f2dbfbd
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/project_layout.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg
new file mode 100644
index 0000000000..c06fec1d7c
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg.jpeg
new file mode 100644
index 0000000000..2ed010eff4
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png
new file mode 100644
index 0000000000..38077052b3
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png.jpeg
new file mode 100644
index 0000000000..32e3de3909
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/release_zips.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg
new file mode 100644
index 0000000000..1ab42867a2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg.jpeg
new file mode 100644
index 0000000000..5339a41827
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png
new file mode 100644
index 0000000000..7dba24bd53
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png.jpeg
new file mode 100644
index 0000000000..00fa4a3ca4
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg
new file mode 100644
index 0000000000..2eb5f64e93
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg.jpeg
new file mode 100644
index 0000000000..5d44c2a867
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png
new file mode 100644
index 0000000000..7d51969a8a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png.jpeg
new file mode 100644
index 0000000000..529ac57071
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/source_attachment_config.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png
new file mode 100644
index 0000000000..988c62fae7
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png.jpeg
new file mode 100644
index 0000000000..e52776334f
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png
new file mode 100644
index 0000000000..834ef26e35
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png.jpeg
new file mode 100644
index 0000000000..7247d60368
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_1.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png
new file mode 100644
index 0000000000..c71b600146
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png.jpeg
new file mode 100644
index 0000000000..0ecef780b1
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_2.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png
new file mode 100644
index 0000000000..2560148e19
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png.jpeg
new file mode 100644
index 0000000000..d05d2288af
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_page_3.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png
new file mode 100644
index 0000000000..f0d1999ff2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png.jpeg
new file mode 100644
index 0000000000..fab518699e
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png
new file mode 100644
index 0000000000..eb6bd340d2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png.jpeg
new file mode 100644
index 0000000000..404c40daf8
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_1.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png
new file mode 100644
index 0000000000..81119985d8
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png.jpeg
new file mode 100644
index 0000000000..0159ecc040
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_2.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg
new file mode 100644
index 0000000000..a682bb2d74
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg.jpeg
new file mode 100644
index 0000000000..23b9f5c584
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png
new file mode 100644
index 0000000000..5aaf5ed3fd
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png.jpeg
new file mode 100644
index 0000000000..6a5e9220cb
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_3.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg
new file mode 100644
index 0000000000..7c7ed0a157
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg.jpeg
new file mode 100644
index 0000000000..c0aa95b56b
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png
new file mode 100644
index 0000000000..217d10ed25
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png.jpeg
new file mode 100644
index 0000000000..9c90a17f3a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_4.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg
new file mode 100644
index 0000000000..4b7e5a9b67
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg.jpeg
new file mode 100644
index 0000000000..ea68ebff08
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png
new file mode 100644
index 0000000000..3586520e47
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png.jpeg
new file mode 100644
index 0000000000..3fa840138a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/store_project_5.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg
new file mode 100644
index 0000000000..6e7ec70688
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg.jpeg
new file mode 100644
index 0000000000..b6019f5311
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png
new file mode 100644
index 0000000000..d58afb88d1
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png.jpeg
new file mode 100644
index 0000000000..7ade1f20e5
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_folder.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg
new file mode 100644
index 0000000000..7fb4ed05c0
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg.jpeg
new file mode 100644
index 0000000000..2468cc9b6e
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png
new file mode 100644
index 0000000000..fe79cf56c7
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png.jpeg
new file mode 100644
index 0000000000..d953ca2af1
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/tuscany_samples_folder.png.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG
new file mode 100644
index 0000000000..33e01c63e7
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG.jpeg
new file mode 100644
index 0000000000..7690c22c0e
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG
new file mode 100644
index 0000000000..a5e58551c5
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG.jpeg
new file mode 100644
index 0000000000..935bf6e6f5
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG
new file mode 100644
index 0000000000..71b59cef74
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG.jpeg
new file mode 100644
index 0000000000..11a5479965
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG
new file mode 100644
index 0000000000..4f0cc4c09b
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG.jpeg
new file mode 100644
index 0000000000..86b1e5698a
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG
new file mode 100644
index 0000000000..285882a078
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG.jpeg
new file mode 100644
index 0000000000..6942aa9b52
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG
new file mode 100644
index 0000000000..b8fca77f2c
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG.jpeg
new file mode 100644
index 0000000000..074236db18
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG
new file mode 100644
index 0000000000..21c7edebf2
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG.jpeg
new file mode 100644
index 0000000000..9691690eaf
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_2.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG
new file mode 100644
index 0000000000..47415875c8
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG.jpeg
new file mode 100644
index 0000000000..8d61af3c19
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG
new file mode 100644
index 0000000000..e49b9d9e90
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG.jpeg
new file mode 100644
index 0000000000..f05ba2d422
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.JPG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG
new file mode 100644
index 0000000000..a77ce9581d
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG.jpeg b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG.jpeg
new file mode 100644
index 0000000000..8399803f9c
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG.jpeg
diff --git a/site/trunk/site-publish/build-your-first-web-services-with-tuscany.html b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.html
new file mode 100644
index 0000000000..aa892d0992
--- /dev/null
+++ b/site/trunk/site-publish/build-your-first-web-services-with-tuscany.html
@@ -0,0 +1,346 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Build your first Web Services with Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82971">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Build your first Web Services with Tuscany">Build your first Web Services with Tuscany</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="BuildyourfirstWebServiceswithTuscany-BuildyourfirstWebServiceswithTuscany"></A>Build your first Web Services with Tuscany</H1>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Create%20Your%20First%20Web%20Service%20with%20Apache%20Tuscany" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Creating Your First Web Service with Apache Tuscany video&quot;</A><BR>
+This guide will give you step by step instructions on how to build your first web services.<BR>
+The first part, we will learn how we can add the Tuscany Runtime to Eclipse IDE.<BR>
+The second part, will show how easy is to create a webservices using Apache Tuscany.</P>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-InstalltheLatestTuscanyEclipsePlugin"></A>Install the Latest Tuscany Eclipse Plugin</H2>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Installing%20the%20Apache%20Tuscany%20Eclipse%20Plugins" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Installing the Apache Tuscany Eclipse Plugins video&quot;</A></P>
+
+<P>A quick Step by Step walk through of downloading, installing, and verifying the Tuscany Eclipse Plugins.</P>
+
+<P>This section shows you how to install the lastest Tuscany Eclipse plugin. The plugin gives you the ability to run an SCA composite file from the Package Explorer. You will see a &quot;Run As Tuscany&quot; menu item when you bring up the context menu on composite files.</P>
+
+<P>Start Eclipse and go to Help -&gt; Software Updates -&gt; Find and Install. Select &quot;Search for new features to install&quot; and then click next</P>
+
+<P>Create a new Remote Site. On the next dialog, click on &quot;New Remote Site...&quot; to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL from the latest <B><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases">Tuscany release</A></B> (e.g  <B><A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/" class="external-link" rel="nofollow">http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/</A></B>.</P>
+
+<P>Select the &quot;Remote Site&quot; you just created, and click &quot;Finish&quot;</P>
+
+<P>Select the &quot;Apache Tuscany SCA Tools&quot; and click &quot;Next&quot;, and then, on the next dialog, click &quot;Finish&quot;. Accept the &quot;Plugin License&quot; and next click on &quot;Install All&quot;.</P>
+
+<P>When asked to &quot;restart eclipse&quot;, click the &quot;yes&quot; button. </P>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-CreateyourServiceBusinessLogic"></A>Create your Service Business Logic</H2>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-CreateaJavaProject"></A>Create a Java Project</H2>
+
+<P>In this step you create a Java Project in Eclipse to hold the composite service application.<BR>
+Click on the <B><EM>New Java Project</EM></B> button <SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/new_java_project.png" style="border: 0px solid black"></SPAN>&nbsp; in the toolbar to launch the project creation dialog.<BR>
+Next you enter &quot;ws&quot; as the <B><EM>Project name</EM></B>, and for <B><EM>Project Layout</EM></B> select <B><EM>Create separate</EM></B><BR>
+<B><EM>folders for sources and class files.</EM></B><BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_name.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_layout.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Hit the <B><EM>Next</EM></B> button, and on the following page go to the <B><EM>Libraries</EM></B> tab. Use the <B><EM>Add Library...</EM></B><BR>
+button on the right to add the <B>Tuscany Library</B> library to the project.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_create_new_java_project_tuscany_library.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;<BR>
+Hit the <B><EM>Finish</EM></B> button to complete the <B><EM>New Java Project</EM></B> dialog to create the &quot;ws&quot; java project.&nbsp;<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;</P>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-ConstructServices"></A>Construct Services</H2>
+
+<P>First you create the &quot;helloworld&quot; package folders into which later in this step you place service implementations.<BR>
+Select the &quot;ws&quot; project and click on the <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN> in the toolbar to launch<BR>
+the package creation dialog.</P>
+
+<P>Next you enter &quot;helloworld&quot; as the package <B><EM>Name</EM></B>, and press the <B><EM>Finish</EM></B> button to complete the<BR>
+dialog.<BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_new_java_package.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H3><A name="BuildyourfirstWebServiceswithTuscany-HelloWorld"></A><EM>HelloWorld</EM></H3>
+
+<P>In this step you create the HelloWorld service interface and implementation.<BR>
+Select the &quot;helloworld&quot; package. Next you click on the dropdown arrow next to the <B><EM>New Java Class</EM></B><BR>
+button&nbsp; <SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp; and select the <B><EM>New Java Interface</EM></B>&nbsp;&nbsp;&nbsp;<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/interface_btn.png" style="border: 0px solid black"></SPAN> option from the dropdown list. In the dialog<BR>
+enter &quot;HelloWorld&quot; as the <B><EM>Name</EM></B> of the interface and select the Finish button to complete the dialog.<BR>
+The Java editor will open on the new created Java interface. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java interface code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> helloworld;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> HelloWorld {
+    <SPAN class="code-object">String</SPAN> sayHello(<SPAN class="code-object">String</SPAN> name);
+}
+</PRE>
+</DIV></DIV>
+<P>Select the &quot;helloworld&quot; package again. Select the <B><EM>New Java Class</EM></B> button <SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/class_btn.png" style="border: 0px solid black"></SPAN> . In the dialog enter<BR>
+&quot;HelloWorldImpl&quot; as the <B><EM>Name</EM></B> of the class, add &quot;Catalog&quot; as the interface this class implements, and<BR>
+then select <B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> helloworld;
+<SPAN class="code-keyword">public</SPAN> class HelloWorldImpl <SPAN class="code-keyword">implements</SPAN> HelloWorld {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> sayHello(<SPAN class="code-object">String</SPAN> name) {
+		<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;Hello &quot;</SPAN> + name;
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;ws&quot; project will look as follows.<BR>
+<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_1.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-ComposeServices"></A>Compose Services</H2>
+
+<P>Now that you have all the required service implementations you compose them together to provide<BR>
+the helloworld composite service. The composition is stored in a .composite file.</P>
+
+<P>Select the &quot;src&quot; folder of the &quot;ws&quot; project. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;helloworld.composite&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created composite file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following composite snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>    xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>    xmlns:c=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>    targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;helloworld&quot;</SPAN>&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;HelloWorldComponent&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldImpl&quot;</SPAN>/&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+			&lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/HelloWorld&quot;</SPAN>/&gt;
+</SPAN>		&lt;/service&gt;
+	&lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;ws&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_new_java_project_structure_3.JPG" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<P>Congratulations you completed your 1st composite service applications, now its time to take it into<BR>
+action.</P>
+
+<H2><A name="BuildyourfirstWebServiceswithTuscany-UseServices"></A>Use Services</H2>
+
+<P>In this step you launch and use the ws composite service application you created.</P>
+
+<P>First select the &quot;helloworld.composite&quot; file, in your &quot;ws&quot; project. <B><EM>Right click</EM></B> to get the<BR>
+context menu, select <B><EM>Run As</EM></B>, and then <B><EM>Tuscany</EM></B>. The Tuscany runtime will start up adding<BR>
+the helloworld composition to its domain and will make the helloworld web service live.</P>
+
+<P>The Eclipse console will show the following messages.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="build-your-first-web-services-with-tuscany.data/ws_new_project_console_output.PNG" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Next Launch your Web browser and enter the following address:</P>
+
+<P><A href="http://localhost:8080/HelloWorld?wsdl" class="external-link" rel="nofollow">http://localhost:8080/HelloWorld?wsdl</A>&nbsp;</P>
+
+<P>You should now have your web service live, and the url should give you back a generated wsdl for the service.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;wsdl:definitions targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN> xmlns:soap12=<SPAN class="code-quote">&quot;http://schemas.xmlsoap.org/wsdl/soap12/&quot;</SPAN> xmlns:ns0=<SPAN class="code-quote">&quot;http://helloworld&quot;</SPAN> xmlns:mime=<SPAN class="code-quote">&quot;http://schemas.xmlsoap.org/wsdl/mime/&quot;</SPAN> xmlns:http=<SPAN class="code-quote">&quot;http://schemas.xmlsoap.org/wsdl/http/&quot;</SPAN> xmlns:ns1=<SPAN class="code-quote">&quot;http://org.apache.axis2/xsd&quot;</SPAN> xmlns:wsaw=<SPAN class="code-quote">&quot;http://www.w3.org/2006/05/addressing/wsdl&quot;</SPAN> xmlns:xs=<SPAN class="code-quote">&quot;http://www.w3.org/2001/XMLSchema&quot;</SPAN> xmlns:soap=<SPAN class="code-quote">&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;</SPAN> xmlns:wsdl=<SPAN class="code-quote">&quot;http://schemas.xmlsoap.org/wsdl/&quot;</SPAN>&gt;
+</SPAN>  &lt;wsdl:types&gt;
+    &lt;xs:schema attributeFormDefault=<SPAN class="code-quote">&quot;qualified&quot;</SPAN> elementFormDefault=<SPAN class="code-quote">&quot;qualified&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN> xmlns:ns=<SPAN class="code-quote">&quot;http://helloworld&quot;</SPAN>&gt;
+</SPAN>         &lt;xs:element name=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN>&gt;
+            &lt;xs:complexType&gt;
+               &lt;xs:sequence&gt;
+                  &lt;xs:element minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> name=<SPAN class="code-quote">&quot;param0&quot;</SPAN> nillable=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">true</SPAN>&quot;</SPAN> type=<SPAN class="code-quote">&quot;xs:string&quot;</SPAN>/&gt;
+               &lt;/xs:sequence&gt;
+            &lt;/xs:complexType&gt;
+
+         &lt;/xs:element&gt;
+         &lt;xs:element name=<SPAN class="code-quote">&quot;sayHelloResponse&quot;</SPAN>&gt;
+            &lt;xs:complexType&gt;
+               &lt;xs:sequence&gt;
+                  &lt;xs:element minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> name=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">return</SPAN>&quot;</SPAN> nillable=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">true</SPAN>&quot;</SPAN> type=<SPAN class="code-quote">&quot;xs:string&quot;</SPAN>/&gt;
+               &lt;/xs:sequence&gt;
+            &lt;/xs:complexType&gt;
+         &lt;/xs:element&gt;
+      &lt;/xs:schema&gt;
+
+  &lt;/wsdl:types&gt;
+  &lt;wsdl:message name=<SPAN class="code-quote">&quot;sayHelloRequest&quot;</SPAN>&gt;
+    &lt;wsdl:part name=<SPAN class="code-quote">&quot;parameters&quot;</SPAN> element=<SPAN class="code-quote">&quot;ns0:sayHello&quot;</SPAN>&gt;
+    &lt;/wsdl:part&gt;
+  &lt;/wsdl:message&gt;
+  &lt;wsdl:message name=<SPAN class="code-quote">&quot;sayHelloResponse&quot;</SPAN>&gt;
+    &lt;wsdl:part name=<SPAN class="code-quote">&quot;parameters&quot;</SPAN> element=<SPAN class="code-quote">&quot;ns0:sayHelloResponse&quot;</SPAN>&gt;
+    &lt;/wsdl:part&gt;
+  &lt;/wsdl:message&gt;
+
+  &lt;wsdl:portType name=<SPAN class="code-quote">&quot;HelloWorldPortType&quot;</SPAN>&gt;
+    &lt;wsdl:operation name=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN>&gt;
+      &lt;wsdl:input message=<SPAN class="code-quote">&quot;ns0:sayHelloRequest&quot;</SPAN> wsaw:Action=<SPAN class="code-quote">&quot;urn:sayHello&quot;</SPAN>&gt;
+    &lt;/wsdl:input&gt;
+      &lt;wsdl:output message=<SPAN class="code-quote">&quot;ns0:sayHelloResponse&quot;</SPAN> wsaw:Action=<SPAN class="code-quote">&quot;urn:sayHelloResponse&quot;</SPAN>&gt;
+    &lt;/wsdl:output&gt;
+    &lt;/wsdl:operation&gt;
+  &lt;/wsdl:portType&gt;
+  &lt;wsdl:binding name=<SPAN class="code-quote">&quot;HelloWorldHttpBinding&quot;</SPAN> type=<SPAN class="code-quote">&quot;ns0:HelloWorldPortType&quot;</SPAN>&gt;
+
+    &lt;http:binding verb=<SPAN class="code-quote">&quot;POST&quot;</SPAN>/&gt;
+    &lt;wsdl:operation name=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN>&gt;
+      &lt;http:operation location=<SPAN class="code-quote">&quot;HelloWorld/sayHello&quot;</SPAN>/&gt;
+      &lt;wsdl:input&gt;
+        &lt;mime:content part=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN> type=<SPAN class="code-quote">&quot;text/xml&quot;</SPAN>/&gt;
+      &lt;/wsdl:input&gt;
+      &lt;wsdl:output&gt;
+        &lt;mime:content part=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN> type=<SPAN class="code-quote">&quot;text/xml&quot;</SPAN>/&gt;
+      &lt;/wsdl:output&gt;
+
+    &lt;/wsdl:operation&gt;
+  &lt;/wsdl:binding&gt;
+  &lt;wsdl:binding name=<SPAN class="code-quote">&quot;HelloWorldSOAP11Binding&quot;</SPAN> type=<SPAN class="code-quote">&quot;ns0:HelloWorldPortType&quot;</SPAN>&gt;
+    &lt;soap:binding style=<SPAN class="code-quote">&quot;document&quot;</SPAN> transport=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//schemas.xmlsoap.org/soap/http&quot;</SPAN>/&gt;
+</SPAN>    &lt;wsdl:operation name=<SPAN class="code-quote">&quot;sayHello&quot;</SPAN>&gt;
+      &lt;soap:operation soapAction=<SPAN class="code-quote">&quot;urn:sayHello&quot;</SPAN> style=<SPAN class="code-quote">&quot;document&quot;</SPAN>/&gt;
+      &lt;wsdl:input&gt;
+        &lt;soap:body use=<SPAN class="code-quote">&quot;literal&quot;</SPAN>/&gt;
+      &lt;/wsdl:input&gt;
+
+      &lt;wsdl:output&gt;
+        &lt;soap:body use=<SPAN class="code-quote">&quot;literal&quot;</SPAN>/&gt;
+      &lt;/wsdl:output&gt;
+    &lt;/wsdl:operation&gt;
+  &lt;/wsdl:binding&gt;
+  &lt;wsdl:service name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+    &lt;wsdl:port name=<SPAN class="code-quote">&quot;HelloWorldSOAP11port_http&quot;</SPAN> binding=<SPAN class="code-quote">&quot;ns0:HelloWorldSOAP11Binding&quot;</SPAN>&gt;
+      &lt;soap:address location=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//192.168.209.1:8080/HelloWorld&quot;</SPAN>/&gt;
+</SPAN>    &lt;/wsdl:port&gt;
+
+    &lt;wsdl:port name=<SPAN class="code-quote">&quot;HelloWorldHttpport&quot;</SPAN> binding=<SPAN class="code-quote">&quot;ns0:HelloWorldHttpBinding&quot;</SPAN>&gt;
+      &lt;http:address location=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//192.168.209.1:8080/HelloWorld&quot;</SPAN>/&gt;
+</SPAN>    &lt;/wsdl:port&gt;
+  &lt;/wsdl:service&gt;
+&lt;/wsdl:definitions&gt;
+</PRE>
+</DIV></DIV>
+<P>You are finished. You have created the HelloWorld web service using Apache Tuscany.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/build-your-light-tuscany-distribution.html b/site/trunk/site-publish/build-your-light-tuscany-distribution.html
new file mode 100644
index 0000000000..b4c090e896
--- /dev/null
+++ b/site/trunk/site-publish/build-your-light-tuscany-distribution.html
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Build Your Light Tuscany Distribution : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=99358">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Build Your Light Tuscany Distribution">Build Your Light Tuscany Distribution</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="BuildYourLightTuscanyDistribution-Whatthisisabout"></A>What this is about</H1>
+
+<P>As of release 1.3 Tuscany SCA is distributed via one binary distribution that includes everything. Based on user feedback, choice of a smaller distribution packages is desireable. Tuscany community is in the process of addressing this requirement. Please see mailing list for that discussion. This is not the purpose of this page.</P>
+
+<P>Tuscany users have asked for a write-up that highlights module dependencies. This enables them to build their own distribution which may have a lower or higher granularity than the pre-packaged binary distributions. Purpose of this page is to help users understand how to build their own tuscany SCA light distribution based on module dependency knowledge that is shared here.</P>
+
+<P>Therefore:<BR>
+<B>This page is not about</B> building Tuscany binary distributions to distribute<BR>
+<B>This page is about</B> understanding dependencies so that users can build their own distribution</P>
+
+<H1><A name="BuildYourLightTuscanyDistribution-Howtobuildyourowndistribution"></A>How to build your own distribution</H1>
+
+<P>Let's first understand the different categories of module types in Tuscany. This understanding will help us determine how to put the modules together to have a runnable and useful system.</P>
+
+<H2><A name="BuildYourLightTuscanyDistribution-TuscanyModulesCategorized"></A>Tuscany Modules Categorized</H2>
+
+<P><B>SCA programming Model: Assembly, Deployment, Management</B><BR>
+SCA provides a programming model for Construction, Assembly, Deployment and Management of network of services. Modules under these catetories support the SCA programming model.</P>
+
+<P><B>Tuscany Container</B><BR>
+Modules in this category are specific to running SCA in a Tuscany environment.<BR>
+Tuscany container also provides plug points for different host types, bindings, implementations, policies as well as deployment and management (contributions and domain handling).</P>
+
+<P><B>Policy</B><BR>
+Module in this category include support for enabling policies as well as policy types.</P>
+
+<P><B>Binding</B><BR>
+Modules in this category include various bindings that support different protocols. Typically Bindings are used with SCA programming model, Tuscany container and some component implementation types.</P>
+
+<P><B>Implementation</B><BR>
+Modules in this category include support for different component types. Basic SCA environment is needed to use any of these modules.</P>
+
+<P><B>Host Environment</B><BR>
+Modules in this category include support for different host environments, such as Tomcat, Jetty, etc.</P>
+
+<H3><A name="BuildYourLightTuscanyDistribution-ModuleCategoryDependency"></A>Module Category Dependency</H3>
+
+<P>This section explains the dependencies amongst various categories. This information can be used to define the scope of modules needed to perform different tasks using Tuscany.</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> Category </TD>
+<TD class="confluenceTd"> Dependency </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA Programming Model </TD>
+<TD class="confluenceTd"> None. It runs in any container </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Programming Model. Note that Tuscany Container has plug points for various host environments, but is not dependent on any. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> Tuscany Container and SCA PM </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binding </TD>
+<TD class="confluenceTd"> Tuscany Container and some host environment depending on the protocol type </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Implementation </TD>
+<TD class="confluenceTd"> Tuscany Container </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="BuildYourLightTuscanyDistribution-TuscanyModulesBreakDownbyCategory"></A>Tuscany Modules Break Down by Category</H3>
+
+<P><FONT color="#009900"><B>Note</B></FONT> All modules that represent models are highlighted in green.</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Category</B></FONT> </TD>
+<TD class="confluenceTd"> <B>Description</B> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>SCA constructs</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Tuscany Modules</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Detail</B></FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA assembly </TD>
+<TD class="confluenceTd"> composite <BR clear="all">
+componentType </TD>
+<TD class="confluenceTd"> <FONT color="#009900">assembly</FONT> <BR clear="all">
+assembly-xml <BR clear="all">
+assembly-xsd </TD>
+<TD class="confluenceTd"> Model interfaces for the SCA assembly <BR clear="all">
+XML Reader, Writer and Resolver <BR clear="all">
+XSDs for the assemlby model </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> Java Interface </TD>
+<TD class="confluenceTd"> interface.java </TD>
+<TD class="confluenceTd"> <FONT color="#009900">interface</FONT> <BR clear="all">
+interface-java <BR clear="all">
+interface-java-xml </TD>
+<TD class="confluenceTd"> Model for interface/operation <BR clear="all">
+across Java and WS <BR clear="all">
+Model for java interface <BR clear="all">
+Reader/Writer for interface.java <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> WSDL Interface </TD>
+<TD class="confluenceTd"> interface.wsdl </TD>
+<TD class="confluenceTd"> interface <BR clear="all">
+interface-java-jaxws <BR clear="all">
+interface-wsdl <BR clear="all">
+interface-wsdl-xml <BR clear="all">
+<BR clear="all">
+xsd <BR clear="all">
+xsd-xml </TD>
+<TD class="confluenceTd"> Interface processor for JAXWS annotation <BR clear="all">
+WSDL port type as the interface definition <BR clear="all">
+Reader/Writer for interface.wsdl <BR clear="all">
+<BR clear="all">
+Model for XSD artifacts <BR clear="all">
+Reader/Writer to load/save XSDs </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> intent <BR clear="all">
+policySet </TD>
+<TD class="confluenceTd"> <FONT color="#009900">policy</FONT> <BR clear="all">
+policy-xml <BR clear="all">
+policy-xml-ws <BR clear="all">
+<BR clear="all">
+policy-logging <BR clear="all">
+policy-security <BR clear="all">
+policy-security-jsr250 <BR clear="all">
+policy-security-ws <BR clear="all">
+policy-transaction <BR clear="all">
+<BR clear="all"> <FONT color="#009900">definitions</FONT> <BR clear="all">
+definitions-xml </TD>
+<TD class="confluenceTd"> Model for policy <BR clear="all">
+Read/Writer for policy&nbsp;XML <BR clear="all">
+Reader/Writer for WS policy&nbsp;XML </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Contribution Processing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">contribution</FONT> <BR clear="all">
+contribution-xml <BR clear="all">
+contribution-impl <BR clear="all">
+contribution-java <BR clear="all">
+contribution-namespace <BR clear="all">
+contribution-osgi <BR clear="all">
+contribution-resource </TD>
+<TD class="confluenceTd"> Process SCA contribution (archives) and build the model for containing artifacts </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Extensibility </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">extensibility</FONT> <BR clear="all">
+extensibility-equinox </TD>
+<TD class="confluenceTd"> Provide the extensibility to plugin tuscany extensions such as utilities, XML processors, <BR clear="all">
+binding providers, <BR clear="all">
+implementation providers and databindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Runtime core and SPI for extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">core</FONT> <BR clear="all">
+core-spi <BR clear="all">
+core-databinding <BR clear="all"> </TD>
+<TD class="confluenceTd"> Core activates SCA composite and build up the invocation chain between <BR clear="all">
+SCA services and references over the bindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">databinding</FONT> <BR clear="all">
+<BR clear="all">
+databinding-axiom <BR clear="all">
+databinding-fastinfoset <BR clear="all">
+databinding-jaxb <BR clear="all">
+databinding-jaxb-axiom <BR clear="all">
+databinding-json <BR clear="all">
+databinding-saxon <BR clear="all">
+databinding-sdo <BR clear="all">
+databinding-sdo-axiom <BR clear="all">
+databinding-xmlbeans </TD>
+<TD class="confluenceTd"> A framework to deal with data representation and transformation </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA API </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> sca-api <BR clear="all"> </TD>
+<TD class="confluenceTd"> SCA Java common APIs and Annotations </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Node API, Impl and Launchers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> node-api <BR clear="all">
+node-dynamic <BR clear="all">
+node-impl <BR clear="all">
+node-launcher <BR clear="all">
+node-launcher-equinox <BR clear="all">
+thirdparty-library <BR clear="all">
+<BR clear="all">
+node-launcher-webapp <BR clear="all">
+node-manager <BR clear="all">
+implementation-node <BR clear="all">
+implementation-node-runtime <BR clear="all">
+host-embedded </TD>
+<TD class="confluenceTd"> Api used to Start/Stop SCA node which bootstraps SCA runtime to run the application. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Domain Manager </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> domain-manager <BR clear="all">
+workspace <BR clear="all">
+workspace-impl <BR clear="all">
+workspace-xml </TD>
+<TD class="confluenceTd"> Define and manage domain </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Serviceability: Monitoring, Logging and Tracing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">monitor</FONT> <BR clear="all">
+monitor-logging <BR clear="all">
+tracing-aspectj <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Host Types</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Host environments</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#000000">host-http</FONT> <BR clear="all"> <FONT color="#000000">host-jetty</FONT> <BR clear="all"> <FONT color="#000000">host-tomcat</FONT> <BR clear="all"> <FONT color="#000000">host-webapp</FONT> <BR clear="all"> <FONT color="#000000">host-webapp-junit</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP protocol support for all http-based bindings, more can be added through host SPIs.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed bindings:</FONT> <BR clear="all"> <FONT color="#000000">Atom</FONT> <BR clear="all"> <FONT color="#000000">RSS</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.atom</FONT> <BR clear="all"> <FONT color="#000000">binding.rss</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-atom</FONT> <BR clear="all"> <FONT color="#000000">binding-atom-abdera</FONT> <BR clear="all"> <FONT color="#000000">binding-rss</FONT> <BR clear="all"> <FONT color="#000000">binding-rss-rome</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed support, including atom and rss protocols.&nbsp;Needs&nbsp;http&nbsp;type host environment.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jsonrpc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jsonrpc</FONT> <BR clear="all"> <FONT color="#000000">binding-jsonrpc-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC for AJAX. Needs&nbsp;http&nbsp;type host environment.&nbsp;</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-rmi</FONT> <BR clear="all"> <FONT color="#000000">host-rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jms</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jms</FONT> <BR clear="all"> <FONT color="#000000">binding-jms-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ejb</FONT> <BR clear="all"> <FONT color="#000000">binding-ejb-runtime</FONT> <BR clear="all"> <FONT color="#000000">host-ejb</FONT> <BR clear="all"> <FONT color="#000000">host-openejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.corba</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-corba</FONT> <BR clear="all"> <FONT color="#000000">binding-corba-runtime</FONT> <BR clear="all"> <FONT color="#000000">host-corba</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jee</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jse</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jse-tns</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.gdata</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-gdata</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-runtime</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-gsoc</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-runtime-gsoc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.http</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-http</FONT> <BR clear="all"> <FONT color="#000000">binding-http-runtime</FONT> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Web Service binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> binding.ws </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ws</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-axis2</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-axis2-policy</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-wsdlgen</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-xml</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> WebServices </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">SCA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.sca</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-sca</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-xml</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-axis2</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-corba</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-jms</FONT> <BR clear="all"> <FONT color="#000000">endpoint</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> One of the binding-sca-(types) is needed. The default is corba? </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Java implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.java</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-java</FONT> <BR clear="all"> <FONT color="#000000">implementation-java-xml</FONT> <BR clear="all"> <FONT color="#000000">implementation-java-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Java component types </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">BPEL implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.bpel</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-bpel</FONT> <BR clear="all"> <FONT color="#000000">implementation-bpel-jbpm</FONT> <BR clear="all"> <FONT color="#000000">implementation-bpel-ode</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Use BPEL components in a composite application. Includes support for Apache ODE. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> EJBs as components in a composition </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Scripting language based implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables using Groovy, JavaScript, Ruby, Python as components. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Spring implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables inclusion of Spring Application Context in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Widgets </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;implementation.widget</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-widget</FONT> <BR clear="all"> <FONT color="#000000">implementation-widget-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Widget support for web20</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">OSGi implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT>enables incusion of &nbsp;OSGI bundles&nbsp; in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP Resource implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.resource</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-resource</FONT> <BR clear="all"> <FONT color="#000000">implementation-resource-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP resource type component </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">XQuery implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Xquery component</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Data Access Services</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">data-api</FONT> <BR clear="all"> <FONT color="#000000">data-engine-helper</FONT> <BR clear="all"> <FONT color="#000000">implementation-das</FONT> <BR clear="all"> <FONT color="#000000">implementation-data-xml</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H4><A name="BuildYourLightTuscanyDistribution-RelationshipofModulesandOSGIBundles"></A>Relationship of Modules and OSGI Bundles</H4>
+<P>There are various ways and views for creating OSGI bundles. This can be discussed under &quot;OSGI bundles&quot; topic which can define how modules in a bundle are versioned together, start together and share class loaders. For the sake of understanding structure of modules, we can say that each module is an <BR>
+OSGI bundle. These can be pulled together to create coarser grain bundles if needed.  </P>
+
+<H2><A name="BuildYourLightTuscanyDistribution-UsecaseExamplesforTuscanyusage"></A>Use case Examples for Tuscany usage</H2>
+
+
+<H3><A name="BuildYourLightTuscanyDistribution-UseTuscanyasaruntimeforSCAdevelopment"></A>Use Tuscany as a runtime for SCA development</H3>
+
+<P><B>Example:</B> Develop SCA applications in Tuscany based on POJOs<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Tuscany Container, implementation.java, SCA default binding</P>
+
+<H3><A name="BuildYourLightTuscanyDistribution-Adopttheprogrammingmodeltocreateacomponentmodelforyourownruntime"></A>Adopt the programming model to create a component model for your own runtime</H3>
+
+<P><B>Example:</B> Use SCA for configuration of and ESB engine<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM</P>
+
+<H3><A name="BuildYourLightTuscanyDistribution-EmbedTuscanywithinanapplicationserver"></A>Embed Tuscany within an application server</H3>
+
+<P><B>Example:</B> Embed Tuscany with an application server such as Geronimo<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Pick the features that are needed to run on the given platform, binding.ejb, implemenation.java, etc. In some cases you need to use host SPIs to provide the platform specific behavior. For examples check out host_&#42; modules.</P>
+
+<H3><A name="BuildYourLightTuscanyDistribution-CreatetoolsforSCA"></A>Create tools for SCA</H3>
+
+<P><B>Example:</B> Write a development tool for SCA<BR>
+Basic Category of Modules Needed:&#95; SCA PM</P>
+
+<H3><A name="BuildYourLightTuscanyDistribution-Otherscenarios"></A>Other scenarios</H3>
+
+<P>Please help add other interesting scenarios</P>
+
+<H2><A name="BuildYourLightTuscanyDistribution-Howtocreateyourowndistribution"></A>How to create your own distribution</H2>
+
+<P>TBD<BR>
+Link to the page describing how to create a POM.xml and use maven to generate distribution.<BR>
+Talk about how maven figures out third party dependencies. </P></TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/build-your-own-tuscany-distribution.html b/site/trunk/site-publish/build-your-own-tuscany-distribution.html
new file mode 100644
index 0000000000..cf516428cb
--- /dev/null
+++ b/site/trunk/site-publish/build-your-own-tuscany-distribution.html
@@ -0,0 +1,625 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Build Your Own Tuscany Distribution : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=99358">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Build Your Own Tuscany Distribution">Build Your Own Tuscany Distribution</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/" title="Visit page outside Confluence" rel="nofollow">1.x Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" title="Visit page outside Confluence" rel="nofollow">2.x Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://tinyurl.com/8rlxd3" title="Visit page outside Confluence" rel="nofollow">Roadmap<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="BuildYourOwnTuscanyDistribution-Whatthisisabout"></A>What this is about</H1>
+
+<P>As of release 1.3 Tuscany SCA is distributed via one binary distribution that includes everything. Based on user feedback, choice of a smaller distribution packages is desireable. Tuscany community is in the process of addressing this requirement. Please see mailing list for that discussion. This is not the purpose of this page.</P>
+
+<P>Tuscany users have asked for a write-up that highlights module dependencies. This enables them to build their own distribution which may have a lower or higher granularity than the pre-packaged binary distributions. Purpose of this page is to help users understand how to build their own tuscany SCA light distribution based on module dependency knowledge that is shared here.</P>
+
+<P>Therefore:<BR>
+<B>This page is not about</B> building Tuscany binary distributions to distribute<BR>
+<B>This page is about</B> understanding dependencies so that users can build their own distribution</P>
+
+<H1><A name="BuildYourOwnTuscanyDistribution-Howtobuildyourowndistribution"></A>How to build your own distribution</H1>
+
+<P>Let's first understand the different categories of module types in Tuscany. This understanding will help us determine how to put the modules together to have a runnable and useful system.</P>
+
+<H2><A name="BuildYourOwnTuscanyDistribution-TuscanyModulesCategorized"></A>Tuscany Modules Categorized</H2>
+
+<P><B>SCA programming Model: Assembly, Deployment, Management</B><BR>
+SCA provides a programming model for Construction, Assembly, Deployment and Management of network of services. Modules under these catetories support the SCA programming model.</P>
+
+<P><B>Tuscany Container</B><BR>
+Modules in this category are specific to running SCA in a Tuscany environment.<BR>
+Tuscany container also provides plug points for different host types, bindings, implementations, policies as well as deployment and management (contributions and domain handling).</P>
+
+<P><B>Policy</B><BR>
+Module in this category include support for enabling policies as well as policy types.</P>
+
+<P><B>Binding</B><BR>
+Modules in this category include various bindings that support different protocols. Typically Bindings are used with SCA programming model, Tuscany container and some component implementation types.</P>
+
+<P><B>Implementation</B><BR>
+Modules in this category include support for different component types. Basic SCA environment is needed to use any of these modules.</P>
+
+<P><B>Host Environment</B><BR>
+Modules in this category include support for different host environments, such as Tomcat, Jetty, etc.</P>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-ModuleCategoryDependency"></A>Module Category Dependency</H3>
+
+<P>This section explains the dependencies amongst various categories. This information can be used to define the scope of modules needed to perform different tasks using Tuscany.</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> Category </TD>
+<TD class="confluenceTd"> Dependency </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA Programming Model </TD>
+<TD class="confluenceTd"> None. It runs in any container </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Programming Model. Note that Tuscany Container has plug points for various host environments, but is not dependent on any. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> Tuscany Container and SCA PM </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binding </TD>
+<TD class="confluenceTd"> Tuscany Container and some host environment depending on the protocol type </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Implementation </TD>
+<TD class="confluenceTd"> Tuscany Container </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-TuscanyModulesBreakDownbyCategory"></A>Tuscany Modules Break Down by Category</H3>
+
+<P><FONT color="#009900"><B>Note</B></FONT> All modules that represent models are highlighted in green.</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Category</B></FONT> </TD>
+<TD class="confluenceTd"> <B>Description</B> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>SCA constructs</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Tuscany Modules</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Detail</B></FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA assembly </TD>
+<TD class="confluenceTd"> composite <BR clear="all">
+componentType </TD>
+<TD class="confluenceTd"> <FONT color="#009900">assembly</FONT> <BR clear="all">
+assembly-xml <BR clear="all">
+assembly-xsd </TD>
+<TD class="confluenceTd"> Model interfaces for the SCA assembly <BR clear="all">
+XML Reader, Writer and Resolver <BR clear="all">
+XSDs for the assemlby model </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> Java Interface </TD>
+<TD class="confluenceTd"> interface.java </TD>
+<TD class="confluenceTd"> <FONT color="#009900">interface</FONT> <BR clear="all">
+interface-java <BR clear="all">
+interface-java-xml </TD>
+<TD class="confluenceTd"> Model for interface/operation <BR clear="all">
+across Java and WS <BR clear="all">
+Model for java interface <BR clear="all">
+Reader/Writer for interface.java <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> WSDL Interface </TD>
+<TD class="confluenceTd"> interface.wsdl </TD>
+<TD class="confluenceTd"> interface <BR clear="all">
+interface-java-jaxws <BR clear="all">
+interface-wsdl <BR clear="all">
+interface-wsdl-xml <BR clear="all">
+<BR clear="all">
+xsd <BR clear="all">
+xsd-xml </TD>
+<TD class="confluenceTd"> Interface processor for JAXWS annotation <BR clear="all">
+WSDL port type as the interface definition <BR clear="all">
+Reader/Writer for interface.wsdl <BR clear="all">
+<BR clear="all">
+Model for XSD artifacts <BR clear="all">
+Reader/Writer to load/save XSDs </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> intent <BR clear="all">
+policySet </TD>
+<TD class="confluenceTd"> <FONT color="#009900">policy</FONT> <BR clear="all">
+policy-xml <BR clear="all">
+policy-xml-ws <BR clear="all">
+<BR clear="all">
+policy-logging <BR clear="all">
+policy-security <BR clear="all">
+policy-security-jsr250 <BR clear="all">
+policy-security-ws <BR clear="all">
+policy-transaction <BR clear="all">
+<BR clear="all"> <FONT color="#009900">definitions</FONT> <BR clear="all">
+definitions-xml </TD>
+<TD class="confluenceTd"> Model for policy <BR clear="all">
+Read/Writer for policy&nbsp;XML <BR clear="all">
+Reader/Writer for WS policy&nbsp;XML </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Contribution Processing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">contribution</FONT> <BR clear="all">
+contribution-xml <BR clear="all">
+contribution-impl <BR clear="all">
+contribution-java <BR clear="all">
+contribution-namespace <BR clear="all">
+contribution-osgi <BR clear="all">
+contribution-resource </TD>
+<TD class="confluenceTd"> Process SCA contribution (archives) and build the model for containing artifacts </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Extensibility </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">extensibility</FONT> <BR clear="all">
+extensibility-equinox </TD>
+<TD class="confluenceTd"> Provide the extensibility to plugin tuscany extensions such as utilities, XML processors, <BR clear="all">
+binding providers, <BR clear="all">
+implementation providers and databindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Runtime core and SPI for extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">core</FONT> <BR clear="all">
+core-spi <BR clear="all">
+core-databinding <BR clear="all"> </TD>
+<TD class="confluenceTd"> Core activates SCA composite and build up the invocation chain between <BR clear="all">
+SCA services and references over the bindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">databinding</FONT> <BR clear="all">
+<BR clear="all">
+databinding-axiom <BR clear="all">
+databinding-fastinfoset <BR clear="all">
+databinding-jaxb <BR clear="all">
+databinding-jaxb-axiom <BR clear="all">
+databinding-json <BR clear="all">
+databinding-saxon <BR clear="all">
+databinding-sdo <BR clear="all">
+databinding-sdo-axiom <BR clear="all">
+databinding-xmlbeans </TD>
+<TD class="confluenceTd"> A framework to deal with data representation and transformation </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA API </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> sca-api <BR clear="all"> </TD>
+<TD class="confluenceTd"> SCA Java common APIs and Annotations </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Node API, Impl and Launchers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> node-api <BR clear="all">
+node-dynamic <BR clear="all">
+node-impl <BR clear="all">
+node-launcher <BR clear="all">
+node-launcher-equinox <BR clear="all">
+thirdparty-library <BR clear="all">
+<BR clear="all">
+node-launcher-webapp <BR clear="all">
+node-manager <BR clear="all">
+implementation-node <BR clear="all">
+implementation-node-runtime <BR clear="all">
+host-embedded </TD>
+<TD class="confluenceTd"> Api used to Start/Stop SCA node which bootstraps SCA runtime to run the application. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Domain Manager </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> domain-manager <BR clear="all">
+workspace <BR clear="all">
+workspace-impl <BR clear="all">
+workspace-xml </TD>
+<TD class="confluenceTd"> Define and manage domain </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Serviceability: Monitoring, Logging and Tracing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">monitor</FONT> <BR clear="all">
+monitor-logging <BR clear="all">
+tracing-aspectj <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Host Types</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Host environments</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#000000">host-http</FONT> <BR clear="all"> <FONT color="#000000">host-jetty</FONT> <BR clear="all"> <FONT color="#000000">host-tomcat</FONT> <BR clear="all"> <FONT color="#000000">host-webapp</FONT> <BR clear="all"> <FONT color="#000000">host-webapp-junit</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP protocol support for all http-based bindings, more can be added through host SPIs.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed bindings:</FONT> <BR clear="all"> <FONT color="#000000">Atom</FONT> <BR clear="all"> <FONT color="#000000">RSS</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.atom</FONT> <BR clear="all"> <FONT color="#000000">binding.rss</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-atom</FONT> <BR clear="all"> <FONT color="#000000">binding-atom-abdera</FONT> <BR clear="all"> <FONT color="#000000">binding-rss</FONT> <BR clear="all"> <FONT color="#000000">binding-rss-rome</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed support, including atom and rss protocols.&nbsp;Needs&nbsp;http&nbsp;type host environment.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jsonrpc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jsonrpc</FONT> <BR clear="all"> <FONT color="#000000">binding-jsonrpc-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC for AJAX. Needs&nbsp;http&nbsp;type host environment.&nbsp;</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-rmi</FONT> <BR clear="all"> <FONT color="#000000">host-rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jms</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jms</FONT> <BR clear="all"> <FONT color="#000000">binding-jms-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ejb</FONT> <BR clear="all"> <FONT color="#000000">binding-ejb-runtime</FONT> <BR clear="all"> <FONT color="#000000">host-ejb</FONT> <BR clear="all"> <FONT color="#000000">host-openejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.corba</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-corba</FONT> <BR clear="all"> <FONT color="#000000">binding-corba-runtime</FONT> <BR clear="all"> <FONT color="#000000">host-corba</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jee</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jse</FONT> <BR clear="all"> <FONT color="#000000">host-corba-jse-tns</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.gdata</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-gdata</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-runtime</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-gsoc</FONT> <BR clear="all"> <FONT color="#000000">binding-gdata-runtime-gsoc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.http</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-http</FONT> <BR clear="all"> <FONT color="#000000">binding-http-runtime</FONT> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Web Service binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> binding.ws </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ws</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-axis2</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-axis2-policy</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-wsdlgen</FONT> <BR clear="all"> <FONT color="#000000">binding-ws-xml</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> WebServices </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">SCA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.sca</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-sca</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-xml</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-axis2</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-corba</FONT> <BR clear="all"> <FONT color="#000000">binding-sca-jms</FONT> <BR clear="all"> <FONT color="#000000">endpoint</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> One of the binding-sca-(types) is needed. The default is corba? </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Java implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.java</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-java</FONT> <BR clear="all"> <FONT color="#000000">implementation-java-xml</FONT> <BR clear="all"> <FONT color="#000000">implementation-java-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Java component types </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">BPEL implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.bpel</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-bpel</FONT> <BR clear="all"> <FONT color="#000000">implementation-bpel-jbpm</FONT> <BR clear="all"> <FONT color="#000000">implementation-bpel-ode</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Use BPEL components in a composite application. Includes support for Apache ODE. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> EJBs as components in a composition </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Scripting language based implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables using Groovy, JavaScript, Ruby, Python as components. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Spring implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables inclusion of Spring Application Context in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Widgets </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;implementation.widget</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-widget</FONT> <BR clear="all"> <FONT color="#000000">implementation-widget-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Widget support for web20</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">OSGi implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT>enables incusion of &nbsp;OSGI bundles&nbsp; in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP Resource implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.resource</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-resource</FONT> <BR clear="all"> <FONT color="#000000">implementation-resource-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP resource type component </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">XQuery implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Xquery component</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Data Access Services</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">data-api</FONT> <BR clear="all"> <FONT color="#000000">data-engine-helper</FONT> <BR clear="all"> <FONT color="#000000">implementation-das</FONT> <BR clear="all"> <FONT color="#000000">implementation-data-xml</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H4><A name="BuildYourOwnTuscanyDistribution-RelationshipofModulesandOSGIBundles"></A>Relationship of Modules and OSGI Bundles</H4>
+<P>There are various ways and views for creating OSGI bundles. This can be discussed under &quot;OSGI bundles&quot; topic which can define how modules in a bundle are versioned together, start together and share class loaders. For the sake of understanding structure of modules, we can say that each module is an <BR>
+OSGI bundle. These can be pulled together to create coarser grain bundles if needed.  </P>
+
+<H2><A name="BuildYourOwnTuscanyDistribution-UsecaseExamplesforTuscanyusage"></A>Use case Examples for Tuscany usage</H2>
+
+
+<H3><A name="BuildYourOwnTuscanyDistribution-UseTuscanyasaruntimeforSCAdevelopment"></A>Use Tuscany as a runtime for SCA development</H3>
+
+<P><B>Example:</B> Develop SCA applications in Tuscany based on POJOs<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Tuscany Container, implementation.java, SCA default binding</P>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-Adopttheprogrammingmodeltocreateacomponentmodelforyourownruntime"></A>Adopt the programming model to create a component model for your own runtime</H3>
+
+<P><B>Example:</B> Use SCA for configuration of and ESB engine<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM</P>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-EmbedTuscanywithinanapplicationserver"></A>Embed Tuscany within an application server</H3>
+
+<P><B>Example:</B> Embed Tuscany with an application server such as Geronimo<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Pick the features that are needed to run on the given platform, binding.ejb, implemenation.java, etc. In some cases you need to use host SPIs to provide the platform specific behavior. For examples check out host_&#42; modules.</P>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-CreatetoolsforSCA"></A>Create tools for SCA</H3>
+
+<P><B>Example:</B> Write a development tool for SCA<BR>
+Basic Category of Modules Needed:&#95; SCA PM</P>
+
+<H3><A name="BuildYourOwnTuscanyDistribution-Otherscenarios"></A>Other scenarios</H3>
+
+<P>Please help add other interesting scenarios</P>
+
+<H2><A name="BuildYourOwnTuscanyDistribution-Howtocreateyourowndistribution"></A>How to create your own distribution</H2>
+
+<P>TBD<BR>
+Link to the page describing how to create a POM.xml and use maven to generate distribution.<BR>
+Talk about how maven figures out third party dependencies. </P></TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/build-your-own-tuscany-sca-java-distribution.html b/site/trunk/site-publish/build-your-own-tuscany-sca-java-distribution.html
new file mode 100644
index 0000000000..0fa06355ba
--- /dev/null
+++ b/site/trunk/site-publish/build-your-own-tuscany-sca-java-distribution.html
@@ -0,0 +1,564 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Build Your Own Tuscany SCA JAVA Distribution</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99358">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Build Your Own Tuscany SCA JAVA Distribution">Build Your Own Tuscany SCA JAVA Distribution</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="BuildYourOwnTuscanySCAJAVADistribution-Whatthisisabout"></A>What this is about</H1>
+
+<P>As of release 1.x Tuscany SCA is distributed via one binary distribution that includes everything. Based on user feedback, choice of a smaller distribution packages is desireable. Tuscany community is in the process of addressing this requirement in 2.x. </P>
+
+<P>Given that this work is in progress, Tuscany users have asked for a write-up that highlights module dependencies to enable them to build their own distribution which may have a lower or higher granularity than the pre-packaged binary distributions. Purpose of this page is to help users understand how to build their own tuscany SCA light distribution based on module dependency knowledge that is shared here.</P>
+
+<P>Therefore:<BR>
+<B>This page is not about</B> building Tuscany binary distributions to distribute<BR>
+<B>This page is about</B> understanding dependencies so that users can build their own distribution</P>
+
+<H1><A name="BuildYourOwnTuscanySCAJAVADistribution-Howtobuildyourowndistribution"></A>How to build your own distribution</H1>
+
+<P>Let's first understand the different categories of module types in Tuscany. This understanding will help us determine how to put the modules together to have a runnable and useful system.</P>
+
+<H2><A name="BuildYourOwnTuscanySCAJAVADistribution-TuscanyModulesCategorized"></A>Tuscany Modules Categorized</H2>
+
+<P><B>SCA programming Model: Assembly, Deployment, Management</B><BR>
+SCA provides a programming model for Construction, Assembly, Deployment and Management of network of services. Modules under these catetories support the SCA programming model.</P>
+
+<P><B>Tuscany Container</B><BR>
+Modules in this category are specific to running SCA in a Tuscany environment.<BR>
+Tuscany container also provides plug points for different host types, bindings, implementations, policies as well as deployment and management (contributions and domain handling).</P>
+
+<P><B>Policy</B><BR>
+Module in this category include support for enabling policies as well as policy types.</P>
+
+<P><B>Binding</B><BR>
+Modules in this category include various bindings that support different protocols. Typically Bindings are used with SCA programming model, Tuscany container and some component implementation types.</P>
+
+<P><B>Implementation</B><BR>
+Modules in this category include support for different component types. Basic SCA environment is needed to use any of these modules.</P>
+
+<P><B>Host Environment</B><BR>
+Modules in this category include support for different host environments, such as Tomcat, Jetty, etc.</P>
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-ModuleCategoryDependency"></A>Module Category Dependency</H3>
+
+<P>This section explains the dependencies amongst various categories. This information can be used to define the scope of modules needed to perform different tasks using Tuscany.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> Category </TD>
+<TD class="confluenceTd"> Dependency </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA Programming Model </TD>
+<TD class="confluenceTd"> None. It runs in any container </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Programming Model. Note that Tuscany Container has plug points for various host environments, but is not dependent on any. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> Tuscany Container and SCA PM </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binding </TD>
+<TD class="confluenceTd"> Tuscany Container and some host environment depending on the protocol type </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Implementation </TD>
+<TD class="confluenceTd"> Tuscany Container </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-TuscanyModulesBreakDownbyCategory"></A>Tuscany Modules Break Down by Category</H3>
+
+<P><FONT color="#009900"><B>Note</B></FONT> All modules that represent models are highlighted in green.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Category</B></FONT> </TD>
+<TD class="confluenceTd"> <B>Description</B> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>SCA constructs</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Tuscany Modules</B></FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#330099"><B>Detail</B></FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA assembly </TD>
+<TD class="confluenceTd"> composite <BR class="atl-forced-newline">
+componentType </TD>
+<TD class="confluenceTd"> <FONT color="#009900">assembly</FONT> <BR class="atl-forced-newline">
+assembly-xml <BR class="atl-forced-newline">
+assembly-xsd </TD>
+<TD class="confluenceTd"> Model interfaces for the SCA assembly <BR class="atl-forced-newline">
+XML Reader, Writer and Resolver <BR class="atl-forced-newline">
+XSDs for the assemlby model </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> Java Interface </TD>
+<TD class="confluenceTd"> interface.java </TD>
+<TD class="confluenceTd"> <FONT color="#009900">interface</FONT> <BR class="atl-forced-newline">
+interface-java <BR class="atl-forced-newline">
+interface-java-xml </TD>
+<TD class="confluenceTd"> Model for interface/operation <BR class="atl-forced-newline">
+across Java and WS <BR class="atl-forced-newline">
+Model for java interface <BR class="atl-forced-newline">
+Reader/Writer for interface.java <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> WSDL Interface </TD>
+<TD class="confluenceTd"> interface.wsdl </TD>
+<TD class="confluenceTd"> interface <BR class="atl-forced-newline">
+interface-java-jaxws <BR class="atl-forced-newline">
+interface-wsdl <BR class="atl-forced-newline">
+interface-wsdl-xml <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+xsd <BR class="atl-forced-newline">
+xsd-xml </TD>
+<TD class="confluenceTd"> Interface processor for JAXWS annotation <BR class="atl-forced-newline">
+WSDL port type as the interface definition <BR class="atl-forced-newline">
+Reader/Writer for interface.wsdl <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+Model for XSD artifacts <BR class="atl-forced-newline">
+Reader/Writer to load/save XSDs </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> intent <BR class="atl-forced-newline">
+policySet </TD>
+<TD class="confluenceTd"> <FONT color="#009900">policy</FONT> <BR class="atl-forced-newline">
+policy-xml <BR class="atl-forced-newline">
+policy-xml-ws <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+policy-logging <BR class="atl-forced-newline">
+policy-security <BR class="atl-forced-newline">
+policy-security-jsr250 <BR class="atl-forced-newline">
+policy-security-ws <BR class="atl-forced-newline">
+policy-transaction <BR class="atl-forced-newline">
+<BR class="atl-forced-newline"> <FONT color="#009900">definitions</FONT> <BR class="atl-forced-newline">
+definitions-xml </TD>
+<TD class="confluenceTd"> Model for policy <BR class="atl-forced-newline">
+Read/Writer for policy&nbsp;XML <BR class="atl-forced-newline">
+Reader/Writer for WS policy&nbsp;XML </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Contribution Processing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">contribution</FONT> <BR class="atl-forced-newline">
+contribution-xml <BR class="atl-forced-newline">
+contribution-impl <BR class="atl-forced-newline">
+contribution-java <BR class="atl-forced-newline">
+contribution-namespace <BR class="atl-forced-newline">
+contribution-osgi <BR class="atl-forced-newline">
+contribution-resource </TD>
+<TD class="confluenceTd"> Process SCA contribution (archives) and build the model for containing artifacts </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Extensibility </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">extensibility</FONT> <BR class="atl-forced-newline">
+extensibility-equinox </TD>
+<TD class="confluenceTd"> Provide the extensibility to plugin tuscany extensions such as utilities, XML processors, <BR class="atl-forced-newline">
+binding providers, <BR class="atl-forced-newline">
+implementation providers and databindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Runtime core and SPI for extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">core</FONT> <BR class="atl-forced-newline">
+core-spi <BR class="atl-forced-newline">
+core-databinding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Core activates SCA composite and build up the invocation chain between <BR class="atl-forced-newline">
+SCA services and references over the bindings </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">databinding</FONT> <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+databinding-axiom <BR class="atl-forced-newline">
+databinding-fastinfoset <BR class="atl-forced-newline">
+databinding-jaxb <BR class="atl-forced-newline">
+databinding-jaxb-axiom <BR class="atl-forced-newline">
+databinding-json <BR class="atl-forced-newline">
+databinding-saxon <BR class="atl-forced-newline">
+databinding-sdo <BR class="atl-forced-newline">
+databinding-sdo-axiom <BR class="atl-forced-newline">
+databinding-xmlbeans </TD>
+<TD class="confluenceTd"> A framework to deal with data representation and transformation </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA PM </TD>
+<TD class="confluenceTd"> SCA API </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> sca-api <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> SCA Java common APIs and Annotations </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Node API, Impl and Launchers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> node-api <BR class="atl-forced-newline">
+node-dynamic <BR class="atl-forced-newline">
+node-impl <BR class="atl-forced-newline">
+node-launcher <BR class="atl-forced-newline">
+node-launcher-equinox <BR class="atl-forced-newline">
+thirdparty-library <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+node-launcher-webapp <BR class="atl-forced-newline">
+node-manager <BR class="atl-forced-newline">
+implementation-node <BR class="atl-forced-newline">
+implementation-node-runtime <BR class="atl-forced-newline">
+host-embedded </TD>
+<TD class="confluenceTd"> Api used to Start/Stop SCA node which bootstraps SCA runtime to run the application. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> SCA Domain Manager </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> domain-manager <BR class="atl-forced-newline">
+workspace <BR class="atl-forced-newline">
+workspace-impl <BR class="atl-forced-newline">
+workspace-xml </TD>
+<TD class="confluenceTd"> Define and manage domain </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Container </TD>
+<TD class="confluenceTd"> Serviceability: Monitoring, Logging and Tracing </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#009900">monitor</FONT> <BR class="atl-forced-newline">
+monitor-logging <BR class="atl-forced-newline">
+tracing-aspectj <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Host Types</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Host environments</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <FONT color="#000000">host-http</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-jetty</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-tomcat</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-webapp</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-webapp-junit</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP protocol support for all http-based bindings, more can be added through host SPIs.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed bindings:</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">Atom</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">RSS</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.atom</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding.rss</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-atom</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-atom-abdera</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-rss</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-rss-rome</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Feed support, including atom and rss protocols.&nbsp;Needs&nbsp;http&nbsp;type host environment.</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jsonrpc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jsonrpc</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-jsonrpc-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JSONRPC for AJAX. Needs&nbsp;http&nbsp;type host environment.&nbsp;</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-rmi</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-rmi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">RMI</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.jms</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-jms</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-jms-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">JMS</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ejb</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-ejb-runtime</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-ejb</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-openejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.corba</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-corba</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-corba-runtime</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-corba</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-corba-jee</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-corba-jse</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">host-corba-jse-tns</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">CORBA</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.gdata</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-gdata</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-gdata-runtime</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-gdata-gsoc</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-gdata-runtime-gsoc</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">GData</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.http</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-http</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-http-runtime</FONT> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Web Service binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> binding.ws </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-ws</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-ws-axis2</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-ws-axis2-policy</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-ws-wsdlgen</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-ws-xml</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> WebServices </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">SCA binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding.sca</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">binding-sca</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-sca-xml</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-sca-axis2</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-sca-corba</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">binding-sca-jms</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">endpoint</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> One of the binding-sca-(types) is needed. The default is corba? </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binding</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Java implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.java</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-java</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-java-xml</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-java-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Java component types </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">BPEL implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.bpel</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-bpel</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-bpel-jbpm</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-bpel-ode</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Use BPEL components in a composite application. Includes support for Apache ODE. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">EJB implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-ejb</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> EJBs as components in a composition </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Scripting language based implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-script</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables using Groovy, JavaScript, Ruby, Python as components. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Spring implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-spring</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> enables inclusion of Spring Application Context in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> Widgets </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;implementation.widget</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-widget</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-widget-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Widget support for web20</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">OSGi implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-osgi</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT>enables incusion of &nbsp;OSGI bundles&nbsp; in a composite </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">HTTP Resource implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.resource</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-resource</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-resource-runtime</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> HTTP resource type component </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">XQuery implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation.xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">implementation-xquery</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;Xquery component</FONT> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Implementation</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">Data Access Services</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">&nbsp;</FONT> </TD>
+<TD class="confluenceTd"> <FONT color="#000000">data-api</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">data-engine-helper</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-das</FONT> <BR class="atl-forced-newline"> <FONT color="#000000">implementation-data-xml</FONT> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H4><A name="BuildYourOwnTuscanySCAJAVADistribution-RelationshipofModulesandOSGIBundles"></A>Relationship of Modules and OSGI Bundles</H4>
+<P>There are various ways and views for creating OSGI bundles. This can be discussed under &quot;OSGI bundles&quot; topic which can define how modules in a bundle are versioned together, start together and share class loaders. For the sake of understanding structure of modules, we can say that each module is an <BR>
+OSGI bundle. These can be pulled together to create coarser grain bundles if needed.  </P>
+
+<H2><A name="BuildYourOwnTuscanySCAJAVADistribution-UsecaseExamplesforTuscanyusage"></A>Use case Examples for Tuscany usage</H2>
+
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-UseTuscanyasaruntimeforSCAdevelopment"></A>Use Tuscany as a runtime for SCA development</H3>
+
+<P><B>Example:</B> Develop SCA applications in Tuscany based on POJOs<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Tuscany Container, implementation.java, SCA default binding</P>
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-Adopttheprogrammingmodeltocreateacomponentmodelforyourownruntime"></A>Adopt the programming model to create a component model for your own runtime</H3>
+
+<P><B>Example:</B> Use SCA for configuration of and ESB engine<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM</P>
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-EmbedTuscanywithinanapplicationserver"></A>Embed Tuscany within an application server</H3>
+
+<P><B>Example:</B> Embed Tuscany with an application server such as Geronimo<BR>
+<EM>Basic Category of Modules Needed:</EM> SCA PM, Pick the features that are needed to run on the given platform, binding.ejb, implemenation.java, etc. In some cases you need to use host SPIs to provide the platform specific behavior. For examples check out host_&#42; modules.</P>
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-CreatetoolsforSCA"></A>Create tools for SCA</H3>
+
+<P><B>Example:</B> Write a development tool for SCA<BR>
+Basic Category of Modules Needed:&#95; SCA PM</P>
+
+<H3><A name="BuildYourOwnTuscanySCAJAVADistribution-Otherscenarios"></A>Other scenarios</H3>
+
+<P>Please help add other interesting scenarios</P>
+
+<H2><A name="BuildYourOwnTuscanySCAJAVADistribution-Howtocreateyourowndistribution"></A>How to create your own distribution</H2>
+
+<P>TBD<BR>
+Link to the page describing how to create a POM.xml and use maven to generate distribution.<BR>
+Talk about how maven figures out third party dependencies. </P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/building-an-application.data/Legacy.App.As.Tuscany.Service.ppt b/site/trunk/site-publish/building-an-application.data/Legacy.App.As.Tuscany.Service.ppt
new file mode 100644
index 0000000000..5fce00a52c
--- /dev/null
+++ b/site/trunk/site-publish/building-an-application.data/Legacy.App.As.Tuscany.Service.ppt
diff --git a/site/trunk/site-publish/building-an-application.html b/site/trunk/site-publish/building-an-application.html
new file mode 100644
index 0000000000..1e24a04f6a
--- /dev/null
+++ b/site/trunk/site-publish/building-an-application.html
@@ -0,0 +1,161 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Building an Application</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47803">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Building an Application">Building an Application</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="BuildinganApplication-LegacyApplicationasaTuscanyService"></A>Legacy Application as a Tuscany Service</H1>
+
+<P>I built my own simple C++ service component following the  tutorial  named &quot;Build a simple C++ service component, part 1: A Quick tour  of the C++ API for the Service Component Architecture&quot; (thanks to Ed Slattery, Pete Robbins and Andrew Borley)</P>
+
+<P>I also wrote a document that explains the way I exposed a legacy C application (called  Jabon)  as  a Tuscany Service Component. I think it could  be useful for the community. The link: <A href="http://cwiki.apache.org/confluence/download/attachments/47803/Legacy.App.As.Tuscany.Service.ppt" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/download/attachments/47803/Legacy.App.As.Tuscany.Service.ppt</A></P>
+
+<P>Any feedback will be appreciated.</P>
+
+<P>Best regards,<BR>
+Mario</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/building-from-distro.html b/site/trunk/site-publish/building-from-distro.html
new file mode 100644
index 0000000000..600608ec07
--- /dev/null
+++ b/site/trunk/site-publish/building-from-distro.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Building from Distro</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48540">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="developing-sdo-java.html" title="Developing SDO Java">Developing SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Building from Distro">Building from Distro</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><A href="sdo-java-download.html" title="SDO Java Download">Download</A> a source distribution and follow the instructions in the BUILDING.txt file.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/building-from-svn.html b/site/trunk/site-publish/building-from-svn.html
new file mode 100644
index 0000000000..24680df594
--- /dev/null
+++ b/site/trunk/site-publish/building-from-svn.html
@@ -0,0 +1,175 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Building From SVN</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48503">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="developing-sdo-java.html" title="Developing SDO Java">Developing SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Building From SVN">Building From SVN</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="BuildingFromSVN-HowtoBuild"></A>How to Build</H3>
+<P>Set up your environment using the instructions for building the whole of Tuscany, but only download and install Java 5, Maven and Svn (note that only one file, Interface2JavaGenerator.java, has a Java 5 dependency, if you want to work with Java 1.4.2 then just delete this file before building).</P>
+
+<P>Make sure 'mvn' and 'svn' commands are in your PATH environment variable.</P>
+
+<P>Check out the SDO open source projects from Apache.<BR>
+<FONT color="gray"><BR>
+md &lt;local tuscany dir&gt; <BR>
+cd &lt;local tuscany dir&gt; <BR>
+svn co -N <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java</A> <BR>
+cd java <BR>
+svn up sdo <BR>
+svn up -N spec <BR>
+cd spec <BR>
+svn up sdo-api </FONT></P>
+
+<P>Run &quot;mvn&quot; under &lt;local tuscany dir&gt;/java directory to install POM files from the root project to the local repository</P>
+
+<P><FONT color="gray"><BR>
+cd &lt;local tuscany dir&gt;/java <BR>
+mvn -N <BR>
+cd spec <BR>
+mvn -N <BR>
+cd ../sdo <BR>
+mvn -N (alternatively, run without the -N option - see Note below) </FONT></P>
+
+<P>You can now build SDO project as a whole or build the individual SDO subprojects.</P>
+<H3><A name="BuildingFromSVN-BuildSDOproject"></A>Build SDO project</H3>
+<P>This step builds all subprojects in the source tree at once<BR>
+<FONT color="gray"><BR>
+mvn in &lt;local tuscany dir&gt;/java/sdo </FONT></P>
+
+<P>If the mvn command completed successfully, you will see BUILD SUCCESSFUL in the output and the results of compilation will be available in jar files created under directories named &quot;target&quot; directly under the root directories of the projects. These jar files are also installed into your local maven repository ($HOME/.m2/repository) and are available as inputs to later build operations.</P>
+
+<P><EM>Maven fetches external resources required for a build process from the internet. These resources are at times unavailable. It may be necessary to run &quot;mvn&quot; again at a later time.</EM></P>
+
+<P><EM>If you are taking time to reply to firewall prompts, this can cause some requests to time out. Set up the firewall to permit the action without prompting.</EM></P>
+
+<H3><A name="BuildingFromSVN-BuildsubprojectsofSDOindividually"></A>Build sub projects of SDO individually </H3>
+
+<P><B>Build sdo.spec project</B></P>
+
+<P><FONT color="gray"><BR>
+cd &lt;local tuscany dir&gt;/java/spec/sdo-api <BR>
+mvn <BR>
+mvn -Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.) </FONT></P>
+
+<P><B>Build sdo.impl project</B><BR>
+<FONT color="gray"><BR>
+cd &lt;local tuscany dir&gt;/java/sdo/impl <BR>
+mvn <BR>
+mvn -Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.) </FONT></P>
+
+<P><B>Build sdo.tools project</B><BR>
+<FONT color="gray"><BR>
+cd &lt;local tuscany dir&gt;/java/sdo/tools <BR>
+mvn <BR>
+mvn -Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.)</FONT> </P>
+
+<P><B>Build sdo.samples project</B><BR>
+<FONT color="gray"><BR>
+cd &lt;local tuscany dir&gt;/java/sdo/sample <BR>
+mvn <BR>
+mvn -Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.) </FONT></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/building-sca-for-java.html b/site/trunk/site-publish/building-sca-for-java.html
new file mode 100644
index 0000000000..47a9e54d3c
--- /dev/null
+++ b/site/trunk/site-publish/building-sca-for-java.html
@@ -0,0 +1,164 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Building SCA for Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44558">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Building SCA for Java">Building SCA for Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV>
+<UL>
+    <LI><A href="#BuildingSCAforJava-Preparation">Preparation</A></LI>
+    <LI><A href="#BuildingSCAforJava-Chooseanddownloadasourcelevel">Choose and download a source level</A></LI>
+    <LI><A href="#BuildingSCAforJava-Buildit">Build it</A></LI>
+<UL>
+    <LI><A href="#BuildingSCAforJava-Building%2522HEAD%2522">Building &quot;HEAD&quot;</A></LI>
+    <LI><A href="#BuildingSCAforJava-Building%2522prespecchanges%2522">Building &quot;pre-spec-changes&quot;</A></LI>
+</UL>
+</UL></DIV>
+<H1><A name="BuildingSCAforJava-Preparation"></A>Preparation</H1>
+<P>To download the source you will need a subversion client. Linux distributions typically come with a command line svn tool. Tortoise SVN seems popular on windows.<BR>
+You will also need maven and a 1.5 JDK. Maven can be downloaded from <A href="http://maven.apache.org/" class="external-link" rel="nofollow">Apache Maven Site</A></P>
+<H1><A name="BuildingSCAforJava-Chooseanddownloadasourcelevel"></A>Choose and download a source level</H1>
+<P>Tuscany's Java source can be found in subversion at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/</A>. You can either build directly from HEAD, or use one of the tags. Building from head means you'll always be building the latest stuff... however, the down side of this is that it's unstable and may sometimes fail to build. The following table should help you choose what to check out. You'll need a subversion client to </P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Branch </TH>
+<TH class="confluenceTh"> Comment </TH>
+<TH class="confluenceTh"> Subversion checkout </TH>
+</TR>
+<TR>
+<TD class="confluenceTd">HEAD </TD>
+<TD class="confluenceTd"> The very latest, includes changes for the 1.0 SCA specifications. Not really a branch, but you know that <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0">. This is actually SCA, SDO and DAS, but there isn't a neat &quot;download just thew SCA part of Tuscany URL that I'm aware of... </TD>
+<TD class="confluenceTd"> svn co 
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/</A>
+<P> </P></TD>
+</TR>
+<TR>
+<TD class="confluenceTd">pre-spec-changes </TD>
+<TD class="confluenceTd"> SCA for Java as per the 0.95 version of the specification, should be more stable than head </TD>
+<TD class="confluenceTd"> svn co 
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/branches/pre-spec-changes/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/branches/pre-spec-changes/</A>
+<P> </P></TD>
+</TR>
+<TR>
+<TD class="confluenceTd">sca-java-M2</TD>
+<TD class="confluenceTd"> This was/is the milestone 2 release, you probably don't want this </TD>
+<TD class="confluenceTd"> svn co 
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-M2/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-M2/</A>
+<P> </P></TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Why https ?</B><BR>If you prefer you can use http instead of https. Personally I've found that https is more reliable than http, however I think this may be down to my local network and invisible proxies.</TD></TR></TABLE></DIV>
+<P><EM>Do you need to overlay, or can you just download the tag and mvn from there ?</EM></P>
+
+<H1><A name="BuildingSCAforJava-Buildit"></A>Build it</H1>
+<H2><A name="BuildingSCAforJava-Building%22HEAD%22"></A>Building &quot;HEAD&quot;</H2>
+<H2><A name="BuildingSCAforJava-Building%22prespecchanges%22"></A>Building &quot;pre-spec-changes&quot;</H2>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/building-your-own.html b/site/trunk/site-publish/building-your-own.html
new file mode 100644
index 0000000000..406c919ce2
--- /dev/null
+++ b/site/trunk/site-publish/building-your-own.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Building your own</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45034">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="obtaining-a-tuscany-java-sca-implementation.html" title="Obtaining a Tuscany Java SCA Implementation">Obtaining a Tuscany Java SCA Implementation</A>&nbsp;&gt;&nbsp;<A href="" title="Building your own">Building your own</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><EM>I wonder if these sections really bellow here, or if we should have a link referenceing a &quot;Tuscany Developer Guide&quot; which covers this aspect... may not be important since the Tuscany Developer Guide and Tuscany User Guide exist in the same wiki space and so could simply form links to share content, however having a single wiki space could get a bit crowded</EM></P>
+
+<H2><A name="Buildingyourown-Settingupabuildenvironment"></A>Setting up a build environment</H2>
+<H2><A name="Buildingyourown-Choosingabranchandunderstandingthesourcetree"></A>Choosing a branch and understanding the source tree</H2>
+<H2><A name="Buildingyourown-Buildingwhichbitstobuild"></A>Building - which bits to build</H2>
+<H2><A name="Buildingyourown-Debuggingbuildissues"></A>Debugging build issues</H2>
+<H2><A name="Buildingyourown-Buildtips%28eg.useofmvnfntocontinuebuildingdespitetestcasefailures%29"></A>Build tips (eg. use of mvn -fn to continue building despite test case failures)</H2>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/businessexceptions.data/StockExceptionTest.wsdl b/site/trunk/site-publish/businessexceptions.data/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..dbcaec5ee0
--- /dev/null
+++ b/site/trunk/site-publish/businessexceptions.data/StockExceptionTest.wsdl
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ -->
+<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"
+    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">
+    <wsdl:types>
+        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <complexType name="StockOffer">
+                    <sequence>
+                        <element name="symbol" minOccurs="1" type="xsd:string" />
+                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
+                        <element name="name" minOccurs="0" type="xsd:string" />
+                    </sequence>
+            </complexType>
+            
+            <element name="stockQuoteOffer">
+                <complexType>
+                    <sequence>
+                        <element name="input" minOccurs="0" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="stockQuoteOfferResponse">
+                <complexType>
+                    <sequence>
+                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <!-- Faults -->
+            <element name="InvalidSymbolFault">
+                <complexType>
+                    <sequence>
+                        <element name="message"  minOccurs="1" type="xsd:string" />
+                        <element name="offer" minOccurs="1" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <element name="MarketClosedFault">
+                <complexType>
+                    <sequence>
+                        <element name="message"  minOccurs="1" type="xsd:string" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="stockQuoteOfferRequest">
+        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:message name="stockQuoteOfferResponse">
+        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />
+    </wsdl:message>
+
+    <wsdl:message name="InvalidSymbolFault">
+        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />
+    </wsdl:message>
+
+    <wsdl:message name="MarketClosedFault">
+        <wsdl:part element="tns:MarketClosedFault" name="fault" />
+    </wsdl:message>
+
+
+    <wsdl:portType name="StockExceptionTest">
+        <wsdl:operation name="stockQuoteOffer">
+            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />
+
+            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />
+            
+            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />
+             
+            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />           
+
+        </wsdl:operation>
+
+ 
+    </wsdl:portType>
+
+    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">
+        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
+
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+
+        <wsdl:operation name="stockQuoteOffer">
+            <wsdlsoap:operation soapAction="" />
+
+            <wsdl:input name="stockQuoteOfferRequest">
+                <wsdlsoap:body use="literal" />
+            </wsdl:input>
+
+            <wsdl:output name="stockQuoteOfferResponse">
+                <wsdlsoap:body use="literal" />
+            </wsdl:output>
+            
+            <wsdl:fault name="InvalidSymbolException"> 
+            	<wsdlsoap:fault use="literal" />
+            </wsdl:fault>
+            
+            <wsdl:fault name="MarketClosedException"> 
+            	<wsdlsoap:fault use="literal" />
+            </wsdl:fault>
+
+        </wsdl:operation>
+
+
+    </wsdl:binding>
+
+    <wsdl:service name="StockExceptionTestService">
+        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">
+            <wsdlsoap:address location="http://localhost:8080/StockExceptionTestService/services/StockExceptionTestService" />
+
+        </wsdl:port>
+
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/site/trunk/site-publish/businessexceptions.data/jaxws.wsimport.zip b/site/trunk/site-publish/businessexceptions.data/jaxws.wsimport.zip
new file mode 100644
index 0000000000..70bfec1bc9
--- /dev/null
+++ b/site/trunk/site-publish/businessexceptions.data/jaxws.wsimport.zip
diff --git a/site/trunk/site-publish/businessexceptions.html b/site/trunk/site-publish/businessexceptions.html
new file mode 100644
index 0000000000..8d1a24d7b5
--- /dev/null
+++ b/site/trunk/site-publish/businessexceptions.html
@@ -0,0 +1,254 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : BusinessExceptions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43968">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="BusinessExceptions">BusinessExceptions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="BusinessExceptions-SupportingBusinessExceptionsinTuscany"></A>Supporting Business Exceptions in Tuscany</H1>
+
+
+<H2><A name="BusinessExceptions-Businessexceptionrelatedconcerns"></A>Business exception related concerns</H2>
+
+
+<H3><A name="BusinessExceptions-1.Howtodeclarebusinessexceptions%3F"></A>1. How to declare business exceptions?</H3>
+
+<P>What defines business exception on each interface type. (ie Java wsdl)<BR>
+In Java interface, business exceptions are declared checked exceptions specified on the operations of the services interface.<BR>
+Note declared unchecked (runtime) exceptions are not considered business exceptions.<BR>
+WSDL need to determine if all WSDL defined faults are business exceptions. Need to in investigate JAX-WS mapping of exceptions JAX-B databinding..<BR>
+SDO has no similar specification. Need to determine a similar means for SDO to provide reliable transforms between JAX-B and SDO.</P>
+
+<H3><A name="BusinessExceptions-2.HowtorepresentbusinessexceptionsinJava%3F"></A>2. How to represent business exceptions in Java?</H3>
+
+<P>In Java business exception are represented as non runtime exceptions. But not all runtime exceptions delivered in a message maybe a Business exception.<BR>
+If a non runtime exceptions is delivered to a component that is does not declare the exception the exception will be wrappered in a specified runtime exception.<BR>
+Jax-b need to further investigate the JAX-B specification and follow how it models business exceptions as objects.<BR>
+SDO there are no specific mappings provided for. May need to wrapper complex parts of an exception as SDO objects in a specific Java exception. </P>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>JAX-WS WSDL1.1 to Java mapping for faults</B><BR>JAX-WS 2.0 spec defines the mapping rule for web service faults in section 2.5.</TD></TR></TABLE></DIV>
+<P>Using java exception to represent the Web Service fault:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * The java exception to represent the web service fault
+ */
+<SPAN class="code-keyword">public</SPAN> class WebServiceFault <SPAN class="code-keyword">extends</SPAN> Exception {
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> <SPAN class="code-keyword">final</SPAN> <SPAN class="code-object">long</SPAN> serialVersionUID = -3134446726685504039L;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">Object</SPAN> fault;
+
+    <SPAN class="code-keyword">public</SPAN> WebServiceFault(<SPAN class="code-object">String</SPAN> message, <SPAN class="code-object">Object</SPAN> fault) {
+        <SPAN class="code-keyword">super</SPAN>(message);
+        <SPAN class="code-keyword">this</SPAN>.fault = fault;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> WebServiceFault(<SPAN class="code-object">String</SPAN> message, <SPAN class="code-object">Object</SPAN> fault, Throwable cause) {
+        <SPAN class="code-keyword">super</SPAN>(message, cause);
+        <SPAN class="code-keyword">this</SPAN>.fault = fault;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">Object</SPAN> getFault() {
+        <SPAN class="code-keyword">return</SPAN> fault;
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<H3><A name="BusinessExceptions-3.Howtotransformbusinessexceptionsacrossdatabindings%3F"></A>3. How to transform business exceptions across databindings?</H3>
+
+<P>Provide in the data binding transformations between Axiom OMElement, SDO represented faults and JAX-B exceptions.<BR>
+How to identify as business exceptions during the transforms.</P>
+
+<H3><A name="BusinessExceptions-4.Howtopropagatebusinessexceptions%3F"></A>4. How to propagate business exceptions?</H3>
+
+<P>Determine how to propagate exception in the Tuscany runtime message in local interactions. Make sure TargetInvocation exceptions become unwrappered<BR>
+How in the case of webservice's binding propagate the message through web service binding.</P>
+
+<H2><A name="BusinessExceptions-Ascenariototestthebusinessexceptionhandling"></A>A scenario to test the business exception handling</H2>
+
+
+<H3><A name="BusinessExceptions-IntegrationTests%28iTests%29"></A>Integration Tests (iTests)</H3>
+
+<P>Several <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/testing/sca/itest" class="external-link" rel="nofollow">integration tests</A> have been created beginning with prefix <INS>exception</INS>.</P>
+
+<H2><A name="BusinessExceptions-Workitemsactions"></A>Work items actions</H2>
+
+<UL>
+	<LI>Either investigate using existing complex type conversions or add additional interfaces to databinding framework for transformation of Exceptions.</LI>
+	<LI>Make SDO generated exceptions match as close as possible to JAX-B. <SUB><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=what%20annotations%20to%20SDOs%20could%20be%20added&linkCreation=true&fromPageId=43968" class="createlink">what annotations to SDOs could be added</A></SUB></LI>
+	<LI>Augment Java introspector to capture JAX-B annotations in logical types to help assist in providing hints to determine matching exceptions.</LI>
+	<LI>Use when provided WSDL qname of Exception's message name to match exceptions. If not provided fall back to name matching and possible use of packagename annotations to resolve matching type.</LI>
+	<LI>Attempt to do actual conversion through Axiom transform. If conversion fails try using simple conversion through copying of respective field members.</LI>
+	<LI>Check that only declared checked exceptions are thrown. Wrapper all other checked exceptions.</LI>
+</UL>
+
+
+<H3><A name="BusinessExceptions-Questions%3A"></A>Questions:</H3>
+
+<UL>
+	<LI>If the originating exception is a Business exception and conversions fails should we have a <B>Tuscany standard</B> runtime exception that will have basic message from the originating exception set ? Should we just pick one of the business exceptions on receiving operation ? This might be more robust than throwing a runtime exception.</LI>
+	<LI>What runtime exception should undeclared, checked exceptions be wrappered in? Tuscany defined ? just RuntimeException ? java.lang.reflect.UndeclaredThrowableException? I can see an SCA client still wanting to be &quot;robust&quot; capturing this and acting on it.</LI>
+	<LI><B>Will not directly validate webservices exceptions until axis binding is at incubator-snapshot (kernel trunk) level</B></LI>
+	<LI>How are we currently mapping operations during wiring in Tuscany with respect to exceptions ? Need to see if Exceptions are part of operations signature.</LI>
+</UL>
+
+
+<H3><A name="BusinessExceptions-ImplementationDecisions"></A>Implementation Decisions</H3>
+<UL>
+	<LI>Currently we are unwrappering at the TargetInvokerExtension <B>all</B> exceptions and passing them on the message path.</LI>
+	<LI>System exceptions happening during the processing of a message are thrown up the stack.</LI>
+	<LI>We have made some decision on the support of SDO exception wrappers and example of can be seen in the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/" class="external-link" rel="nofollow">exceptionXbindingTest iTest</A><BR>
+This closely resembles the JAX-B pattern in dealing with faults. One exception is we currently have a FAULT_ELEMENT field type QName on the exception to help tie back to original wsdl element it is associate to. </LI>
+</UL>
+
+
+<H2><A name="BusinessExceptions-Appendix"></A>Appendix</H2>
+
+
+<H3><A name="BusinessExceptions-Axis2WSDL2Java"></A>Axis2 WSDL2Java</H3>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Exception generated by Axis2 1.1</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> stockexceptiontestservice.scatesttool;
+
+<SPAN class="code-keyword">public</SPAN> class InvalidSymbolFaultException <SPAN class="code-keyword">extends</SPAN> java.lang.Exception{
+
+    <SPAN class="code-keyword">private</SPAN> stockexceptiontestservice.scatesttool.InvalidSymbolFault faultMessage;
+
+    <SPAN class="code-keyword">public</SPAN> InvalidSymbolFaultException() {
+        <SPAN class="code-keyword">super</SPAN>(<SPAN class="code-quote">&quot;InvalidSymbolFaultException&quot;</SPAN>);
+    }
+
+    <SPAN class="code-keyword">public</SPAN> InvalidSymbolFaultException(java.lang.<SPAN class="code-object">String</SPAN> s) {
+       <SPAN class="code-keyword">super</SPAN>(s);
+    }
+
+    <SPAN class="code-keyword">public</SPAN> InvalidSymbolFaultException(java.lang.<SPAN class="code-object">String</SPAN> s, java.lang.Throwable ex) {
+      <SPAN class="code-keyword">super</SPAN>(s, ex);
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setFaultMessage(stockexceptiontestservice.scatesttool.InvalidSymbolFault msg){
+       faultMessage = msg;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> stockexceptiontestservice.scatesttool.InvalidSymbolFault getFaultMessage(){
+       <SPAN class="code-keyword">return</SPAN> faultMessage;
+    }
+}
+</PRE>
+</DIV></DIV><DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The generated exception has the getter and setter for the fault: setFaultMessage(...) and getFaultMessage() and that's the pattern Axis2 adopts for web service fault to java exception mapping.
+
+<P>The InvalidSymbolFault is a generated class to represent the fault. It can be generated using different databindings such as ADB, JAXB (and hopefully SDO in the future).</P></TD></TR></TABLE></DIV>
+
+
+
+<H3><A name="BusinessExceptions-JAXWSRI2.1WSDL2Java"></A>JAX-WS RI 2.1 WSDL2Java</H3>
+
+<P>Rick provided the WSDL and generated code from JAX-WS RI 2.1.</P>
+
+<P><A href="businessexceptions.data/StockExceptionTest.wsdl">StockExceptionTest.wsdl</A></P>
+
+<P><A href="businessexceptions.data/jaxws.wsimport.zip">jaxws.wsimport.zip</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/c-sdo-menu.html b/site/trunk/site-publish/c-sdo-menu.html
new file mode 100644
index 0000000000..09e89724cd
--- /dev/null
+++ b/site/trunk/site-publish/c-sdo-menu.html
@@ -0,0 +1,122 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : C++ SDO Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55316">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sdo-general-menu.html" title="SDO General Menu">SDO General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="C++ SDO Menu">C++ SDO Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO&linkCreation=true&fromPageId=55316" class="createlink">SDO</A></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO%20C%2B%2B%20User%20Guide&linkCreation=true&fromPageId=55316" class="createlink">User Guide</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO%20C%2B%2B%20Architecture%20Guide&linkCreation=true&fromPageId=55316" class="createlink">Architecture Guide</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO%20C%2B%2B%20Developer%20Guide&linkCreation=true&fromPageId=55316" class="createlink">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/changesummaryprocessing.html b/site/trunk/site-publish/changesummaryprocessing.html
new file mode 100644
index 0000000000..4ad5f5775a
--- /dev/null
+++ b/site/trunk/site-publish/changesummaryprocessing.html
@@ -0,0 +1,133 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : ChangeSummaryProcessing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52813">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="ChangeSummaryProcessing">ChangeSummaryProcessing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ChangeSummaryProcessing-ChangeSummaryProcessing"></A>ChangeSummaryProcessing</H1>
+
+<P>SDO provides an important feature called the ChangeSummary. Using this feature, a graph of related DataObjects can track changes made to iteself. These changes include additions to the graph, deletions, DataObject property (attribute) changes and even changes to object relationships.</P>
+
+<P>The RDB DAS leverages the SDO ChangeSummary to drive graph chages to a database.  Here is a simple example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command select = das.createCommand(&quot;Select * from CUSTOMER where ID = 1&quot;);<BR>
+ DataObject root = select.executeQuery();</P>
+
+<P> DataObject customer = (DataObject) root.get(&quot;CUSTOMER[1]&quot;);<BR>
+ customer.set(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das.applyChanges(root);</P>
+</DIV></DIV>
+<P>The first half of this example creates a new read command and executes it. The result is a graph of DataObjects (in this case just one) represented by the containing &quot;root&quot;.</P>
+
+<P>The second half of the example makes modification to a single object in the graph and then calls the applyChanges() method. As part of the applyChanges processing, the das will scan the SDO ChangeSummary and notice the modified DataObject. It will then generate the UPDATE statement required to reflect the change to the database:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = 'Pavick' WHERE ID = 1
+</PRE>
+</DIV></DIV>
+<P>Notice that only a single column is updated rahther than all columns. This is because the SDO ChangeSummary has enough fidelity to track changes on a property-by-property bases and the das has the ability to generate partial updates.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/chinese-portal.html b/site/trunk/site-publish/chinese-portal.html
new file mode 100644
index 0000000000..592e5cbdc5
--- /dev/null
+++ b/site/trunk/site-publish/chinese-portal.html
@@ -0,0 +1,175 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Chinese Portal</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=89135">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Chinese Portal">Chinese Portal</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ChinesePortal-ApacheTuscany%E4%B8%AD%E6%96%87%E5%AF%BC%E8%88%AA"></A>Apache Tuscany 中文导航</H1>
+
+<H2><A name="ChinesePortal-%E7%AE%80%E4%BB%8B"></A>简介</H2>
+<P>Apache Tuscany 提供全方位的开源SOA基础架构以利于开发, 组装, 发布, 管理构件式应用服务(Composite Applications)及数据处理. 该项目实现服务构件体系(SCA: Service Component Architecture)和服务数据对象(SDO: Service Data Objects)等OASIS OpenCSA(<A href="http://www.oasis-opencsa.org/" class="external-link" rel="nofollow">http://www.oasis-opencsa.org/</A>)标准.</P>
+
+<P>Apache Tuscany 提供开放式可扩展的运行环境以支持现在和将来的各种技术．这将解除应用程序对底层技术的依赖和偶合，使得跨技术网络平台的组装成为可能并大大简化．　</P>
+<UL>
+	<LI>多种构件实现, 包括Java, BPEL, XQuery, JavaScript</LI>
+</UL>
+
+
+<UL>
+	<LI>多种通讯协议, 包括RMI, Web Services, JSONRPC, Feed, EJB, CORBA</LI>
+</UL>
+
+
+<UL>
+	<LI>多种接口语言, 包括Java , WSDL</LI>
+</UL>
+
+
+<UL>
+	<LI>多种数据绑定, 包括XML, JavaBeans, JAXB, SDO, XMLBeans, JSON, AXIOM</LI>
+</UL>
+
+
+<P>Apache Tuscany集成其他技术包括OSGi, Spring, JEE和Web 2.0. 该项目提供了从小型到企业级业务的广谱支持. 解决方案提供商，中间件平台提供商和最终用户和开发人员都可获益. Tuscany是一轻载的平台，可以独立运行或嵌入在WebSphere, Geronimo, Tomcat和Jetty等应用服务器中．</P>
+
+<P>我们真心希望有更多来自中国的用户使用Tuscany SCA/SDO, 有更多开发人员成为Tuscany开源项目的Committer和PMC成员, 一起推动Tuscany的进步&#33;</P>
+
+
+<H2><A name="ChinesePortal-TuscanySCA%E4%B8%AD%E6%96%87%E8%AE%BA%E5%9D%9B"></A>Tuscany SCA 中文论坛</H2>
+
+
+<TABLE border="0" style="background-color: #fff; padding: 5px;" cellspacing="0">
+  <TR><TD>
+  <IMG src="http://groups.google.com/groups/img/3nb/groups_bar.gif" height="26" width="132" alt="Google Groups">
+  </TD></TR>
+  <TR><TD style="padding-left: 5px">
+  <B>加入Tuscany SCA中文论坛</B>
+  </TD></TR>
+  <FORM action="http://groups.google.com/group/tuscany-sca-chinese/boxsubscribe">
+  <TR><TD style="padding-left: 5px;">
+  电子邮件(Email): <INPUT type="text" name="email">
+  <INPUT type="submit" name="sub" value="订阅">
+  </TD></TR>
+</FORM>
+<TR><TD align="right">
+  <A href="http://groups.google.com/group/tuscany-sca-chinese">访问Tuscany SCA中文论坛</A><BR>
+<A href="http://translate.google.com/translate?u=http:%2F%2Fgroups.google.com%2Fgroup%2Ftuscany-sca-chinese&hl=en&ie=UTF8&sl=zh-CN&tl=en">English Translation of the Tuscany SCA Chinese Forum</A>
+</TD></TR>
+</TABLE>
+
+
+<H2><A name="ChinesePortal-%E6%9C%80%E6%96%B0%E6%9B%B4%E6%96%B0"></A>最新更新</H2>
+
+
+<A href="http://tuscany.apache.org/sca.html">SCA规范中文版</A>
+
+
+
+<H2><A name="ChinesePortal-%E5%BB%BA%E8%AE%BETuscany%E4%B8%AD%E6%96%87%E5%AE%98%E7%BD%91"></A>建设Tuscany中文官网</H2>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Chinese%20Web%20Site" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Chinese+Web+Site</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/column1.html b/site/trunk/site-publish/column1.html
new file mode 100644
index 0000000000..746a161654
--- /dev/null
+++ b/site/trunk/site-publish/column1.html
@@ -0,0 +1,137 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Column1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84485">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Tuscany Dashboard</A>&nbsp;&gt;&nbsp;<A href="" title="Column1">Column1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany Bookmarks</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">Problem reporting </A><BR>
+<A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Public Wiki</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/" class="external-link" rel="nofollow">Tuscany Website Wiki</A><BR>
+<A href="http://www.mail-archive.com/user@tuscany.apache.org/" class="external-link" rel="nofollow">User Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/" class="external-link" rel="nofollow">User Discussion Archives (incubator)</A><BR>
+<A href="http://www.mail-archive.com/dev@tuscany.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives (incubator)</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Specifications</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.oasis-opencsa.org/sca" class="external-link" rel="nofollow">OASIS Open CSA </A><BR>
+<A href="http://www.osoa.org/" class="external-link" rel="nofollow">Osoa.org </A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Assembly Model V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Policy Framework V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_TransactionPolicy_V1.0.pdf?version=1" class="external-link" rel="nofollow">SCA Transaction Policy V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JavaAnnotationsAndAPIs_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Java Common Annotations and APIs V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JavaComponentImplementation_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Java Component Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_SpringComponentImplementationSpecification-V100.pdf?version=1" class="external-link" rel="nofollow">SCA Spring Component Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforBPEL_V100.pdf?version=1" class="external-link" rel="nofollow">SCA BPEL Client and Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModel_Cpp-V100.pdf?version=2" class="external-link" rel="nofollow">SCA C+&#43; Client and Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_WebServiceBinding_V100.pdf?version=2" class="external-link" rel="nofollow">SCA Web Services Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">SCA JMS Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_EJBSessionBeanBinding_V100.pdf?version=1" class="external-link" rel="nofollow">SCA EJB Session Bean Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JCABindings_V1_00.pdf?version=2" class="external-link" rel="nofollow">SCA JCA Binding V1.00</A><BR>
+<A href="sca.html" title="SCA规范中文版"><B>Chinese Translation</B></A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/column2.html b/site/trunk/site-publish/column2.html
new file mode 100644
index 0000000000..dd853fd208
--- /dev/null
+++ b/site/trunk/site-publish/column2.html
@@ -0,0 +1,136 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Column2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84486">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Tuscany Dashboard</A>&nbsp;&gt;&nbsp;<A href="" title="Column2">Column2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.devx.com/IBMSCA/Article/39358" class="external-link" rel="nofollow"><B>Your First SCA application</B> </A><BR>
+<A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" class="external-link" rel="nofollow">Introduction to SCA by David Chappel</A><BR>
+<A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part1.pdf" class="external-link" rel="nofollow">Open CSA SCA Tutorial</A><BR>
+<A href="http://www.infoq.com/articles/setting-out-for-sca" class="external-link" rel="nofollow">Henning Blohm - Setting Out for SCA</A><BR>
+<A href="http://jdj.sys-con.com/read/325183.htm" class="external-link" rel="nofollow">What is SCA</A><BR>
+<A href="http://soa.sys-con.com/read/458183.htm" class="external-link" rel="nofollow">Building SOA with Apache Tuscany</A><BR>
+<A href="http://osoa.org/download/attachments/250/Power_Combination_SCA_Spring_OSGi.pdf?version=3%2F" class="external-link" rel="nofollow">SCA and OSGI and Spring</A><BR>
+<A href="http://events.oasis-open.org/home/sites/events.oasis-open.org.home/files/SCA-ESB-v4.ppt" class="external-link" rel="nofollow">SCA and ESBs</A><BR>
+<A href="http://osoa.org/display/Main/Relationship%20between%20SCA%20and%20BPEL" class="external-link" rel="nofollow">SCA &amp; BPEL </A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Videos" class="external-link" rel="nofollow"><FONT color="green"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> SCA Video Series </FONT></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu"><B>Your first SCA application with Tuscany</B></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">User Documentations </A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Developer Documentations </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java" class="external-link" rel="nofollow">Latest Source Code</A><BR>
+<A href="http://tuscany.apache.org/tuscany-downloads-documentations.html" class="external-link" rel="nofollow">Latest Release</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning to work with Open Source</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Working%20In%20Open%20Source" class="external-link" rel="nofollow">How to Work In Open Source Series </A><BR>
+<A href="http://www.catb.org/~esr/faqs/smart-questions.html" class="external-link" rel="nofollow">How to ask questions </A><BR>
+<A href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html" class="external-link" rel="nofollow">How to report bugs effectively </A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/column3.html b/site/trunk/site-publish/column3.html
new file mode 100644
index 0000000000..4cde2acdce
--- /dev/null
+++ b/site/trunk/site-publish/column3.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Column3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84488">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Tuscany Dashboard</A>&nbsp;&gt;&nbsp;<A href="" title="Column3">Column3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>PlanetApache.org blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/committers.html b/site/trunk/site-publish/committers.html
new file mode 100644
index 0000000000..601a9b5af7
--- /dev/null
+++ b/site/trunk/site-publish/committers.html
@@ -0,0 +1,340 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Committers</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100173">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Committers">Committers</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="Committers-ApacheTuscanycommitters"></A>Apache Tuscany committers</H1>
+
+<P>The people listed below have made significant contributions to Apache Tuscany and have earned committer status.</P>
+
+<P>In addition to being committers, some of the following people are also members of the Project Management Committee (PMC). Refer to the <A href="http://apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">How the ASF works</A> for details on meritocracy.</P>
+
+<P>If you would like to contribute to Apache Tuscany, please check the <A href="getting-involved.html" title="Getting Involved">Getting Involved</A> page to see how you can contribute.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Id </TH>
+<TH class="confluenceTh"> Name </TH>
+<TH class="confluenceTh"> PMC Member </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> adrianocrestani </TD>
+<TD class="confluenceTd"> Adriano Crestani </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> amita </TD>
+<TD class="confluenceTd"> Amita Vadhavkar </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ajborley </TD>
+<TD class="confluenceTd"> Andrew Borley </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> antelder </TD>
+<TD class="confluenceTd"> Ant Elder </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> beckerdo </TD>
+<TD class="confluenceTd"> Dan Becker </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> bdaniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> bjohnson </TD>
+<TD class="confluenceTd"> Brady Johnson </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> dchauhan </TD>
+<TD class="confluenceTd"> Dhaval Chauhan </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> dkulp </TD>
+<TD class="confluenceTd"> Dan Kulp </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> dougsleite </TD>
+<TD class="confluenceTd"> Douglas Siqueira Leite </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> fmoga </TD>
+<TD class="confluenceTd"> Florian Moga</TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> frankb </TD>
+<TD class="confluenceTd"> Frank Budinsky </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> fuhwei </TD>
+<TD class="confluenceTd"> Fuhwei Lwo </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> giorgio </TD>
+<TD class="confluenceTd"> Giorgio Zoppi </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> hmahbod </TD>
+<TD class="confluenceTd"> Haleh Mahbod </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> isilval </TD>
+<TD class="confluenceTd"> Ignacio Silva-Lepe </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> jsdelfino </TD>
+<TD class="confluenceTd"> Jean-Sebastien Delfino </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> kelvingoodson </TD>
+<TD class="confluenceTd"> Kelvin Goodson </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> kwilliams </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> lresende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> mcombellack </TD>
+<TD class="confluenceTd"> Mark Combellack </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> myoder </TD>
+<TD class="confluenceTd"> Michael Yoder </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> edwardsmj </TD>
+<TD class="confluenceTd"> Mike Edwards </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ocastaneda </TD>
+<TD class="confluenceTd"> Oscar Castaneda </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> nash </TD>
+<TD class="confluenceTd"> Simon Nash </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ramkumar </TD>
+<TD class="confluenceTd"> Ramkumar Ramalingam </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> rsivaram </TD>
+<TD class="confluenceTd"> Rajini Sivaram </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> rfeng </TD>
+<TD class="confluenceTd"> Raymond Feng </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> robbinspg </TD>
+<TD class="confluenceTd"> Pete Robbins </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> scottkurz </TD>
+<TD class="confluenceTd"> Scott Kurz </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> slaws </TD>
+<TD class="confluenceTd"> Simon Laws </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> svkrish </TD>
+<TD class="confluenceTd"> Venkata Krishnan </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> vamsic007 </TD>
+<TD class="confluenceTd"> Vamsavardhana Reddy </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> wjaniszewski </TD>
+<TD class="confluenceTd"> Wojciech Janiszewski </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/community-menu.html b/site/trunk/site-publish/community-menu.html
new file mode 100644
index 0000000000..c0657453bf
--- /dev/null
+++ b/site/trunk/site-publish/community-menu.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Community Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47630">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Community Menu">Community Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H4><A name="CommunityMenu-Community"></A>Community</H4>
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://apache-tuscany.blogspot.com/" class="external-link" rel="nofollow">Blog</A></P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/community.data/brazil.jpg b/site/trunk/site-publish/community.data/brazil.jpg
new file mode 100644
index 0000000000..a33706fe76
--- /dev/null
+++ b/site/trunk/site-publish/community.data/brazil.jpg
diff --git a/site/trunk/site-publish/community.data/brazil.jpg.jpeg b/site/trunk/site-publish/community.data/brazil.jpg.jpeg
new file mode 100644
index 0000000000..efbb55e8ab
--- /dev/null
+++ b/site/trunk/site-publish/community.data/brazil.jpg.jpeg
diff --git a/site/trunk/site-publish/community.data/chinese.jpg b/site/trunk/site-publish/community.data/chinese.jpg
new file mode 100644
index 0000000000..2515c7093c
--- /dev/null
+++ b/site/trunk/site-publish/community.data/chinese.jpg
diff --git a/site/trunk/site-publish/community.data/chinese.jpg.jpeg b/site/trunk/site-publish/community.data/chinese.jpg.jpeg
new file mode 100644
index 0000000000..a32b7610f0
--- /dev/null
+++ b/site/trunk/site-publish/community.data/chinese.jpg.jpeg
diff --git a/site/trunk/site-publish/community.html b/site/trunk/site-publish/community.html
new file mode 100644
index 0000000000..b0058d8c0c
--- /dev/null
+++ b/site/trunk/site-publish/community.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Community</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54958">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="Community">Community</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/componentizing-our-runtime.data/Architecture b/site/trunk/site-publish/componentizing-our-runtime.data/Architecture
new file mode 100644
index 0000000000..da5d22eb40
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.data/Architecture
@@ -0,0 +1 @@
+<stage keygen_seq="2"><pageObj stg="0" pb="0" gr="0" fill="16777215" height="754" width="576"><objects><object order="0" text-horizontal-pos="center" text-vertical-pos="middle" fixed-aspect="false" rot="0" height="329" width="446.95" y="278" x="339" shp_id="6" class="text_shape"><text><![CDATA[<P ALIGN="CENTER"><FONT FACE="Arial" SIZE="96" COLOR="#000000" LETTERSPACING="0" KERNING="0">A new <FONT COLOR="#6CCFF7">Gliffy </FONT>diagram</FONT></P>]]></text></object></objects></pageObj></stage>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg b/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg
new file mode 100644
index 0000000000..ad9a046efc
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg
diff --git a/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg.jpeg b/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg.jpeg
new file mode 100644
index 0000000000..1a55aca6cc
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.data/comp-architecture.jpg.jpeg
diff --git a/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg b/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg
new file mode 100644
index 0000000000..820a1a0fa0
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg
diff --git a/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg.jpeg b/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg.jpeg
new file mode 100644
index 0000000000..1e655330f4
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.data/metadata-usage.jpg.jpeg
diff --git a/site/trunk/site-publish/componentizing-our-runtime.html b/site/trunk/site-publish/componentizing-our-runtime.html
new file mode 100644
index 0000000000..082188aed3
--- /dev/null
+++ b/site/trunk/site-publish/componentizing-our-runtime.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Componentizing our runtime</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48428">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Componentizing our runtime">Componentizing our runtime</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Some initial thoughts to help discuss how we could componentize our runtime.</P>
+
+<H1><A name="Componentizingourruntime-Architecture%26nbsp%3B"></A>Architecture&nbsp;</H1>
+
+<P>A componentized Tuscany runtime kernel will allow for different integration strategies with various app servers and runtime environments.</P>
+
+<P><SPAN class="image-wrap" style=""><A class="confluence-thumbnail-link 955x575" href="componentizing-our-runtime.data/comp-architecture.jpg"><IMG src="componentizing-our-runtime.data/comp-architecture.jpg.jpeg" style="border: 0px solid black"></A></SPAN></P>
+
+<H1><A name="Componentizingourruntime-Metadatausage"></A>Metadata usage</H1>
+
+<P>Model, assemble, deploy, manage - How can we provide consistent SCA metadata to all these tasks?<BR>
+<SPAN class="image-wrap" style=""><A class="confluence-thumbnail-link 1177x439" href="componentizing-our-runtime.data/metadata-usage.jpg"><IMG src="componentizing-our-runtime.data/metadata-usage.jpg.jpeg" style="border: 0px solid black"></A></SPAN><BR>
+&nbsp;</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/composing-components-into-composites.html b/site/trunk/site-publish/composing-components-into-composites.html
new file mode 100644
index 0000000000..25844d57ac
--- /dev/null
+++ b/site/trunk/site-publish/composing-components-into-composites.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Composing components into Composites</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44881">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Composing components into Composites">Composing components into Composites</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/concept-conventionoverconfiguration.html b/site/trunk/site-publish/concept-conventionoverconfiguration.html
new file mode 100644
index 0000000000..5c11cd575b
--- /dev/null
+++ b/site/trunk/site-publish/concept-conventionoverconfiguration.html
@@ -0,0 +1,157 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Concept - ConventionOverConfiguration</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Concept - ConventionOverConfiguration">Concept - ConventionOverConfiguration</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Concept - ConventionOverConfiguration</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=52811">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=52811">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=52811">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=52811">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=52811">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=52811">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=adriano_crestani">Adriano Crestani</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Apr 29, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=52811&originalId=52885">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="Concept-ConventionOverConfiguration-ConventionOverConfiguration"></A>ConventionOverConfiguration</H1>
+
+<P>This concept reflects the notion that configuration (defining a bunch of stuff in a side file) can be avoided by following convention (adhering to prescribed patterns) and that this is generally a good thing. The RDB DAS has several reasonable conventions in place and using these can significantly reduce a developer's work-load.</P>
+
+<P>As an example, the RDB DAS provides a straight-forward, one-to-one mapping of database tables to DataObject Types and from table columns to DataObject properties. If a user provides no mapping information to the contrary, a graph of DataObjects returned by the DAS will directly map Types/Properties to the Tables/Columns queried.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">TABLE CUSTOMER
+     ID         INTEGER
+     LASTNAME   VARCHAR(20)
+     ADDRESS    VARCHAR(30)</PRE>
+</DIV></DIV>
+<P>If an application uses the DAS to query this table with the following SQL statement:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>SELECT * FROM CUSTOMER
+</PRE>
+</DIV></DIV>
+<P>The DAS will return a graph of DataObjects each of Type CUSTOMER and each instance in will have three properties: (ID, LASTNAME, ADDRESS). Here is the example code. Note that no configuration data is provided at all.</P>
+<DIV class="panel"><DIV class="panelContent">
+<P>DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command readCustomers = das.createCommand(&quot;select * from CUSTOMER&quot;);<BR>
+ DataObject root = readCustomers.executeQuery();</P>
+</DIV></DIV>
+<P>Another piece of convention followed by the RDB DAS has to do with database table keys. When asked to &quot;apply changes&quot;, the RDB DAS scans the SDO ChangeSummery and generates the set of INSERT/UPDATE and DELETE statements needed to flush the graph changes to the database. To generate the correct statements the RDB DAS needs to know how a DataObject's properties map to a database table key. In typical Object/Relational mappings frameworks, this information is provided in a config file with something like this:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>&lt;Table tableName=&quot;COMPANY&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      .
+      .
+      .
+   &lt;/Table&gt;
+</PRE>
+</DIV></DIV>
+<P>However, the RDB DAS understands is that, in the absence of user provided cofiguration data, a DataObject property named &quot;ID&quot; maps to a key column named &quot;ID&quot; in the database. If a developer follows this convention (naming key columns &quot;ID&quot;) then this key-mapping information need not be specified in a configuration file.</P>
+
+<P>The RDB DAS also has convention in place for mapping DataObject relationships. If a database table (yyy) has a column named xxx_ID then the DAS will assume, in the absence of config data to the contrary, that there is a one-to-many relationship from table xxx to table yyy and that the key column for table xxx is named &quot;ID&quot;.</P>
+
+<P>There is more &quot;convention over configuration&quot; coming. We are currently looking into support for optimistic concurrency control conventions and other areas. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/configurable-database-generated-keys-support.html b/site/trunk/site-publish/configurable-database-generated-keys-support.html
new file mode 100644
index 0000000000..3635ec4144
--- /dev/null
+++ b/site/trunk/site-publish/configurable-database-generated-keys-support.html
@@ -0,0 +1,126 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Configurable database generated keys support</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66136">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Configurable database generated keys support">Configurable database generated keys support</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Configurabledatabasegeneratedkeyssupport-Configurabledatabasegeneratedkeyssupport"></A>Configurable database generated keys support</H1>
+
+<P>New boolean attribute in Config - &quot;generatedKeysSupported&quot; (default value=TRUE). User can set true/false for this in Config. If not set in Config, JDB Metadata API check supportsGetGeneratedKeys() is done to detect whether to use auto generated keys during insert. </P>
+
+<P>This gived user flexibility to turn on/off support for database generated keys during INSERT based on the<BR>
+database vendor/driver version in use. Particularly when user is sure that the DBMS driver does not support<BR>
+autogenerated keys, he can configure FALSE value through config as below.</P>
+
+<P>Note: For Derby, always assumed generatedKeysSupported=TRUE. This is because current Derby API return FALSE for supportsGetGeneratedKeys(), as it is partially implemented, but in DAS context, this support is sufficient.</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xmlns=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; useGetGeneratedKeys=&quot;false&quot;&gt;
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/connection-support-for-j2se-environment.html b/site/trunk/site-publish/connection-support-for-j2se-environment.html
new file mode 100644
index 0000000000..0c34c44053
--- /dev/null
+++ b/site/trunk/site-publish/connection-support-for-j2se-environment.html
@@ -0,0 +1,158 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Connection support for J2SE environment</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53930">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Connection support for J2SE environment">Connection support for J2SE environment</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ConnectionsupportforJ2SEenvironment-ConnectionsupportforJ2SEenvironment"></A>Connection support for J2SE environment</H1>
+
+<P>So far DAS utilized JDBC Connection - either explicitly supplied by DAS invoker or available in the  runtime context pre-configured using JNDI.  </P>
+
+<P>DAS config needs to have provision to support JDBC Connection for J2SE environment, when JNDI is not configured and connection is not explicitly supplied by the DAS invoker.</P>
+
+<P>Below are the changes in DAS Config xsd. The attribute dataSource and element ConnectionProperties<BR>
+are mutually exclusive. User needs to specify ONLY one of these. When ConnectionProperties is specified, DriverManager for appropriate database vendor is used to instantiate the JDBC Connection.<BR>
+This way the J2SE applications can use DAS.</P>
+
+<P>When dataSource is specified, the JNDI context is searched for pre-configured dataSource. This mode is useful, when Web Containers like Tomcat have the resource pre-defined for the dataSource.</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>   &lt;xsd:complexType name=&quot;ConnectionProperties&quot;&gt;
+      &lt;xsd:attribute name=&quot;driverClass&quot; type=&quot;xsd:string&quot;/&gt;
+      &lt;xsd:attribute name=&quot;databaseURL&quot; type=&quot;xsd:string&quot;/&gt;
+      &lt;xsd:attribute name=&quot;userName&quot; type=&quot;xsd:string&quot; default=&quot;&quot;/&gt;
+      &lt;xsd:attribute name=&quot;password&quot; type=&quot;xsd:string&quot; default=&quot;&quot;/&gt;
+      &lt;xsd:attribute name=&quot;loginTimeout&quot; type=&quot;xsd:int&quot; default=&quot;0&quot;/&gt;      
+   &lt;/xsd:complexType&gt;
+   
+   &lt;xsd:complexType name=&quot;ConnectionInfo&quot;&gt;
+      &lt;xsd:sequence&gt;
+        &lt;xsd:element  maxOccurs=&quot;1&quot; minOccurs=&quot;0&quot; name=&quot;ConnectionProperties&quot; type=&quot;config:ConnectionProperties&quot;/&gt;
+      &lt;/xsd:sequence&gt;
+      &lt;xsd:attribute name=&quot;dataSource&quot; type=&quot;xsd:string&quot;/&gt;
+      &lt;xsd:attribute name=&quot;managedtx&quot; type=&quot;xsd:boolean&quot; default=&quot;true&quot;/&gt;
+   &lt;/xsd:complexType&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Below is one example DAS config, using Derby database.</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> &lt;Config xmlns=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt; 
+    
+    &lt;!--Uncomment below for derby test--&gt;
+	&lt;ConnectionInfo&gt;
+		&lt;ConnectionProperties
+			driverClass=&quot;org.apache.derby.jdbc.EmbeddedDriver&quot;
+			databaseURL=&quot;jdbc:derby:target/dastest; create = true&quot;
+			loginTimeout=&quot;600000&quot;/&gt;
+	&lt;/ConnectionInfo&gt;
+   ....
+  &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/contributing-to-the-sdo-cts.html b/site/trunk/site-publish/contributing-to-the-sdo-cts.html
new file mode 100644
index 0000000000..421529a54c
--- /dev/null
+++ b/site/trunk/site-publish/contributing-to-the-sdo-cts.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Contributing to the SDO CTS</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46779">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Contributing to the SDO CTS">Contributing to the SDO CTS</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H1><A name="ContributingtotheSDOCTS-Contributing"></A>Contributing</H1></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/conventionoverconfiguration.html b/site/trunk/site-publish/conventionoverconfiguration.html
new file mode 100644
index 0000000000..9995c7bc58
--- /dev/null
+++ b/site/trunk/site-publish/conventionoverconfiguration.html
@@ -0,0 +1,152 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : ConventionOverConfiguration</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52811">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="ConventionOverConfiguration">ConventionOverConfiguration</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ConventionOverConfiguration-ConventionOverConfiguration"></A>ConventionOverConfiguration</H1>
+
+<P>This concept reflects the notion that configuration (defining a bunch of stuff in a side file) can be avoided by following convention (adhering to prescribed patterns) and that this is generally a good thing. The RDB DAS has several reasonable conventions in place and using these can significantly reduce a developer's work-load.</P>
+
+<P>As an example, the RDB DAS provides a straight-forward, one-to-one mapping of database tables to DataObject Types and from table columns to DataObject properties. If a user provides no mapping information to the contrary, a graph of DataObjects returned by the DAS will directly map Types/Properties to the Tables/Columns queried.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+TABLE CUSTOMER
+     ID         INTEGER
+     LASTNAME   VARCHAR(20)
+     ADDRESS    VARCHAR(30)
+</PRE>
+</DIV></DIV>
+<P>If an application uses the DAS to query this table with the following SQL statement:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>SELECT * FROM CUSTOMER
+</PRE>
+</DIV></DIV>
+<P>The DAS will return a graph of DataObjects each of Type CUSTOMER and each instance in will have three properties: (ID, LASTNAME, ADDRESS). Here is the example code. Note that no configuration data is provided at all.</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command readCustomers = das.createCommand(&quot;select * from CUSTOMER&quot;);<BR>
+ DataObject root = readCustomers.executeQuery();</P>
+</DIV></DIV>
+<P>Another piece of convention followed by the RDB DAS has to do with database table keys. When asked to &quot;apply changes&quot;, the RDB DAS scans the SDO ChangeSummery and generates the set of INSERT/UPDATE and DELETE statements needed to flush the graph changes to the database. To generate the correct statements the RDB DAS needs to know how a DataObject's properties map to a database table key. In typical Object/Relational mappings frameworks, this information is provided in a config file with something like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Table tableName=&quot;COMPANY&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      .
+      .
+      .
+   &lt;/Table&gt;
+</PRE>
+</DIV></DIV>
+<P>However, the RDB DAS understands is that, in the absence of user provided cofiguration data, a DataObject property named &quot;ID&quot; maps to a key column named &quot;ID&quot; in the database. If a developer follows this convention (naming key columns &quot;ID&quot;) then this key-mapping information need not be specified in a configuration file.</P>
+
+<P>The RDB DAS also has convention in place for mapping DataObject relationships. If a database table (yyy) has a column named xxx_ID then the DAS will assume, in the absence of config data to the contrary, that there is a one-to-many relationship from table xxx to table yyy and that the key column for table xxx is named &quot;ID&quot;.</P>
+
+<P>There is more &quot;convention over configuration&quot; coming. We are currently looking into support for optimistic concurrency control conventions and other areas. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/create-signing-key.html b/site/trunk/site-publish/create-signing-key.html
new file mode 100644
index 0000000000..5d0d367892
--- /dev/null
+++ b/site/trunk/site-publish/create-signing-key.html
@@ -0,0 +1,200 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Create signing key</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60581">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making releases">Making releases</A>&nbsp;&gt;&nbsp;<A href="" title="Create signing key">Create signing key</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Createsigningkey-Createacodesigningkey"></A>Create a code signing key</H3>
+
+<P>Install <A href="http://www.gnupg.org/" class="external-link" rel="nofollow">GNU GPG</A></P>
+
+<P>Create a gpg config file eg c:\gpg\conf\gpg.conf with this contents:<BR>
+utf8-strings<BR>
+keyserver x-hkp://pgp.surfnet.nl/<BR>
+default-cert-check-level 3<BR>
+keyserver-options auto-key-retrieve include-subkeys<BR>
+no-mangle-dos-filenames<BR>
+no-secmem-warning</P>
+
+<P>Set the GNUPGHOME environment var to point to that: set GNUPGHOME=\gpg\conf</P>
+
+<P>gpg --gen-key</P>
+
+<P>accept all defaults, use your apache email and a comment like &quot;Code Signing Key&quot;, eg:</P>
+
+<P>Real name: Ant Elder<BR>
+Email address: antelder@apache.org<BR>
+Comment: Code Signing Key</P>
+
+<P>Use long hard to guess passphrase with numbers and miss spellings etc </P>
+
+<P>now should be able to show that key with: gpg --list-keys</P>
+
+<P>C:\&gt;gpg --list-keys<BR>
+/gpgtest/conf\pubring.gpg<BR>
+-------------------------<BR>
+pub   1024D/481240F5 2007-06-28<BR>
+uid                  Ant Elder (Code Signing Key) &lt;antelder@apache.org&gt;<BR>
+sub   2048g/F6F122B8 2007-06-28</P>
+
+<P>Upload that to a key server using the keyid, eg gpg --send-key 481240F5</P>
+
+<P>Now if you go to <A href="http://pgp.surfnet.nl/" class="external-link" rel="nofollow">http://pgp.surfnet.nl/</A> you should be able to search for you name and find the uploaded key</P>
+
+
+<P>Add this key to the KEYS file in the Tuscany SVN: <A href="https://svn.apache.org/repos/asf/incubator/tuscany/KEYS" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/KEYS</A><BR>
+eg, check out the KEYS file then update with:</P>
+
+<P>(gpg --list-sigs  antelder@apache.org &amp;&amp; gpg --armor --export antelder@apache.org) &gt;&gt; KEYS</P>
+
+
+
+
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG b/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG
new file mode 100644
index 0000000000..1402f3b8f5
--- /dev/null
+++ b/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG
diff --git a/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG.jpeg b/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG.jpeg
new file mode 100644
index 0000000000..d8256c11a8
--- /dev/null
+++ b/site/trunk/site-publish/das-c-architecture-guide.data/das graph as I suppose it shoud be.JPG.jpeg
diff --git a/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG b/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG
new file mode 100644
index 0000000000..c5a3a06df2
--- /dev/null
+++ b/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG
diff --git a/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG.jpeg b/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG.jpeg
new file mode 100644
index 0000000000..814cad6825
--- /dev/null
+++ b/site/trunk/site-publish/das-c-architecture-guide.data/das_graph.JPG.jpeg
diff --git a/site/trunk/site-publish/das-c-architecture-guide.html b/site/trunk/site-publish/das-c-architecture-guide.html
new file mode 100644
index 0000000000..36c83390a1
--- /dev/null
+++ b/site/trunk/site-publish/das-c-architecture-guide.html
@@ -0,0 +1,662 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Architecture Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45093">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Architecture Guide">DAS C++ Architecture Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ffffff;border-color: #ECF4D1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #ECF4D1;background-color: #ECF4D1;"><B>Apache Tuscany RDB DAS Java Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<UL>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-Overview">Overview</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-FunctionDescription">Function Description</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-Architecture">Architecture</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-UserInterface">User Interface</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-ClassDiagram">Class Diagram</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-DesignDetails">Design Details</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema(config.xsd)</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-ScalabilityAspects">Scalability Aspects</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-Future">Future</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-Samples">Samples</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-TerminologyandUsefulLinks">Terminology and Useful Links</A></LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-Overview"></A><A name="DASC%2B%2BArchitectureGuide-Overview"></A>Overview</H3>
+
+<P>Service Data Object (SDO) and Service Component Architecture (SCA) are the basic building blocks in Service Oriented Architecture (SOA). SDO is the way of representing data in SCA. As the applications using SOA have back-end data representation in different formats like Database, File System, XML Based Data, etc., there is a need to provide a mapping between these data representations and SDO. C+&#43; RDB DAS (Data Access Service for Relational Database) is the effort to suffice this mapping requirement for Relational Database.</P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-FunctionDescription"></A><A name="DASC%2B%2BArchitectureGuide-FunctionDescription"></A> Function Description</H3>
+
+<P>RDB DAS provides 2 major capabilities:&#45;<BR>
+1) Execute SQL Queries and return result as a graph of Data Objects.<BR>
+2) Reflect changes made to a graph of Data Objects back to the database.<BR>
+It also supports explicit CUD SQL statements execution against database.<BR>
+<SPAN class="error">Unable to render embedded object: File (rdbDAS.gif) not found.</SPAN></P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-Architecture"></A><A name="DASC%2B%2BArchitectureGuide-Architecture"></A> Architecture</H3>
+
+<P>This section describes the overall architecture of C+&#43; RDB DAS. The details are elaborated in <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-DesignDetails">Design Details</A>. Also, for details of different DAS Configuration settings, refer to <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema(config.xsd)</A>.</P>
+
+<P>DAS functions based on external Configuration. This configuration can be specified using file or can be programmatically build by the caller, using Config interface.</P>
+
+<P>Design follows a factory pattern to create DAS instance. DAS instance contains <B>Connection</B>, <B>Config</B> and <B>Commands</B>.</P>
+
+<P>The <B>Connection</B> can either be passed from caller or can be created using the Configuration information(not implemented yet). It is used for all the database operations done in that DAS instance and also for controlling transactions.</P>
+
+<P><B>Commands</B> hold all the commands from Configuration file and also the ones that are created programmatically on the fly. The Command is implemented using different inherited classes like <B>Read/Insert/Update/Delete/OptimisticWrite</B> with root parent class <B>CommandImpl</B>. More details on different classes will be in <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-DesignDetails">Design Details</A>.</P>
+
+<P><B>Config</B> holds the reference for Configuration associated with the DAS instance and contains all details as mentioned in <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema (config.xsd)</A>.</P>
+
+<P>Caller has 2 (and some other) main APIs available in DAS instance to use the Commands <B>getCommand(name)</B> and <B>applyChanges(Data Object)</B></P>
+<OL>
+	<LI><B>getCommand(name)</B> is typically used to retrieve the Command (SQL String) available from Config. SQL String. User calls executeQuery() on this Command and based on whether it is CUD/Read operation. executeQuery() will return a root DataObject or a null DataObject.</LI>
+	<LI><B>applyChanges(Data Object)</B> is the way to process a SDO DataObject and SDO ChangeSummary to create SQL UPDATE statement to be executed against database. More details on SDO integration are in <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-DesignDetails">Design Details</A>.</LI>
+</OL>
+
+
+<H3><A name="DASC%2B%2BArchitectureGuide-UserInterface"></A><A name="DASC%2B%2BArchitectureGuide-UserInterface"></A> User Interface</H3>
+
+<P>DAS exposes a set of interfaces to end user.</P>
+<UL>
+	<LI><B>DASFactory</B> uses different options to produce DAS instance using Factory pattern.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> apache::das::DAS </TD>
+<TD class="confluenceTd"> createDAS(apache::das::rdb::ConnectionPtr connection) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provided connection </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> apache::das::DAS </TD>
+<TD class="confluenceTd"> createDAS(apache::das::Config config) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provided config object <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> apache::das::DAS </TD>
+<TD class="confluenceTd"> createDAS(apache::das::Config config, apache::das::rdb::ConnectionPtr connection) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provide config object and connection </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>DAS Interface</B> to call APIs for DAS instance.<BR>
+<B>Field Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> static apache::das::rdb::DASFactoryImpl </TD>
+<TD class="confluenceTd"> getFactory() </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> applyChanges(commonj::sdo::DataObjectPtr root) </TD>
+<TD class="confluenceTd"> The change history is scanned and modifications to the graph of data objects are flushed to the database. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> apache::das::rdb::CommandPtr </TD>
+<TD class="confluenceTd"> createCommand(std::string sql) </TD>
+<TD class="confluenceTd"> Creates a Command based on the provided SQL statement </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> apache::das::rdb:: CommandPtr </TD>
+<TD class="confluenceTd"> getCommand(std::string name) </TD>
+<TD class="confluenceTd"> Gets the named command from this factory's inventory </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Command</B> Used to execute read / write (CRUD) on database.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> commonj::sdo::DataObjectPtr </TD>
+<TD class="confluenceTd"> executeQuery() </TD>
+<TD class="confluenceTd"> Performs the function defined by the command and return the results in the root DataObject </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>ConfigImpl</B> is used to load configuration for RDB DAS instance from a XML file. A instance of this class can be empty or can load information from a XML file.<BR>
+<B>Constructor Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> apache::das::rdb::ConfigImpl() </TD>
+<TD class="confluenceTd"> creates an empty Config object <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> apache::das::rdb::ConfigImpl(std::string xmlFilePath) </TD>
+<TD class="confluenceTd"> creates a Config object based on data read from the specified XML file </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> apache::das::rdb::Table&amp; </TD>
+<TD class="confluenceTd"> addTable(std::string tableName) </TD>
+<TD class="confluenceTd"> create a Table object with the specified table name, adds it to the Config&nbsp; object and returns a reference the created Table object <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addCommand(std::string commandName, std::string sqlStatement) </TD>
+<TD class="confluenceTd"> add a command on the Config object <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Relationship </TD>
+<TD class="confluenceTd"> addRelationship(java.lang.String parentName, java.lang.String childName) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Relationship </TD>
+<TD class="confluenceTd"> addRelationship(java.util.Vector parentNames, java.util.Vector childNames) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addSelectCommand(java.lang.String name, java.lang.String sql) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Table </TD>
+<TD class="confluenceTd"> addTable(java.lang.String name, java.lang.String typeName) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addUpdateCommand(java.lang.String name, java.lang.String sql) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addUpdateStatement(Table table, java.lang.String statement, java.lang.String parameters) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Config </TD>
+<TD class="confluenceTd"> getConfig() </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> setDataObjectModel(java.lang.String dataObjectModel) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Converter</B> A lightweight Table-column &lt;--&gt; DataObject-property converter framework. Converters allow a user to insert a transformation between a column's value and its destination DataObject property's value. For example, by default, a VARCHAR column will be represented as a String in its corresponding DataObject property. A user could insert a converter that transforms the VARCHAR value to an Integer. If this is done then although the column returns character data, the DataObject property will be an Integer<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> java.lang.Object </TD>
+<TD class="confluenceTd"> getColumnValue(java.lang.Object propertyData) </TD>
+<TD class="confluenceTd"> Transform the columnData object to a new value and possibly new type </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java.lang.Object </TD>
+<TD class="confluenceTd"> getPropertyValue(java.lang.Object columnData) </TD>
+<TD class="confluenceTd"> Transform the columnData object to a new value and possibly new type. </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Pager</B> An iterator-like interface to conveniently move through chunks of data. The idea is that a Pager works with a read Command. The read command returns a large amount of data and the client wants to work with chunks of it at a time. So the Pager is created on the command and each call to next returns the next chunk of data.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> getPage(int page) </TD>
+<TD class="confluenceTd"> Return a specific identified page </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> next() </TD>
+<TD class="confluenceTd"> Get the next page of data </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> previous() </TD>
+<TD class="confluenceTd"> Get the page prior to the last page returned </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>GraphMerger</B> is utility class implementation (no interface), to provide functions for flexibly managing DataObjects.<BR>
+<B>Constructor Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> GraphMerger() </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addPrimaryKey(java.lang.String key) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> emptyGraph(Config config) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> merge(DataObject primary, DataObject secondary) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> merge(java.util.List graphs) </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<H3><A name="DASC%2B%2BArchitectureGuide-ClassDiagram"></A><A name="DASC%2B%2BArchitectureGuide-ClassDiagram"></A> Class Diagram</H3>
+
+<P><A href="rdb-das-class-diagram.html" title="RDB DAS class diagram">Class Diagram</A></P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-DesignDetails"></A><A name="DASC%2B%2BArchitectureGuide-DesignDetails"></A>Design Details</H3>
+
+<P>Major classes are described here at high level to show how these fit in the complete picture. For<BR>
+methods/members details please refer to javadoc from binary distribution at <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Downloads" class="external-link" rel="nofollow">Downloads</A>.</P>
+
+<P><B>DASFactoryImpl</B> Expose methods to create DAS instance from Config or Connection or both.</P>
+
+<P><B>DASImpl</B> The sole instance of DAS existing for one DAS runtime. It contains MappingWrapper, JDBC Connection and a Map of all DAS Commands. To create appropriate instances of CommandImpl, DASImpl, scan's each Config Command for attribute kind, and based on that required instance of CommandImpl is added to the map. Connection from DataSource or Database Driver Manager both are supported. releaseResources() method allows external caller to close JDBC Connection when it is supplied by the caller.Provides methods to get/create DAS Commands and applyChanges(changed DataObject) to reflect DataObject changes to Database.</P>
+
+<P><B>MappingWrapper</B> Wrapper over DAS Config. Provides various get/set methods for all different elements in DAS Config.</P>
+
+<P><B>ConnectionImpl</B> Contains JDBC Connection, and whether it is managed by DAS/caller and also whether Database platform support auto-generated key column values.</P>
+
+<P><B>BaseCommandImpl</B> Parent class for all other CommandImpl classes. Contains MappingWrapper. setConnection() method to associate ConnectionImpl with each DAS Command.</P>
+
+<P><B>ApplyChangesCommandImpl</B> Extends BaseCommandImpl. Contains ChangeSummarizer. It is used to load DataObject's ChangeSummary and for each change, Generator classes (UpdateGenerator, DeleteGenerator) are called to form appropriate SQL Statement with parameters, which is executed against the Database.</P>
+
+<P><B>CommandImpl</B> Extends BaseCommandImpl and implements DAS Config's &lt;Command&gt;. So, in effect it is parent class for all explicit CRUD Commands. It contains Statement, Parameters and ResultSetShape.</P>
+
+<P><B>WriteCommandImpl</B> Extends CommandImpl. Parent for CUD. If SELECT(Read) is attempted, exception is thrown.</P>
+
+<P><B>DeleteCommandImpl</B> Extends WriteCommandImpl.</P>
+
+<P><B>InsertCommandImpl</B> Extends WriteCommandImpl. Supports Database generated keys.</P>
+
+<P><B>UpdateCommandImpl</B> Extends WriteCommandImpl.</P>
+
+<P><B>OptimisticWriteCommandImpl</B> Extends UpdateCommandImpl. Supports OCC feature. Here by design when a CollisionParameter's value is attempted to change more than once, the CollisionParameter does not allow its value change (as during first setValue(), flag indicating that value is changed is set). So, the attempt results in no database rows getting changes. On this condition exception is thrown as Update Collision is occurred.</P>
+
+<P><B>ReadCommandImpl</B> Extends CommandImpl. Used for explicit SELECT. Support's DAS feature, ResultDescriptor. If CUD is attempted, exception is thrown. Supports paging. When Query is executed (executeQuery()), the JDBC ResultSet is converted into DataObject Graph and returned to caller.</P>
+
+<P><B>SPCommandImpl</B> Extends ReadCommandImpl for StoredProcedure call. Method executeQuery() is used when the stored procedure returns ResultSet and method execute() is used when the stored procedure does not have any return ResultSet.<BR>
+Parameters hold both IN and OUT parameters.</P>
+
+<P><B>PagerImpl</B> Holds ReadCommandImpl, page size and current page index. Implements next(), previous(), getPage(index) methods. In each based on current page index and page size, the ReadCommandImpl is executed with start and end boundaries set.</P>
+
+<P><B>ChangeFactory</B> This class is used during DAS.applyChanges(). With changed DataObject and ChangeSummary, required type of ChangeOperation instance is created (like DeleteOperation, UpdateOperation). This instance of ChangeOperation holds appropriate CommandImpl, which in itself holds the Parameters. Thus for a given DAS Config and Connection, ChangeFactory is used to propagate DataObject changes to Database via CommandImpl.</P>
+
+<P><B>ChangeSummarizer</B> Main function of this class is load Changes based on root DataObject of applyChanges() Command MappingWrapper is used to sort the ChangeOperations in Changes.</P>
+
+<P><B>Changes</B> Contains DeleteList, InsertList, Update List pertaining to one applyChanges() command.</P>
+
+<P><B>DeleteList</B> Maintains ordered/unordered list of DeleteOperations. If DAS Config defines any Relationships, MappingWrapper aids in forming Delete Order for all the Tables undergoing DeleteOperation, based on Parent-Child relationships. If Delete Order is available, DeleteList forms a List following appropriate Referential Integrity. Otherwise no order is maintained.</P>
+
+<P><B>InsertList</B> Maintains ordered/unordered list of CreateOperations. If DAS Config defines any Relationships, MappingWrapper aids in forming Insert Order for all the Tables undergoing InsertOperation, based on Parent-Child relationships. If Insert Order is available, InsertList forms a List following appropriate Referential Integrity. Otherwise no order is maintained.</P>
+
+<P><B>UpdateList</B> As UpdateOperation happens on single Table, there is no reason for sorting based on any Referntial Relationships. So, this class is just a wrapper on ArrayList.</P>
+
+<P><B>BaseGenerator</B> Parent class for Delete/Update/InsertGenerator. If in DAS Config, any Table Column specifies a ColumnConverter class, BaseGenerator, returns a new instance of this class.</P>
+
+<P><B>DeleteGenerator</B> Extends BaseGenerator. Based on Table and DAS Config, DELETE statement is generated with Primary Keys in WHERE clause. Using this, DeleteCommandImpl is instantiated. For Parameters in DeleteCommandImpl ColumnConverter is considered if present.</P>
+
+<P><B>InsertGenerator</B> Same as DeleteGenerator. Here Database Key value generation is also considered.</P>
+
+<P><B>UpdateGenerator</B> Extends BaseGenerator. In UPDATE statement WHERE clause Primary Keys are considered as well as Default OCC policy is considered. Also check is implemented for any violation for Foreign Key relationships. Parameters in UpdateCommandImpl consider ColumnConvert as appropriate. OCC attributes in DAS Config for &lt;Column&gt;, viz. managed and collision are considered in SET and WHERE clause formation respectively.</P>
+
+<P><B>ChangeOperation</B> Abstract parent class for Create/Delete/UpdateOperation. It contains WriteCommand, DatabaseObject and any generated ID.</P>
+
+<P><B>DeleteOperation</B> Extends ChangeOperation. Uses SDO's ChangeSummary based OldValues as in the DataGraph , deleted objects have lost their <B>settings</B>.</P>
+
+<P><B>CreateOperation</B> Extends ChangeOperation, makes use of Generated ID.</P>
+
+<P><B>UpdateOperation</B> Extends ChangeOperation and makes use of generated ID.</P>
+
+<P><B>DatabaseObject</B> Wraps DataObject. If a field is FK, it will return value from parent. It also sets the Database generated value in primary key property of DataObject.</P>
+
+<P><B>RowObjects</B> Holds a Map of TableName-&gt;DataObject. It uses relationship information to associate these DataObjects to form DataGraph .</P>
+
+<P><B>GraphBuilderMetadata</B> Class that form Metadata for forming DataObjects based on MetaData available in JDBC ResultSet. It uses DAS Config, ResultSet and ResultSetShape to form a Collection of ResultMetaData. It is used in ResultSetProcessor and thus further in RowObjects.</P>
+
+<P><B>ResultSetProcessor</B> This class is used to transform data in ResultSet into set of inter-related DataObjects. It contains TableRegistry, GraphBuilderMetadata and DataObjectMaker. Using GrapbBuilderMetadata and the JDBC ResultSet, it forms<BR>
+ResultSetRow , then form RowObjects and connects related DataObjects using Relationship information from RowObjects to form the completed DataGraph.</P>
+
+<P><B>DataObjectMaker</B> Forms DataObject based on TableData. It is used in ResultSetProcessor for this.</P>
+
+<P><B>TableRegistry</B> Base Interface for Single/MultiTableRegistry.</P>
+
+<P><B>SingleTableRegistry</B> No functionality.</P>
+
+<P><B>MultiTableRegistry</B> Implements TableRegistry. Used when converting JDBC ResultSet of SQL SELECT into DataObjects.</P>
+
+<P><B>DefaultConverter</B> Implements Converter. In case of Blob database column type, returns byte[] for the column value when mapping from database data to property value.</P>
+
+<P><B>ResultMetaData</B> Holds complete ResultSet related metadata of the Query result&#45; ResultSet, ColumnConverters, MappingWrapper, SDO Type Names, SDO Property Names, ResultSetShape for the ResultSet, Map containing Table Type <DEL>&gt; Column Property (equivalent to Database Table</DEL>&gt;Column). It provides various get methods on these members.</P>
+
+<P><B>ResultSetRow</B> A ResultSetRow is used to transform a single row of ResultSet into a set of DataObjects. It uses TableData as a intermediate place to keep Database Data for a Row , which is later used to form DataObject. It holds a List of all Table Data for the current row. This class is used in ResultSetProcessor.</P>
+
+<P><B>TableData</B> Holds single JDBC row for a Table and its Columns - tableName, list of PKs, Map of ColumnName-&gt;Data, if table has PK. Is used by DataObjectMaker to form DataObject based on Table Row.</P>
+
+<P><B>ResultSetTypeMap</B> Provides mapping from sql.Types to SDO Type. Used in ResultSetShape to populate SDO Type[] for all columns present in ResultSet.</P>
+
+<P><B>FactoryRegistry</B> Maintains registry of ChangeFactory. There is one FactoryRegistry for on DAS Config and Connection. It maintains a Map with entries of each SDO Type against ChangeFactory for current DAS Config+Connection.</P>
+
+<P><B>ParameterImpl</B> Holds values required for representing SQL statement/StoredProcedure parameter like name, index, value, SDO Type and columnConverter. Can have direction IN/OUT/IN-OUT. IN is default. OUT/IN-OUT is only in case of Stored Procedure.</P>
+
+<P><B>ManagedParameterImpl</B> Extends ParameterImpl. Expected to be integer or BigDecimal type, else exception is thrown. setValue() returns oldValue+1.</P>
+
+<P><B>CollisionParameter</B> Extends ParameterImpl. Design restricts setting value in CollisionParameter only once.</P>
+
+<P><B>Parameters</B> Maintains lists of parameters (used in SQL statements), IN/OUT parameters (used in stored procedures).</P>
+
+<P><B>ResultSetShape</B> This is an alternative to use ResultSetMetaData of the Query result. It can be used when some platforms like Oracle do not fully support MetaData. For a given SQL Query, this holds schemaName, tableName, columnName, SDO Column Type for each column in ResultSet. It has 2 constructors, one uses JDBC's ResultSetMetaData to form ResultSetShape and another uses DAS Config supplied ResultDescriptor to form ResultSetShape.</P>
+
+<P><B>Statement</B> Holds SQL String, JDBC connection, JDBC PreparedStatement and also state information whether the current statement is used by Pager.</P>
+
+<P><B>SDODataTypeHelper</B> Provides mapping between SDO's Type and JDBC's sql.Types.</P>
+
+<P><B>SDODataTypes</B> Uses SDO's TypeHelper to get SDO Type for given string.</P>
+
+<P><B>QualifiedColumn</B> Maintains schemaName, tableName and columnName for a Table's Column.</P>
+
+<P><B>RelationshipWrapper</B> Wrapper for DAS Config's &lt;Relationship&gt;. Only one method to return Collection of all FKColumns in a Relationship.</P>
+
+<P><B>TableWrapper</B> Wrapper on DAS Config's &lt;Table&gt;. Provides various get methods to get values of different elements and attributes within &lt;Table&gt;.</P>
+
+<P><B>ConfigUtil</B> Uses SDO's XMLHelper to load DAS Config Data Model in memory.</P>
+
+<P><B>DataObjectUtil</B> Provides utility methods for SDO DataObject like copying one DataObject into another, restoring Old Values of a DataObject using its SDO's ChangeSummary.</P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-ConfigurationSchema%28config.xsd%29"></A><A name="DASC%2B%2BArchitectureGuide-ConfigurationSchema%28config.xsd%29"></A> Configuration Schema(config.xsd)</H3>
+
+<P>Complete DAS Configuration follows.<BR>
+Convention <INS>Element</INS> &lt;attribute&gt; <EM>Child Element</EM></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <INS>Config</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;uri&gt; Not used <BR class="atl-forced-newline">
+&lt;dataObjectModel&gt; Needs a valid value when creating static DataObjects. <BR class="atl-forced-newline">
+&lt;databaseSchemaNameSupported&gt; when true, multiple database schema under same database are supported <BR class="atl-forced-newline">
+<EM>Command</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Table</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Relationship</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>ConnectionInfo</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>ConnectionInfo</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;dataSource&gt;complete URL of data source <BR class="atl-forced-newline">
+&lt;managedtx&gt;if true, DAS manages database transaction <BR class="atl-forced-newline">
+<EM>ConnectionProperties</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>ConnectionProperties</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;driverClass&gt;complete qualified class name <BR class="atl-forced-newline">
+&lt;databaseURL&gt;database URL <BR class="atl-forced-newline">
+&lt;username&gt; authentic database user <BR class="atl-forced-newline">
+&lt;password&gt; password for the user <BR class="atl-forced-newline">
+&lt;loginTimeout&gt;in milliseconds <BR class="atl-forced-newline">
+<INS>Command</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;name&gt; <BR class="atl-forced-newline">
+&lt;SQL kind&gt;Select/Update/Delete/Insert/procedure <BR class="atl-forced-newline">
+<EM>Parameter</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>ResultDescriptor</EM>&#45;0..n <BR class="atl-forced-newline">
+<INS>Parameter</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name (no meaning when Command kind is procedure) <BR class="atl-forced-newline">
+&lt;direction&gt;IN/OUT (OUT makes sense when Command kind is &quot;procedure&quot;) <BR class="atl-forced-newline">
+&lt;index&gt;used in set/getParameter() on Command based on direction (used when Command kind is procedure). <BR class="atl-forced-newline">
+<INS>ResultDescriptor</INS>&#45;&gt; Used as alternative to database result set metadata. <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name <BR class="atl-forced-newline">
+&lt;tableName&gt; database table name <BR class="atl-forced-newline">
+&lt;schemaName&gt; used when databaseSchemaNameSupported=true <BR class="atl-forced-newline">
+&lt;columnType&gt;SDO mapped data type <BR class="atl-forced-newline">
+<INS>Relationship</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;name&gt; <BR class="atl-forced-newline">
+&lt;primaryKeyTable&gt; <BR class="atl-forced-newline">
+&lt;foreignKeyTable&gt; <BR class="atl-forced-newline">
+&lt;many&gt; =true allows for 1:n relationship. If it is false, it's 1:1 relationship. <BR class="atl-forced-newline">
+&lt;keyRestricted&gt; In case of 1:1 relationship, if keyRestricted is not specified, the <BR class="atl-forced-newline">
+link (relationship) between the parent and child rows can be broken, by setting the <BR class="atl-forced-newline">
+parentKeyTable's row to null/deleting the row. Also, a different parent row can <BR class="atl-forced-newline">
+be associated to the child row, which has one pre-existing parent row association. <BR class="atl-forced-newline">
+If keyRestricted=true, this kind on change in existing relationship is not allowed, <BR class="atl-forced-newline">
+user will get exception 'Can not modify a one to one relationship that is key <BR class="atl-forced-newline">
+restricted'. <BR class="atl-forced-newline">
+<EM>KeyPair</EM>&#45;0..n <BR class="atl-forced-newline">
+<INS>KeyPair</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;PrimaryKeyColumn&gt;database table column name <BR class="atl-forced-newline">
+&lt;ForeignKeyColumn&gt;database table column name <BR class="atl-forced-newline">
+<INS>Table</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;tableName&gt;Database table name <BR class="atl-forced-newline">
+&lt;typeName&gt;Data Object type name <BR class="atl-forced-newline">
+&lt;schemaName&gt; used when databaseSchemaNameSupported=true <BR class="atl-forced-newline">
+<EM>Column</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Create</EM>&#45;0..1 <BR class="atl-forced-newline">
+<EM>Update</EM>&#45;0..1 <BR class="atl-forced-newline">
+<EM>Delete</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>Create</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; INSERT statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt;space separated column names used in explicit INSERT <BR class="atl-forced-newline">
+<INS>Update</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; UPDATE statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt; space separated column names used in explicit UPDATE <BR class="atl-forced-newline">
+<INS>Delete</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; DELETE statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt; space separated column names used in explicit DELETE <BR class="atl-forced-newline">
+<INS>Column</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name <BR class="atl-forced-newline">
+&lt;propertyName&gt; SDO data object's property name <BR class="atl-forced-newline">
+&lt;converterClassName&gt; if converter is used, this needs a valid class name <BR class="atl-forced-newline">
+&lt;primaryKey&gt;true if column is PK <BR class="atl-forced-newline">
+&lt;generated&gt; true if column value is database generated <BR class="atl-forced-newline">
+&lt;collision&gt; when true, during UPDATE statement generation, that column is <BR class="atl-forced-newline">
+included in the WHERE clause.(OCC feature) <BR class="atl-forced-newline">
+&lt;managed&gt; when true, during UPDATE statement generation, that column (needs <BR class="atl-forced-newline">
+to be BigDecimal) value is incremented by 1 and used in the SET clause in <BR class="atl-forced-newline">
+UPDATE. <BR class="atl-forced-newline">
+managed=true, is effective only when collision=true, else managed attribute value <BR class="atl-forced-newline">
+is ignored. </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASC%2B%2BArchitectureGuide-ScalabilityAspects"></A><A name="DASC%2B%2BArchitectureGuide-ScalabilityAspects"></A> Scalability Aspects</H3>
+
+<P>Java RDB DAS has exposed <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-UserInterface">User Interface</A>for end user. Other than that, from design perspective, many major DAS classes do not have associated interfaces and by design are tightly coupled with SDO and Database. It needs further enhancement on this line, especially when more DAS flavors are coming up as mentioned in <A href="https://cwiki.apache.org/confluence/pages/viewpage.action#DASC%252B%252BArchitectureGuide-Future">Future</A>. As DAS is a bridge between SOA based applications and backend Data Sources, the interfaces with SOA and Data Source need to be flexible. E.g. SDO/Some Other mechanism should be pluggable when using DAS as well as different technologies based Data Sources can be supported like XML files, LDAP based file system and so forth. Work is in-progress on this front.</P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-Future"></A><A name="DASC%2B%2BArchitectureGuide-Future"></A> Future</H3>
+
+<P>DAS is implemented in Java and C+&#43; and both are integrated with SDO and support Relational Database based Data Source. There are other flavors of DAS coming up like LDAP DAS, XQuery DAS etc. These implementations will provide different ways to interface with the backend data source as their names suggest.</P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-Samples"></A><A name="DASC%2B%2BArchitectureGuide-Samples"></A> Samples</H3>
+
+<P>There are a couple of samples distributed to demonstrate working examples of using different DAS features. See User Guide/Samples for more details.</P>
+
+<H3><A name="DASC%2B%2BArchitectureGuide-TerminologyandUsefulLinks"></A><A name="DASC%2B%2BArchitectureGuide-TerminologyandUsefulLinks"></A> Terminology and Useful Links</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> User Guide </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/RDB%20DAS%20-%20User%20Guide" class="external-link" rel="nofollow">Readme</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> Getting Started </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Starting%20with%20DAS" class="external-link" rel="nofollow">Readme</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3 </TD>
+<TD class="confluenceTd"> All Useful Links </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Java" class="external-link" rel="nofollow">Links</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-developer-guide.html b/site/trunk/site-publish/das-c-developer-guide.html
new file mode 100644
index 0000000000..f57142eae9
--- /dev/null
+++ b/site/trunk/site-publish/das-c-developer-guide.html
@@ -0,0 +1,240 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Developer Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69440">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Developer Guide">DAS C++ Developer Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="DASC%2B%2BDeveloperGuide-HowtogetinvolvedindevelopmentofC%5CRDBDAS%3F"></A>How to get involved in development of C+&#43; RDB DAS?</H3>
+
+<P>This document is the development guideline for C+&#43; RDB DAS project.</P>
+<UL>
+	<LI>General Guide</LI>
+	<LI>Getting Source code</LI>
+	<LI>Setting up your development environment</LI>
+	<LI>Importing DAS code and samples into your Development IDE</LI>
+	<LI>Testing</LI>
+	<LI>Reporting Issues and Providing patches</LI>
+</UL>
+
+
+<H3><A name="DASC%2B%2BDeveloperGuide-GeneralGuide"></A>General Guide</H3>
+
+<P>Welcome to the Tuscany RDB DAS C+&#43; subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>C+&#43; RDB DAS sub-project aims to provide enterprise-grade Data Access Service to help SOA applications using SDO have data updates with Database Data Source at backend.</LI>
+	<LI>C+&#43; RDB DAS provides feedback to Tuscany SDO  and Spec as it evolves.</LI>
+	<LI>The C+&#43; RDB DAS  provides flexibility in accessing data with explicit CRUD as well as using SDO  DataObjects.</LI>
+	<LI>The C+&#43; RDB DAS infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="DASC%2B%2BDeveloperGuide-GettingSourcecode"></A>Getting Source code</H3>
+
+<P>The C+&#43; RDB DAS project Subversion repository is located at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das</A> .<BR>
+The repository can also be viewed online at <A href="http://svn.apache.org/viewvc/incubator/tuscany/cpp/das" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/incubator/tuscany/cpp/das</A><BR>
+Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so.</P>
+
+<H3><A name="DASC%2B%2BDeveloperGuide-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H3>
+
+<P>Use the command as follows (note that it uses http scheme so if you're a committer change it to https):</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>svn checkout http://svn.apache.org/repos/asf/incubator/tuscany/cpp/das
+</PRE>
+</DIV></DIV>
+
+<H3><A name="DASC%2B%2BDeveloperGuide-CommittingChangestoSubversion"></A>Committing Changes to Subversion</H3>
+
+<P>Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.<BR>
+Once your password is set, you can use a command like this to commit:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>svn commit
+</PRE>
+</DIV></DIV>
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>svn --username &lt;name&gt; commit
+</PRE>
+</DIV></DIV>
+<P>Subversion will prompt you for a password, and once you've entered it, it will remember it for you. Note this is the password you configured with svnpasswd not your shell or other password.</P>
+
+<H3><A name="DASC%2B%2BDeveloperGuide-Buildtreestructure"></A>Build tree structure</H3>
+
+<P>The build tree is designed to facilitate modular development and releases. Maven modules are grouped by how they are released under a hierarchy. C+&#43; RDB DAS currently have the below module hierarchy :</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>-cpp
+ |-- das
+     |-- runtime               DAS Source         |-- source             DAS Core Source Code         |-- test                 DAS Test Cases Source Code
+     |-- samples              DAS Sample Applications     |-- VSExpress            DAS Visual Studio Express Project Files
+</PRE>
+</DIV></DIV>
+
+<H3><A name="DASC%2B%2BDeveloperGuide-BuildingtheRDBDASsourcecodeissimple"></A>Building the RDB DAS source code is simple</H3>
+
+<P><B>Prerequisites</B></P>
+
+<P>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; - Apache Ant with CppTasks and Ant-Contrib<BR>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; - Tuscany SDO latest version<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - Visual Studio Express (optional)<BR>
+&nbsp;</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>cd cpp/das
+ant
+</PRE>
+</DIV></DIV>
+<P>More details about downloading and installing DAS can be found at <A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/GettingStarted.html" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/GettingStarted.html</A></P>
+
+<H3><A name="DASC%2B%2BDeveloperGuide-DevelopingRDBDASusingVisualStudioExpressIDE"></A>Developing RDB DAS using Visual Studio Express IDE</H3>
+
+<P>There is a VS solution file under cpp/das/VSExpress/tuscany_das/ that contains all configuration necessary to start developing DAS C+&#43; with your Visual Studio Express.</P>
+<H3><A name="DASC%2B%2BDeveloperGuide-Testing"></A>Testing</H3>
+
+<P>All commits are expected to be accompanied by test cases execution. Test cases should verify specific behavior relating to a single class or small set of related classes; integration tests verify code paths across subsystems. Test cases should be documented and clearly indicate what they verify. Also, avoid things that may cause side-effects when possible such as access of external resources. Test cases source code can be found at cpp/das/runtime/test/src/.</P>
+
+
+<H3><A name="DASC%2B%2BDeveloperGuide-Reportingissuesandprovidingpatches"></A>Reporting issues and providing patches</H3>
+
+<P><B>Issue Tracking</B></P>
+
+<P>Tuscany bug reports are handled via a <A href="https://issues.apache.org/jira/browse/TUSCANY" class="external-link" rel="nofollow">JIRA</A> issues list. Please use this list to report any bugs and track their status.</P>
+
+<P><B>Reporting an Issue</B></P>
+
+<P>Please search JIRA to see if the problem has already been reported. If it has not, please create a new JIRA issue. To help developers quickly resolve an issue, include as much information with your report as possible such as your platform, version numbers, error logs, configuration, steps to reproduce the problem, etc. Also, if possible, please include a testcase that demonstrates the problem.<BR>
+Thanks for working with us to improve Apache Tuscany.</P>
+
+<P><B>Submitting a Patch</B></P>
+
+<P>To submit a patch, create an issue in JIRA that describes the problem and attach your patch file. Please include detailed steps to reproduce the problem in the issue description. Providing test cases in the patch will help us verify and apply it quicker. To create a patch, follow the steps below:</P>
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include testcases where possible</LI>
+	<LI>Generate the patch using svn diff File &gt; patchfile</LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue<BR>
+Once you have submitted the patch it will be picked up for review.</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-documentation-menu.html b/site/trunk/site-publish/das-c-documentation-menu.html
new file mode 100644
index 0000000000..b9fce97858
--- /dev/null
+++ b/site/trunk/site-publish/das-c-documentation-menu.html
@@ -0,0 +1,134 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56574">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="DASC%2B%2BDocumentationMenu-DASCDocumentation"></A>DAS C++ Documentation</H1>
+<P>This page provides guides to all available Tuscany DAS implementations in Java.</P>
+
+<UL>
+	<LI><A href="das-c-architecture-guide.html" title="DAS C++ Architecture Guide">DAS C++ Architecture</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-found-a-bug.html b/site/trunk/site-publish/das-c-found-a-bug.html
new file mode 100644
index 0000000000..fa8a6466a1
--- /dev/null
+++ b/site/trunk/site-publish/das-c-found-a-bug.html
@@ -0,0 +1,155 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Found A Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56569">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Found A Bug">DAS C++ Found A Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="DASC%2B%2BFoundABug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="DASC%2B%2BFoundABug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="DASC%2B%2BFoundABug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="DASC%2B%2BFoundABug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-get-involved.html b/site/trunk/site-publish/das-c-get-involved.html
new file mode 100644
index 0000000000..a0cab7b0da
--- /dev/null
+++ b/site/trunk/site-publish/das-c-get-involved.html
@@ -0,0 +1,228 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56568">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Get Involved">DAS C++ Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="DASC%2B%2BGetInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="DASC%2B%2BGetInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-releases.html b/site/trunk/site-publish/das-c-releases.html
new file mode 100644
index 0000000000..f3e6b731f5
--- /dev/null
+++ b/site/trunk/site-publish/das-c-releases.html
@@ -0,0 +1,130 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56571">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Releases">DAS C++ Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="DASC%2B%2BReleases-DASC"></A>DAS C++</H1>
+
+<P>An Apache release of DAS C++ is not available yet. You can build a DAS C++ from the trunk.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c-subproject-menu.html b/site/trunk/site-publish/das-c-subproject-menu.html
new file mode 100644
index 0000000000..d0a1551647
--- /dev/null
+++ b/site/trunk/site-publish/das-c-subproject-menu.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++ Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56223">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++ Subproject Menu">DAS C++ Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG b/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG
new file mode 100644
index 0000000000..1402f3b8f5
--- /dev/null
+++ b/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG
diff --git a/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG.jpeg b/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG.jpeg
new file mode 100644
index 0000000000..d8256c11a8
--- /dev/null
+++ b/site/trunk/site-publish/das-c.data/das graph as I suppose it shoud be.JPG.jpeg
diff --git a/site/trunk/site-publish/das-c.data/das_graph.JPG b/site/trunk/site-publish/das-c.data/das_graph.JPG
new file mode 100644
index 0000000000..c5a3a06df2
--- /dev/null
+++ b/site/trunk/site-publish/das-c.data/das_graph.JPG
diff --git a/site/trunk/site-publish/das-c.data/das_graph.JPG.jpeg b/site/trunk/site-publish/das-c.data/das_graph.JPG.jpeg
new file mode 100644
index 0000000000..814cad6825
--- /dev/null
+++ b/site/trunk/site-publish/das-c.data/das_graph.JPG.jpeg
diff --git a/site/trunk/site-publish/das-c.html b/site/trunk/site-publish/das-c.html
new file mode 100644
index 0000000000..58b2f47428
--- /dev/null
+++ b/site/trunk/site-publish/das-c.html
@@ -0,0 +1,132 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS C++</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56566">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="DAS C++">DAS C++</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="DASC%2B%2B-DASC"></A>DAS C++</H1>
+
+<P>RDB DAS is the only DAS avaialable under C++ at the momemnt. This work is in progress. The code is available on the trunk and an official release is not yet available.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-cplus-menu.html b/site/trunk/site-publish/das-cplus-menu.html
new file mode 100644
index 0000000000..c70928beb6
--- /dev/null
+++ b/site/trunk/site-publish/das-cplus-menu.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS CPlus Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54975">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS CPlus Menu">DAS CPlus Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20Lite%20C%2B%2B&linkCreation=true&fromPageId=54975" class="createlink">DAS Lite C++</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-documentation-menu.html b/site/trunk/site-publish/das-documentation-menu.html
new file mode 100644
index 0000000000..68be8ec291
--- /dev/null
+++ b/site/trunk/site-publish/das-documentation-menu.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Documentation Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56321">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Tuscany Downloads &amp; Documentations</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Documentation Menu">DAS Documentation Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-downloads.html b/site/trunk/site-publish/das-downloads.html
new file mode 100644
index 0000000000..08a711b36f
--- /dev/null
+++ b/site/trunk/site-publish/das-downloads.html
@@ -0,0 +1,333 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Downloads</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=49423">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Downloads">DAS Downloads</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="DASDownloads-DASReleasesDownloads"></A>DAS Releases Downloads</H1>
+
+<P>Learn more about <A href="das-java-release-contents.html" title="DAS Java Release Contents">content of each release </A>.</P>
+
+<H2><A name="DASDownloads-IncubatingBeta2%28Oct.06%2C2007%29"></A>Incubating-Beta2 (Oct. 06, 2007)</H2>
+
+<TABLE border="0" width="100%" bgcolor="#f7f7f7">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+						<TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64" height="33"><FONT face="Gourmand" size="-2">Linux </FONT></TD>
+						<TD align="center" height="33" width="290">RDB DAS Binary </TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz">das-1.0-incubating-beta2-bin.tar.gz</A></TD> </A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.md5">MD5</A></TD><TD align="center" width="7%" height="33"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux</FONT></TD>
+						<TD align="center" width="290">RDB DAS Source</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz">das-1.0-incubating-beta2-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.asc">PGP</A></TD>
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows</FONT></TD>
+						<TD align="center" height="33" width="290">RDB DAS Binary </TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip">das-1.0-incubating-beta2-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows</FONT></TD>
+						<TD align="center" width="290">RDB DAS Source</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip">das-1.0-incubating-beta2-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.asc">PGP</A></TD>
+					</TR>
+
+				</TBODY>
+			</TABLE>
+
+
+
+
+<H2><A name="DASDownloads-IncubatingBeta1%28Aug.21st%2C2007%29"></A>Incubating-Beta1 (Aug. 21st, 2007)</H2>
+
+<TABLE border="0" width="100%" bgcolor="#f7f7f7">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+						<TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64" height="33"><FONT face="Gourmand" size="-2">Linux </FONT></TD>
+						<TD align="center" height="33" width="290">RDB DAS Binary </TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz">das-1.0-incubating-beta1-bin.tar.gz</A></TD> </A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz.md5">MD5</A></TD><TD align="center" width="7%" height="33"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux</FONT></TD>
+						<TD align="center" width="290">RDB DAS Source</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz">das-1.0-incubating-beta1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows</FONT></TD>
+						<TD align="center" height="33" width="290">RDB DAS Binary </TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip">das-1.0-incubating-beta1-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows</FONT></TD>
+						<TD align="center" width="290">RDB DAS Source</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip">das-1.0-incubating-beta1-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+					</TR>
+
+				</TBODY>
+			</TABLE>
+
+
+<H2><A name="DASDownloads-IncubatingM2%28Nov20th%2C2006%29"></A>Incubating-M2 (Nov 20th, 2006)</H2>
+
+
+<TABLE border="0" width="100%" bgcolor="#f7f7f7">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+						<TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64" height="33"><FONT face="Gourmand" size="-2">Linux<BR>
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany M2 DAS Implementation </TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz">das-1.0-incubator-M2-bin.tar.gz</A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD><TD align="center" width="7%" height="33"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64" height="33"><FONT face="Gourmand" size="-2">Linux<BR>
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany M2 DAS Samples</TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz">das-samples-1.0-incubator-M2-bin.tar.gz</A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="7%" height="33"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 DAS Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz">das-1.0-incubator-M2-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany M2 DAS Implementation </TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip">das-1.0-incubator-M2-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany M2 DAS Samples</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip">das-samples-1.0-incubator-M2-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 DAS Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip">das-1.0-incubator-M2-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+
+
+
+<H2><A name="DASDownloads-IncubatingM1%28June7th%2C2006%29"></A>Incubating-M1 (June 7th, 2006)</H2>
+
+
+<TABLE border="0" width="100%" bgcolor="#f7f7f7">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+						<TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Binary</FONT></TD>
+						<TD align="center" width="287">Tuscany M1 DAS</TD>
+						<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz">tuscany-incubating-M1.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="287">Tuscany M1 DAS</TD>
+						<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz">tuscany-incubating-M1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows<BR>
+						Binary</FONT></TD>
+						<TD align="center" width="287">Tuscany M1 DAS</TD>
+						<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip">tuscany-incubating-M1.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5">MD5</A></TD>
+						<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc">PGP</A></TD>
+
+
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+						<TD align="center" width="287">Tuscany M1 DAS</TD>
+						<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip">tuscany-incubating-M1-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+					</TR>
+				</TBODY>
+			</TABLE>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-faq.html b/site/trunk/site-publish/das-faq.html
new file mode 100644
index 0000000000..cf9fc29c1f
--- /dev/null
+++ b/site/trunk/site-publish/das-faq.html
@@ -0,0 +1,120 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35051">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="das.html" title="DAS">DAS</A>&nbsp;&gt;&nbsp;<A href="" title="DAS FAQ">DAS FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DASFAQ-TuscanyDASFrequentlyAskedQuestions"></A>Tuscany DAS - Frequently Asked Questions</H3>
+
+<P><B>Is DAS Thread safe ?</B><BR>
+DAS design should support thread safety, but we have done no explicit testing on this area.<BR>
+Initializing a DAS and using across multiple DAS calls should be OK and safe as long as you are using the same config file. I'd recommend initializing the DAS in a sync method tough.</P>
+
+
+<P><B>I'm getting &quot;Feature 'Config' not found.&quot; after migrating my application for after M2 codebase.</B><BR>
+There was a change (see <A href="http://issues.apache.org/jira/browse/TUSCANY-899" class="external-link" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-899</A>). To fix this, changed the attribute &quot;xmlns&quot;'s value of the &quot;config&quot; tag to &quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-general-menu.html b/site/trunk/site-publish/das-general-menu.html
new file mode 100644
index 0000000000..05aa1fc36d
--- /dev/null
+++ b/site/trunk/site-publish/das-general-menu.html
@@ -0,0 +1,116 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS General Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54961">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="DAS General Menu">DAS General Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-beta1.html b/site/trunk/site-publish/das-java-beta1.html
new file mode 100644
index 0000000000..b0c1b65b00
--- /dev/null
+++ b/site/trunk/site-publish/das-java-beta1.html
@@ -0,0 +1,171 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Beta1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68167">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Beta1">DAS Java Beta1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DASJavaBeta1-DASJavaBeta1Release%28Aug.21st%2C2007%29"></A>DAS Java Beta1 Release (Aug. 21st, 2007)</H3>
+
+<P>What's new in Apache Tuscany DAS beta1?</P>
+
+<UL>
+	<LI>Support for J2SE connections in DAS config using Driver Manager.</LI>
+	<LI>Added support for multiple database schemas in queries</LI>
+	<LI>Enhanced Optimistic Concurrency Control with overqualified updates</LI>
+	<LI>Multiple enhancements around ApplyChanges API</LI>
+	<LI>Enhanced support for MySQL</LI>
+	<LI>Enhanced Documentation: User, Developer and Architect guides as well as javadocs</LI>
+	<LI>Enhanced and new sample applications</LI>
+</UL>
+
+
+<H3><A name="DASJavaBeta1-DownloadDASJavaBeta1"></A>Download DAS Java Beta1</H3>
+
+<H3><A name="DASJavaBeta1-Windows"></A>Windows</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta1-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaBeta1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta1-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta1/tuscany-das-1.0-incubating-beta1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-beta2.html b/site/trunk/site-publish/das-java-beta2.html
new file mode 100644
index 0000000000..64e17cc34d
--- /dev/null
+++ b/site/trunk/site-publish/das-java-beta2.html
@@ -0,0 +1,191 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Beta2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68170">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Beta2">DAS Java Beta2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DASJavaBeta2-DASJavaBeta2Release%28Oct.06%2C2007%29"></A>DAS Java Beta2 Release (Oct. 06, 2007)</H3>
+
+<P>What's new in Apache Tuscany DAS beta2?</P>
+
+<P>   The main purpose of the DAS beta2 release is to fix incompatibilities that were found with SDO 1.0 release.</P>
+
+<P>   The following JIRAs also were fixed on DAS beta2</P>
+
+<UL>
+	<LI>TUSCANY-986  - DAS integration with SDO 2.1 APIs</LI>
+	<LI>TUSCANY-961  - DAS: Using deprected SDO method causes Type lookup failure</LI>
+	<LI>TUSCANY-1353 - Exception attempting to insert rows using DAS w/DataDirect JDBC driver</LI>
+	<LI>TUSCANY-1453 - DAS can't read or write the blob field</LI>
+	<LI>TUSCANY-1463 - Support for Clob and Array fields</LI>
+	<LI>TUSCANY-1462 - Consistent use of Parameters in Config</LI>
+	<LI>TUSCANY-1464 - Wrong query results when SELECT misses PKs</LI>
+	<LI>TUSCANY-1465 - Allow passing ResultDescriptor for dynamic Commands</LI>
+	<LI>TUSCANY-1720 - Modify sample readmes for - steps to run sample with other databases</LI>
+</UL>
+
+
+
+<H3><A name="DASJavaBeta2-DownloadDASJavaBeta2"></A>Download DAS Java Beta2</H3>
+
+<H3><A name="DASJavaBeta2-Windows"></A>Windows</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaBeta2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651096; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="97d8df14"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651096/0/97d8df14/1/" alt="free html hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg b/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg
new file mode 100644
index 0000000000..1a7c90023c
--- /dev/null
+++ b/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg
diff --git a/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg.jpeg b/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg.jpeg
new file mode 100644
index 0000000000..5a5552a160
--- /dev/null
+++ b/site/trunk/site-publish/das-java-developer-guide.data/das_class_diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/das-java-developer-guide.html b/site/trunk/site-publish/das-java-developer-guide.html
new file mode 100644
index 0000000000..19c8b06790
--- /dev/null
+++ b/site/trunk/site-publish/das-java-developer-guide.html
@@ -0,0 +1,332 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Developer Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45092">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Developer Guide">DAS Java Developer Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="DASJavaDeveloperGuide-HowtogetinvolvedindevelopmentofJavaRDBDAS%3F"></A>How to get involved in development of Java RDB DAS?</H3>
+<P>This document is the development guideline for RDB DAS Java project. </P>
+<UL>
+	<LI>General Guide</LI>
+	<LI>Getting Source code</LI>
+	<LI>Setting up your development environment</LI>
+	<LI>Importing DAS code and samples into your Development IDE</LI>
+	<LI>Coding Guidelines</LI>
+	<LI>Testing</LI>
+	<LI>Maven Build Structure</LI>
+	<LI>Reporting Issues and Providing patches</LI>
+</UL>
+
+
+<H3><A name="DASJavaDeveloperGuide-GeneralGuide"></A>General Guide</H3>
+<P>Welcome to the Tuscany RDB DAS Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+
+<UL>
+	<LI>Java RDB DAS sub-project aims to provide enterprise-grade Data Access Service to help SOA applications using SDO have data updates with Database Data Source at backend.</LI>
+	<LI>Java RDB DAS provides feedback to Tuscany SDO  and Spec as it evolves.</LI>
+	<LI>The Java RDB DAS  provides flexibility in accessing data with explicit CRUD as well as using SDO  DataObjects.</LI>
+	<LI>The Java RDB DAS infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="DASJavaDeveloperGuide-GettingSourcecode"></A>Getting Source code</H3>
+<P>The Java RDB DAS project Subversion repository is located at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das</A> .<BR>
+The repository can also be viewed online at <A href="http://svn.apache.org/viewvc/incubator/tuscany/java/das" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/incubator/tuscany/java/das</A> <BR>
+Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so.</P>
+
+<H3><A name="DASJavaDeveloperGuide-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H3>
+<P>Use the command as follows (note that it uses http scheme so if you're a committer change it to https):</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> svn checkout http://svn.apache.org/repos/asf/incubator/tuscany/java/das </PRE>
+</DIV></DIV>
+
+<H3><A name="DASJavaDeveloperGuide-CommittingChangestoSubversion"></A>Committing Changes to Subversion</H3>
+<P>Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.<BR>
+Once your password is set, you can use a command like this to commit:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> svn commit </PRE>
+</DIV></DIV>
+
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> svn --username &lt;name&gt; commit </PRE>
+</DIV></DIV>
+
+<P>Subversion will prompt you for a password, and once you've entered it, it will remember it for you. Note this is the password you configured with svnpasswd not your shell or other password.</P>
+
+<H3><A name="DASJavaDeveloperGuide-SettingupyourDevelopmentEnvironment"></A>Setting up your Development Environment</H3>
+
+<P><B>Prerequisites</B></P>
+
+<P>Java RDB DAS requires the following:</P>
+<UL>
+	<LI>JDK 5.0+ (J2SE 1.5.0+)</LI>
+	<LI>Apache Maven (2.0.4+)</LI>
+	<LI>Subversion (1.2+)</LI>
+</UL>
+
+
+<H3><A name="DASJavaDeveloperGuide-Buildtreestructure"></A>Build tree structure</H3>
+
+<P>The build tree is designed to facilitate modular development and releases. Maven modules are grouped by how they are released under a hierarchy. Java RDB DAS currently have the below module hierarchy :</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>-java
+ |-- das
+     |-- distribution         DAS distributions
+     |-- rdb                	 DAS Core Source
+     |-- samples              DAS Web, J2SE Sample Applications
+</PRE>
+</DIV></DIV>
+
+<P>The individual modules can be built separately or build with top-down build.</P>
+
+<P><B>top-down build (recommended approach)</B></P>
+
+<P>Check out all of the java source code.</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>svn checkout http://svn.apache.org/repos/asf/incubator/tuscany/java </PRE>
+</DIV></DIV>
+
+<P>Building the RDB DAS source code is simple</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>cd java/das
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>It should work irrespective of whether you have an empty Maven local repository. This assumes that maven is able to retrieve a SNAPSHOT version of SDO (and of course the rest of software that RDB DAS depends on) as we do not build anything other than RDB DAS here.</P>
+
+<P>There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.<BR>
+Once you have done a top-down build, and your local maven repository is populated, you can start using the maven off line option to speed up the build process</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> mvn -o  </PRE>
+</DIV></DIV>
+
+<H3><A name="DASJavaDeveloperGuide-ImportingRDBDASintoyourDevelopmentIDE"></A>Importing RDB DAS into your Development IDE</H3>
+
+<P><B>Using Eclipse</B></P>
+
+<P>If this is the first time you are using your workspace with maven m2 local repository, you will need to tell your Eclipse workspace the location of the directory, and you can do this with the following command :</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> mvn -Declipse.workspace=[path-to-eclipse-workspace] eclipse:add-maven-rep </PRE>
+</DIV></DIV>
+
+<P>In order to generate the necessary project files to import the SCA modules to Eclipse, you can use the maven eclipse plugin</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>cd java/das
+mvn -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then select the base DAS directory (e.g java/das) and then press Finish, this should import all DAS core and Samples into your Eclipse Workspace.</P>
+
+<H3><A name="DASJavaDeveloperGuide-CodingGuidelines"></A>Coding Guidelines</H3>
+<P>There are a few simple guidelines when developing for JAVA DAS:</P>
+<UL>
+	<LI>Formatting standards are defined by the .checkstyle and .pmd configurations in the source repository. Please be sure to check code is formatted properly before doing a checkin (see below). If you are unfamiliar with Checkstyle or PMD, please see <A href="http://checkstyle.sourceforge.net/" class="external-link" rel="nofollow">http://checkstyle.sourceforge.net/</A>  and <A href="http://pmd.sourceforge.net/" class="external-link" rel="nofollow">http://pmd.sourceforge.net/</A> . Consistent formatting makes it easier for others to follow and allows diffs to work properly.</LI>
+	<LI>Always include the Apache License Headers on all files and the following version tag:
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> @version $Rev$ $Date$ </PRE>
+</DIV></DIV></LI>
+	<LI>Please attempt to accompany code with at least unit tests or verify it by existing tests before submitting a patch or checking in.</LI>
+	<LI>Do not checkin IDE-specific resources such as project files.</LI>
+	<LI>Prior to check-in, perform a clean build and run the complete battery of unit tests for the current module from the command line with Checkstyle enabled, as in:</LI>
+</UL>
+
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>mvn clean
+mvn -o -Psourcecheck
+</PRE>
+</DIV></DIV>
+
+<UL>
+	<LI>Please do not perform a checkin using an IDE as doing so is frequently problematic.</LI>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<P><B>Naming conventions to increase consistency</B><BR>
+<B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL>
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. </P>
+
+<H3><A name="DASJavaDeveloperGuide-Testing"></A>Testing</H3>
+<P>All commits are expected to be accompanied by unit test and integration tests when appropriate. Unit tests should verify specific behavior relating to a single class or small set of related classes; integration tests verify code paths across subsystems. Testcases should be documented and clearly indicate what they verify. Also, avoid things that may cause side-effects when possible such as access of external resources.<BR>
+Tuscany uses plain junit test cases to perform unit and integration testing. Web Samples use htmlunit Test cases to verify the expected behavior.  <BR>
+Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a **/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="DASJavaDeveloperGuide-MavenBuildStructure"></A>Maven Build Structure</H3>
+<P>We use the term Module to refer to the leaf of maven tree.</P>
+<UL>
+	<LI>das/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.das</LI>
+	<LI>Version of our modules will be specified once in java/das/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany DAS</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn -Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H3><A name="DASJavaDeveloperGuide-Reportingissuesandprovidingpatches"></A>Reporting issues and providing patches</H3>
+
+<P><B>Issue Tracking</B></P>
+
+<P>Tuscany bug reports are handled via a <A href="https://issues.apache.org/jira/browse/TUSCANY" class="external-link" rel="nofollow">JIRA</A>  issues list. Please use this list to report any bugs and track their status.</P>
+
+<P><B>Reporting an Issue</B></P>
+
+<P>Please search JIRA to see if the problem has already been reported. If it has not, please create a new JIRA issue. To help developers quickly resolve an issue, include as much information with your report as possible such as your platform, version numbers, error logs, configuration, steps to reproduce the problem, etc. Also, if possible, please include a testcase that demonstrates the problem. <BR>
+Thanks for working with us to improve Apache Tuscany.</P>
+
+<P><B>Submitting a Patch</B></P>
+
+<P>To submit a patch, create an issue in JIRA that describes the problem and attach your patch file. Please include detailed steps to reproduce the problem in the issue description. Providing test cases in the patch will help us verify and apply it quicker. To create a patch, follow the steps below:</P>
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include testcases where possible</LI>
+	<LI>Generate the patch using svn diff File &gt; patchfile</LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue<BR>
+Once you have submitted the patch it will be picked up for review.</LI>
+</UL>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-documentation-menu.html b/site/trunk/site-publish/das-java-documentation-menu.html
new file mode 100644
index 0000000000..2205f64416
--- /dev/null
+++ b/site/trunk/site-publish/das-java-documentation-menu.html
@@ -0,0 +1,183 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56517">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="DASJavaDocumentationMenu-DASJavaDocumentation"></A>DAS Java Documentation</H1>
+<P>This page provides guides to all available Tuscany DAS implementations in Java.</P>
+
+<H2><A name="DASJavaDocumentationMenu-RelationalDatabaseDataAccessService%28RDBDAS%29"></A>Relational Database Data Access Service (RDB DAS)</H2>
+
+<UL>
+	<LI><A href="rdb-das-java.html" title="RDB DAS Java">what is RDB DAS?</A><BR>
+A quick view of what is RDB DAS.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="starting-with-das.html" title="Starting with DAS">Getting Started with DAS </A><BR>
+A walk through of an example of how to use RDB DAS.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+This introduces you to RDB DAS features and provides 'how to' examples.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="rdb-das-architecture-guide.html" title="RDB DAS architecture guide">Architecture Guide </A><BR>
+This gives high level overview of RDB DAS architecture.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="rdb-das-transaction-control.html" title="RDB DAS - Transaction Control">Transaction Control </A><BR>
+This gives details of transaction control in RDB DAS.</LI>
+</UL>
+
+
+<H2><A name="DASJavaDocumentationMenu-LDAPDAS"></A>LDAP DAS</H2>
+<UL>
+	<LI><A href="ldap-das-architecture-guide.html" title="LDAP DAS Architecture Guide">Architecture Guide </A></LI>
+</UL>
+
+
+<H2><A name="DASJavaDocumentationMenu-GettingInvovledWithDASProject"></A>Getting Invovled With DAS Project</H2>
+
+<UL>
+	<LI><A href="das-release-process.html" title="DAS Release Process">Guide to release managing a DAS Release </A><BR>
+Step by step guide for releasing a DAS Project.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A><BR>
+If you would like to contribute to the project, this guide explains how to build Java DAS and how to contribute code back to the project.</LI>
+</UL>
+
+
+</TD></TR></TBODY></TABLE>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-faq.html b/site/trunk/site-publish/das-java-faq.html
new file mode 100644
index 0000000000..d6ab185c7f
--- /dev/null
+++ b/site/trunk/site-publish/das-java-faq.html
@@ -0,0 +1,313 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java - FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50994">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java - FAQ">DAS Java - FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P>Welcome to the Apache Tuscany Java DAS RDB FAQ page. Please help to keep the information on this page current.</P>
+
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany RDB DAS Frequently Asked Questions</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#DASJava-FAQ-RDBDASthreadsafety">RDB DAS thread safety</A></LI>
+	<LI><A href="#DASJava-FAQ-MigrationfromM2">Migration from M2</A></LI>
+	<LI><A href="#DASJava-FAQ-transactionmanagement">Handling internal/external transaction management</A></LI>
+	<LI><A href="#DASJava-FAQ-handlingparent%252Fchildrelationship">Handling parent/child relationship</A></LI>
+	<LI><A href="#DASJava-FAQ-mapping">How does DAS handle mapping between DataGraph properties and Database Metadata like table name, column name etc. during disconnected processing </A></LI>
+	<LI><A href="#DASJava-FAQ-noPKdefined">no PK defined </A></LI>
+	<LI><A href="#DASJava-FAQ-RDBDASsupportforgeneratedkeys">RDB DAS support for generated keys</A></LI>
+	<LI><A href="#DASJava-FAQ-HowDASworkswithDataobjects">How DAS works with Dataobjects</A></LI>
+	<LI><A href="#DASJava-FAQ-OptimisticConcurrencyControl">What is Optimistic Concurrency Control?</A></LI>
+	<LI><A href="#DASJava-FAQ-keyRestricted">What is the purpose of many and keyRestricted attributes in Relationship?</A></LI>
+	<LI><A href="#DASJava-FAQ-paging">what is paging capability?</A></LI>
+	<LI><A href="#DASJava-FAQ-ResultSet">Example to define the ResultSet shape Definition for a join in DAS</A></LI>
+	<LI><A href="#DASJava-FAQ-blob">Does RDB DAS support datatypes like Blob?</A></LI>
+	<LI><A href="#DASJava-FAQ-namedParams">Does DAS support named parameters passing?</A>
+<BR class="atl-forced-newline">
+&nbsp;</LI>
+</UL>
+</DIV></DIV>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-RDBDASthreadsafety"></A><DIV class="" style="background-color: #C3CDA1;">RDB DAS thread safety</DIV>
+</H2>
+<P>DAS design should support thread safety, but we have done no explicit testing on this area.<BR>
+Initializing a DAS and using across multiple DAS calls should be OK and safe as long as you are using the same config file. I'd recommend initializing the DAS in a sync method tough.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-MigrationfromM2"></A><DIV class="" style="background-color: #C3CDA1;">Migration from M2</DIV>
+</H2>
+<P>I'm getting &quot;Feature 'Config' not found.&quot; after migrating my application for after M2 codebase.</P>
+
+<P>There was a change (see <A href="http://issues.apache.org/jira/browse/TUSCANY-899" class="external-link" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-899</A>). To fix this, changed the attribute &quot;xmlns&quot;'s value of the &quot;config&quot; tag to &quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;. </P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-transactionmanagement"></A><DIV class="" style="background-color: #C3CDA1;">Handling internal/external transaction management</DIV>
+</H2>
+
+<P>In DAS Config, element ConnectionInfo has a boolean attribute managedtx (default true). <BR>
+If it is true, DAS runtime manages transaction otherwise the caller is supposed to manage<BR>
+transaction.<BR>
+In cases, when the connection is externally passed (config file does not specify ConnectionInfo),<BR>
+the managedtx attribute default value ( true) is assumed.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-handlingparent%2Fchildrelationship"></A><DIV class="" style="background-color: #C3CDA1;">Handling parent/child relationship</DIV>
+</H2>
+<P><B>Question:</B> If two tables have a parent-child relationship but the query result set contains only columns from one table, does RDB DAS result DataGraph contain data from both parent and child table?</P>
+
+<P>The RDB DAS will only populate a graph with data returned from the used query. If you want a <BR>
+graph that contains data from related tables then the query provided must return that data <BR>
+(typically a join). The relationship tests in the test suite demonstrate this.</P>
+
+<P><B>Question:</B> If two tables have a parent-child relationship and the query result set contains columns from both tables, is the relationship analyzed by DAS when, </P>
+<OL>
+	<LI>DAS Config explicitly defines relationship</LI>
+	<LI>DAS Config does not explicitly define relationship?</LI>
+</OL>
+
+
+<P>DAS supports some Convention over Configuration when it comes to supporting implied relationships.<BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/ForeignKeyRepresentationAndManagement" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ForeignKeyRepresentationAndManagement</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithRelationships" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithRelationships</A><BR>
+Also, see test: ImpliedRelationshipTests.testAddNewOrder() </P>
+
+<P>So, in summary, if the query has a where clause specifying the relationship, there is no need to <BR>
+have any relationship definition in config file as long as the column names (PK, FK) follow the<BR>
+naming conventions. </P>
+
+<P>In the absence of naming conventions, the relationship needs to be explicitly defined in the config,<BR>
+so that the query result is mapped against it and the necessary result DataGraph is represented <BR>
+reflecting the relationship.</P>
+
+<P><B>Question:</B> When there is 1:n relationship between 2 tables, say Department:Employee, and there is a DataGraph with this relationship present, can one Employee DataObject from this graph be associated with 2 different Department DataObjects, using DAS Java Client? i.e. can 1:n relationship be changed to n:n using SDO?_</P>
+
+<P>No, when this is attempted, SDO maintains referential integrity. e.g.<BR>
+If you have a dept1 with emp1 and then execute:<BR>
+   dep2.getEmployees.add(emp1)<BR>
+the graph will automatically remove emp1 from dep1's list of employees and<BR>
+you are left with valid 1:m relationship.</P>
+
+<P><B>Question:</B> In case of parent-child relationship, how to traverse back and forth?</P>
+
+<P>If by Convention over Configuration/from DAS Config there is a name to a relationship, the opposite relationship is named with _opposite appended to it.</P>
+
+<P>e.g. Consider two tables (CUSTOMER, ORDER) each with a PK named &quot;ID&quot;. Also, ORDER has a FK named CUSTOMER_ID. The DAS recognizes this convention and assumes a one:many relationship between CUSTOMER and ORDER. In the fully dynamic case, a read of CUSTOMER and ORDER tables using a join will result in a graph of CUSTOMER DataObjects along with their related ORDERS.(name of relationship is ORDERS now.) </P>
+
+<P>The property for the CUSTOMER Types list of ORDERs is named &quot;ORDER&quot; so:<BR>
+  DataObject order = cust.getDataObject(&quot;ORDER<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=50994" class="createlink">1</A>&quot;);<BR>
+The name of the property in the ORDER Type that references the parent CUSTOMER, is <BR>
+  DataObject cust = order.getDataObject(&quot;CUSTOMER_opposite&quot;)</P>
+
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-mapping"></A><DIV class="" style="background-color: #C3CDA1;">How does DAS handle mapping between DataGraph properties and Database Metadata like table name, column name etc. during disconnected processing. </DIV>
+</H2>
+
+<P>DAS supports this mapping using DAS Config and in the absence of that using Convention over Configuration.<BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration</A>. DataObject graph<BR>
+change summary contains old as well as modified values. Using this change summary and config/conventions DAS can support the necessary mapping. </P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-noPKdefined"></A><DIV class="" style="background-color: #C3CDA1;">no PK defined </DIV>
+</H2>
+<P>Does DAS support working with tables that have no PK defined?</P>
+
+<P>DAS mandates PK for any table, either specified in DAS Config or by following convention. In absence <BR>
+of both of these, DAS throws an error. Having PK ensures uniqueness of Data Object - returned as query result.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-RDBDASsupportforgeneratedkeys"></A><DIV class="" style="background-color: #C3CDA1;">RDB DAS support for generated keys </DIV>
+</H2>
+
+<P>This is supported for INSERT operation - either explicit insert (SQL INSERT statement as DAS command) or generated insert. <BR>
+In case of generated insert, the DAS config needs to have Column element having attribute &quot;generated&quot; set to &quot;true&quot;. This attribute is not needed in case of explicit insert.<BR>
+In case of generated insert, &quot;generated&quot; attribute from Column element in Config is checked to form the appropriate insert statement. The jdbc supported PreparedStatement.getGeneratedKeys() is used to fetch the values being generated by the database. In case of generated insert, the value thus returned is set in DataGraph.</P>
+
+<P>New boolean attribute added in Config - &quot;generatedKeysSupported&quot;. User can set true/false for this in Config. If not set in Config, JDBC Metadata API check supportsGetGeneratedKeys() is done to detect whether to use auto generated keys during INSERT. </P>
+
+<P>Note: For Derby, always assumed generatedKeysSupported=TRUE. This is because current Derby API return FALSE for supportsGetGeneratedKeys(), as it is partially implemented, but in DAS context, this support is sufficient.</P>
+
+<P>This gived user flexibility to turn on/off support for database generated keys during INSERT based on the<BR>
+database vendor/driver version in use.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-HowDASworkswithDataobjects"></A><DIV class="" style="background-color: #C3CDA1;">How DAS works with Dataobjects</DIV>
+</H2>
+
+<P>DAS can get DataObject using Dynamic approach or Static approach. In Dynamic approach the query result set is used to form the DataObject. In static approach, DAS Config's DataObjectModel attribute needs a valid value, using which the DataObjects are created.<BR>
+For more details see <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Graph%20Merge" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/Graph+Merge</A>.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-OptimisticConcurrencyControl"></A><DIV class="" style="background-color: #C3CDA1;">What is Optimistic Concurrency Control?</DIV>
+</H2>
+<P>See details on <A href="http://cwiki.apache.org/confluence/display/TUSCANY/OptimisticConcurrencyControl" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/OptimisticConcurrencyControl</A></P>
+
+<P>By default OCC is ON. With this, in generated UPDATE statement, any column undergoing change also gets included in the WHERE clause.</P>
+
+<P>Other than that, in DAS Config, in &lt;Table&gt; element , the &lt;Column&gt; element can have two boolean attributes:- managed(default true), collision</P>
+
+<P>When collision=true for a column, during UPDATE statement generation, that column is included<BR>
+in the WHERE clause.</P>
+
+<P>When managed=true for a column, during UPDATE statement generation, that column (needs to be BigDecimal) value is incremented by 1 and used in the SET clause in UPDATE.</P>
+
+<P>managed=true, is effective only when collision=true, else managed attribute value is ignored.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-keyRestricted"></A><DIV class="" style="background-color: #C3CDA1;">What is the purpose of many and keyRestricted attributes in Relationship? </DIV>
+</H2>
+<P>many=true allows for 1:n relationship. If it is false, it's 1:1 relationship. In case of 1:1 relationship, if keyRestricted is not specified, the link (relationship) between the parent and child rows can be broken, by setting the parentKeyTable's row to null/deleting the row. Also, a different parent row can be associated to the child row, which has one pre-existing parent row association. If keyRestricted=true, this kind on change in existing relationship is not allowed, user will get exception 'Can not modify a one to one relationship that is key restricted'.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-paging"></A><DIV class="" style="background-color: #C3CDA1;">what is paging capability? </DIV>
+</H2>
+<P>What is currently available in DAS is detailed on <A href="http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithPaging" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithPaging</A><BR>
+Other than sequential page access(pager.next(), pager.previous()), random access is also<BR>
+allowed using pager.getPage(number).</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-ResultSet"></A><DIV class="" style="background-color: #C3CDA1;"> Example to define the ResultSet shape Definition for a join in DAS</DIV>
+</H2>
+<P>Doing: </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Select a.dept_name, b.employee_name
+from dept a, emp b
+where a.id = b.dept_id (+)
+</PRE>
+</DIV></DIV>
+<P>How do I define an Explicit ResultSet shape definition for the resultset from a join?</P>
+
+<P>You can find some information on the DAS User Guide <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=50994" class="createlink">1</A>. There are<BR>
+couple test cases that also show this working, here is one test case<BR>
+<A href="2.html" title="2">2</A> and it's config file <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=3&linkCreation=true&fromPageId=50994" class="createlink">3</A>.</P>
+
+<P>Allow passing ResultDescriptor to Dynamic Commands. i.e. Command x = das.createCommand(&quot;y&quot;);<BR>
+x can have set/get of single/list of ResultDescriptors. Useful for databases like Oracle<BR>
+which require user to pass ResultDescriptor and for cases when the commands are created dynamically<BR>
+using createCommand()</P>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=50994" class="createlink">1</A> <A href="http://incubator.apache.org/tuscany/explicit-resultset-shape-definition.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/explicit-resultset-shape-definition.html</A><BR>
+<A href="2.html" title="2">2</A> <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=3&linkCreation=true&fromPageId=50994" class="createlink">3</A> <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithResultDescriptor.xml" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithResultDescriptor.xml</A></P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-blob"></A><DIV class="" style="background-color: #C3CDA1;">Does DAS support datatypes like Blob? </DIV>
+</H2>
+<P>RDB DAS supports SQL Data Types like Blob, Clob, ByteArray, Array.</P>
+
+<H2><A name="DASJava-FAQ-"></A><A name="DASJava-FAQ-namedParams"></A><DIV class="" style="background-color: #C3CDA1;"> Does DAS support named parameters passing?</DIV>
+</H2>
+<P>User can do Command.setParameter(String name, Object value), getParameter(String name). Indexed set/getParameter() is available as before. Also &lt;create&gt;, &lt;update&gt;, &lt;delete&gt; from Config support named parameters.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-found-a-bug.html b/site/trunk/site-publish/das-java-found-a-bug.html
new file mode 100644
index 0000000000..f519c235cb
--- /dev/null
+++ b/site/trunk/site-publish/das-java-found-a-bug.html
@@ -0,0 +1,155 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Found A Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56541">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Found A Bug">DAS Java Found A Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="DASJavaFoundABug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="DASJavaFoundABug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="DASJavaFoundABug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="DASJavaFoundABug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-get-involved.html b/site/trunk/site-publish/das-java-get-involved.html
new file mode 100644
index 0000000000..234c2b78d5
--- /dev/null
+++ b/site/trunk/site-publish/das-java-get-involved.html
@@ -0,0 +1,228 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56539">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Get Involved">DAS Java Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="DASJavaGetInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="DASJavaGetInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-incubating-m1.html b/site/trunk/site-publish/das-java-incubating-m1.html
new file mode 100644
index 0000000000..29ec4cdad2
--- /dev/null
+++ b/site/trunk/site-publish/das-java-incubating-m1.html
@@ -0,0 +1,176 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Incubating-M1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56765">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-releases.html" title="RDB DAS Releases">RDB DAS Releases</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java-previous-releases.html" title="RDB DAS Java Previous Releases">RDB DAS Java Previous Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Incubating-M1">DAS Java Incubating-M1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The RDB DAS Java Incubating-M1 was released in June 2006.</P>
+
+<UL>
+	<LI>DAS Core Features
+	<UL>
+		<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+		<LI>Optimistic concurrency control</LI>
+		<LI>Generated database IDs</LI>
+		<LI>Stored procedures</LI>
+		<LI>Paging API</LI>
+		<LI>1..1 and 1..n relationships</LI>
+		<LI>Partial row updates</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>&nbsp;This release comprises a single package containing SCA, SDO and DAS.</P>
+
+<H3><A name="DASJavaIncubating-M1-RDBDASJavaIncubatingM1"></A>RDB DAS Java Incubating-M1</H3>
+<H3><A name="DASJavaIncubating-M1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M1 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip" class="external-link" rel="nofollow">tuscany-incubating-M1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5" class="external-link" rel="nofollow">MD5 </A>&nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip" class="external-link" rel="nofollow">tuscany-incubating-M1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaIncubating-M1-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-incubator-m2.html b/site/trunk/site-publish/das-java-incubator-m2.html
new file mode 100644
index 0000000000..67a052c6e2
--- /dev/null
+++ b/site/trunk/site-publish/das-java-incubator-m2.html
@@ -0,0 +1,210 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Incubator-M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56756">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-releases.html" title="RDB DAS Releases">RDB DAS Releases</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java-previous-releases.html" title="RDB DAS Java Previous Releases">RDB DAS Java Previous Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Incubator-M2">DAS Java Incubator-M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The SCA Java Incubator-M2 was released in Nov 2006.</P>
+
+<H3><A name="DASJavaIncubator-M2-SCAJavaIncubatorM2"></A>SCA Java Incubator-M2</H3>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+		<LI>Convention over configuration</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="DASJavaIncubator-M2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">das-1.0-incubator-M2-bin.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">das-1.0-incubator-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS Samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">das-samples-1.0-incubator-M2-bin.zip</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaIncubator-M2-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">das-1.0-incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">das-1.0-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> &nbsp; &nbsp;<A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 DAS Samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">das-samples-1.0-incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-m1.html b/site/trunk/site-publish/das-java-m1.html
new file mode 100644
index 0000000000..444d65552d
--- /dev/null
+++ b/site/trunk/site-publish/das-java-m1.html
@@ -0,0 +1,172 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java M1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68163">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java M1">DAS Java M1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DASJavaM1-DASJavaM1Release%28June7th%2C2006%29"></A>DAS Java M1 Release (June 7th, 2006)</H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+
+<H3><A name="DASJavaM1-DownloadDASJavaM1"></A>Download DAS Java M1</H3>
+
+<H3><A name="DASJavaM1-Windows"></A>Windows</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip" class="external-link" rel="nofollow">tuscany-incubating-M1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip" class="external-link" rel="nofollow">tuscany-incubating-M1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaM1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-m2-release.html b/site/trunk/site-publish/das-java-m2-release.html
new file mode 100644
index 0000000000..66832096c9
--- /dev/null
+++ b/site/trunk/site-publish/das-java-m2-release.html
@@ -0,0 +1,129 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Java M2 Release : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=49424">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java M2 Release">DAS Java M2 Release</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="DASJavaM2Release-DASReleases"></A>DAS Releases</H1>
+
+<H2><A name="DASJavaM2Release-DASM2ReleaseKeyFeatures"></A>DAS M2 Release - Key Features</H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>To download DAS M2 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+
+<H2><A name="DASJavaM2Release-DASM2ReleaseKeyFeatures"></A>DAS M2 Release - Key Features</H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<P>To download DAS M1 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-java-m2.html b/site/trunk/site-publish/das-java-m2.html
new file mode 100644
index 0000000000..e358d0d473
--- /dev/null
+++ b/site/trunk/site-publish/das-java-m2.html
@@ -0,0 +1,199 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68166">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java M2">DAS Java M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DASJavaM2-DASJavaM2Release%28Nov20th%2C2006%29"></A>DAS Java M2 Release (Nov 20th, 2006)</H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="DASJavaM2-DownloadDASJavaM2"></A>Download DAS Java M2</H3>
+
+<H3><A name="DASJavaM2-Windows"></A>Windows</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">das-1.0-incubator-M2-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">das-1.0-incubator-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">das-samples-1.0-incubator-M2-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<H3><A name="DASJavaM2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">das-1.0-incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/binary/das-1.0-incubator-M2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">das-1.0-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/source/das-1.0-incubator-M2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">das-samples-1.0-incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubator-M2/sample/das-samples-1.0-incubator-M2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-menu.html b/site/trunk/site-publish/das-java-menu.html
new file mode 100644
index 0000000000..2fb0b198c5
--- /dev/null
+++ b/site/trunk/site-publish/das-java-menu.html
@@ -0,0 +1,116 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54972">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Menu">DAS Java Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XQuery%20Java%20DAS&linkCreation=true&fromPageId=54972" class="createlink">XQuery DAS</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20Java&linkCreation=true&fromPageId=54972" class="createlink">LDAP DAS</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-nightly-build.html b/site/trunk/site-publish/das-java-nightly-build.html
new file mode 100644
index 0000000000..a6d61ce6dc
--- /dev/null
+++ b/site/trunk/site-publish/das-java-nightly-build.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Java Nightly Build : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=60701">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Nightly Build">DAS Java Nightly Build</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-java-previous-releases.html b/site/trunk/site-publish/das-java-previous-releases.html
new file mode 100644
index 0000000000..7ef6e07e3b
--- /dev/null
+++ b/site/trunk/site-publish/das-java-previous-releases.html
@@ -0,0 +1,132 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68172">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Previous Releases">DAS Java Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-beta1.html" title="DAS Java Beta1"><B>DAS Java Beta1 Release</B> <EM>(Aug. 21st, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m2.html" title="DAS Java M2"><B>DAS Java M2 Release</B> <EM>(Nov 20th, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>3.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m1.html" title="DAS Java M1"><B>DAS Java M1 Release</B> <EM>(June 7th, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg b/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg
new file mode 100644
index 0000000000..1a7c90023c
--- /dev/null
+++ b/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg
diff --git a/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg.jpeg b/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg.jpeg
new file mode 100644
index 0000000000..5a5552a160
--- /dev/null
+++ b/site/trunk/site-publish/das-java-project.data/das_class_diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/das-java-project.html b/site/trunk/site-publish/das-java-project.html
new file mode 100644
index 0000000000..9c58a5310a
--- /dev/null
+++ b/site/trunk/site-publish/das-java-project.html
@@ -0,0 +1,285 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Java Project : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45092">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Project">DAS Java Project</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="rdb-das.html" title="RDB DAS">RDB DAS</A><BR>
+<A href="xquery-java-das.html" title="XQuery Java DAS">XQuery DAS</A><BR>
+<A href="ldap-das-java.html" title="LDAP DAS Java">LDAP DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="DASJavaProject-DASProjects"></A>DAS Projects</H3>
+<P>This document provides information on DAS Java subproject of the Apache Tuscany incubator project.</P>
+
+<H3><A name="DASJavaProject-DASJavaGettingStarted"></A>DAS Java Getting Started	</H3>
+
+<P>To get started with Java DAS, follow the downloads link and pick up either a binary or source distribution. If you are working from a source distribution, you can follow the general instructions for building the whole of the Tuscany java projects, or you can follow the intructions within the DAS Java overview to build and explore just DAS java.</P>
+
+<H3><A name="DASJavaProject-BuildEnvironmentSetup"></A>Build Environment Setup	</H3>
+
+<P>DAS is a subproject of the Tuscany Java project subtree. If you check out and build the whole Tuscany Java project, you will have also built the DAS subproject.  <BR>
+<SPAN class="error">&#91;Note: Show how this can be done&#93;</SPAN></P>
+
+<H4><A name="DASJavaProject-BuildDASsubproject"></A>Build DAS subproject </H4>
+
+<P>Set up your environment using the instructions for building the whole of Tuscany, but only download and install Java 5, Maven and Svn</P>
+
+<P>Make sure 'mvn' and 'svn' commands are in your PATH environment variable.</P>
+
+<P>Check out the DAS open source projects from Apache.</P>
+
+<P>Commands:</P>
+
+<P>md &lt;local tuscany dir&gt; <BR>
+cd &lt;local tuscany dir&gt; <BR>
+svn co <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </P>
+
+<P>Run &quot;mvn&quot; under &lt;local tuscany dir&gt;/java directory to install POM files from the root project to the local repository</P>
+
+<P><EM>cd &lt;local tuscany dir&gt;/java/das</EM> <BR>
+<EM>mvn</EM></P>
+
+<P>If the mvn command completed successfully, you will see BUILD SUCCESSFUL in the output and tuscany-das-rdb-1.0-SNAPSHOP.jar is created under &lt;local tuscany dir&gt;/java/das/rdb/target directory.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> External resources are at times unavailable. It may be necessary to run &quot;mvn&quot; again at a later time<BR>
+Use of Firewall can cause time out. Set up the firewall to permit the action without prompting.</P>
+
+<H4><A name="DASJavaProject-BuildingJavadocforDAS"></A>Building Javadoc for DAS</H4>
+
+<P>In order to build DAS Javadocs, you will need to build the a specific maven profile called &quot;javadoc&quot;</P>
+
+<P><EM>cd &lt;local tuscany dir&gt;/java/das</EM> <BR>
+<EM>mvn -P javadoc</EM></P>
+
+<P>Javadoc will become available at &lt;local tuscany dir&gt;/java/das/rdb/target/apidocs/index.html.</P>
+
+<H4><A name="DASJavaProject-DependencyJarsforDAS.RDB"></A>Dependency Jars for DAS.RDB</H4>
+
+<P>The DAS.RDB project has a dependency on SDO and requires the following SDO runtime jars to build</P>
+
+<P>sdo-api-r2.0.1-1.0-SNAPSHOT.jar - SDO 2.0 Interfaces<BR>
+tuscany-sdo-impl-1.0-SNAPSHOT.jar - SDO 2.0 implementation</P>
+
+<P>The SDO.IMPL project have dependencies on the following EMF (Eclipse Modeling Framework - www.eclipse.org/emf) runtime jars to build:</P>
+
+<P>common-2.2.1.jar - some common framework utility and base classes<BR>
+ecore-2.2.1.jar - the EMF core runtime implementation classes (the Ecore metamodel)<BR>
+ecore-change-2.2.1.jar - the EMF change recorder and framework<BR>
+ecore-xmi-2.2.1.jar - EMF's default XML (and XMI) serializer and loader<BR>
+xsd-2.2.1.jar - the XML Schema model<BR>
+log4j-1.2.12.jar - log4j logging framework</P>
+
+<H4><A name="DASJavaProject-RunningDASSamples"></A>Running DAS Samples	</H4>
+
+<P>DAS provide sample a CompanyWeb scenario where it exposes some of the DAS Features integrated in a J2EE webapp.<BR>
+Follow the steps below to be able to run the samples in a J2EE webserver (in our case Apache Tomcat)</P>
+
+<P>From the source repository</P>
+
+<P>checkout DAS Sample from SVN repository:<BR>
+<EM>md 'local tuscany dir'</EM><BR>
+<EM>cd 'local tuscany dir'</EM><BR>
+<EM>svn co <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> das</EM></P>
+
+<P>use maven to build the CompanyWeb war file:</P>
+
+<P><EM>cd das\samples</EM><BR>
+<EM>mvn</EM></P>
+
+<P>use maven to deploy the CompanyWeb war file to Tomcat</P>
+
+<P><EM>mvn tomcat:deploy</EM></P>
+
+<P>There are also some sample applications that use a mix of SCA, SDO and DAS. See &quot;Running the Samples&quot; on the Java project page for details.<BR>
+<SPAN class="error">&#91;Note: Please check to make sure this is correct&#93;</SPAN></P>
+
+<P>From a DAS Sample distribution (starting with M2):</P>
+
+<P>Download a das-sample distribution from <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/downloads.html" title="Visit page outside Confluence" rel="nofollow">http://incubator.apache.org/tuscany/downloads.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>Extract the companyweb war file and follow regular deployment procedures to deploy the war file</P>
+
+
+<H4><A name="DASJavaProject-RunningTuscanyDASUnitTests"></A>Running Tuscany DAS Unit Tests	</H4>
+
+<P>DAS is currently providing two sets of unit tests</P>
+
+<P>JUnit tests for the core DAS code</P>
+
+<P>HTMLUnit tests integrated with Tomcat for DAS CompanyWeb sample application</P>
+
+<P>Please run unit tests as a good practice before submitting your contribution.  </P>
+
+<P><B>Running DAS tests as part of the build</B></P>
+
+<P>-cd 'local tuscany dir'/java/das_<BR>
+<EM>mvn test</EM></P>
+
+<P>-------------------------------------------------------<BR>
+T E S T S<BR>
+-------------------------------------------------------<BR>
+Running org.apache.tuscany.das.rdb.test.suites.AllTestsDerby<BR>
+Setting up for Derby run<BR>
+Ending Derby run<BR>
+Tests run: 137, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.468 sec</P>
+
+<P>Results :</P>
+
+<P>Tests run: 137, Failures: 0, Errors: 0, Skipped: 0</P>
+
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> BUILD SUCCESSFUL<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Total time: 57 seconds<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Finished at: Tue Oct 03 12:06:13 PDT 2006<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Final Memory: 5M/10M<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------</P>
+
+
+<P><B>Running DAS CompanyWeb tests in tomcat</B></P>
+
+<P>Download tomcat distribution into your local filesystem : <SPAN class="nobr"><A href="http://tomcat.apache.org/" title="Visit page outside Confluence" rel="nofollow">http://tomcat.apache.org/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>Create a build.properties in your root directory (e.g. C:\Documents and Settings\lresende in Win2K systems) with the following contents</P>
+
+<P>tuscany.acceptance.tomcat.zipped='directory where tomcat was downloaded'<BR clear="all">apache-tomcat-5.5.17-tuscany.zip</P>
+
+<P>checkout DAS Sample from SVN repository:</P>
+
+<P><EM>md 'local tuscany dir'</EM><BR>
+<EM>cd 'local tuscany dir'</EM><BR>
+<EM>svn co <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> das</EM></P>
+
+<P>use maven run the DAS CompanyWeb tests in Tomcat:</P>
+
+<P><EM>cd das/samples/testing/tomcat</EM><BR>
+<EM>mvn</EM></P>
+
+<P>-------------------------------------------------------<BR>
+T E S T S<BR>
+-------------------------------------------------------<BR>
+Running org.apache.tuscany.test.das.DasTestCase<BR>
+Running:HomePage SUCCESS!!!<BR>
+Running:AllCompanies SUCCESS!!!<BR>
+Running:AllCompaniesDepartments SUCCESS!!!<BR>
+Running:AddDepartmentToFirstCompany SUCCESS!!!<BR>
+Running:ChangeCompanyDepartmentNames SUCCESS!!!<BR>
+Running:DeleteCompanyOneDepartments SUCCESS!!!<BR>
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.911 sec</P>
+
+<P>Results :</P>
+
+<P>Tests run: 6, Failures: 0, Errors: 0, Skipped: 0</P>
+
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Reactor Summary:<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Tuscany Testing in Tomcat ............................. SUCCESS <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=0.251s&linkCreation=true&fromPageId=45092" title="Create Page: 0.251s" class="createlink">0.251s<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Tuscany Testing DAS Sample - Companyweb ............... SUCCESS <SPAN class="error">&#91;1:17.791s&#93;</SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> BUILD SUCCESSFUL<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Total time: 1 minute 18 seconds<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Finished at: Tue Oct 03 12:25:48 PDT 2006<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> Final Memory: 7M/15M<BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=INFO&linkCreation=true&fromPageId=45092" title="Create Page: INFO" class="createlink">INFO<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> ------------------------------------------------------------------------</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Due to a current limitation, you must run mvn clean before you can run the tests a second time</P>
+
+<H3><A name="DASJavaProject-DASRDBCodeStructure"></A>DAS RDB Code Structure	</H3>
+
+<P>Currently, the project's code base includes an implementation of a DAS RDB (relational database) and it is divided into three parts:</P>
+
+<P>1. das.rdb contains the DAS interfaces and the RDB (Relational Database) runtime implementation.</P>
+
+<P>2. samples.das provides sample applications based on DAS.</P>
+
+<P>3. distribution.das provides DAS binaries distribution with required dependencies.</P>
+
+<P>Please note that distribution.das-samples provides DAS samples distribution as a ready-to-deploy war file.</P>
+
+<P>Following diagram shows the high level class diagram for RDB DAS.<BR>
+<SPAN class="error">&#91;Note: Should the following be moved to architecture guide for RDB DAS\?&#93;</SPAN></P>
+
+<P><IMG src="das-java-project.data/das_class_diagram.jpg" align="absmiddle" border="0"></P>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-java-release-contents.html b/site/trunk/site-publish/das-java-release-contents.html
new file mode 100644
index 0000000000..14319ce9f9
--- /dev/null
+++ b/site/trunk/site-publish/das-java-release-contents.html
@@ -0,0 +1,201 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=49424">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Release Contents">DAS Java Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="DASJavaReleaseContents-LatestRelease%3ARDBDASBeta2Release"></A>Latest Release: RDB DAS Beta2 Release  </H2>
+
+<P><B>Download <A href="das-downloads.html" title="DAS Downloads">RDB DAS Beta2 Release </A></B></P>
+
+<P>What's new in Apache Tuscany DAS beta2?</P>
+
+<P>   The main purpose of the DAS beta2 release is to fix incompatibilities that were found with SDO 1.0 release.</P>
+
+<P>   The following JIRAs also were fixed on DAS beta2</P>
+
+<UL>
+	<LI>TUSCANY-986  - DAS integration with SDO 2.1 APIs</LI>
+	<LI>TUSCANY-961  - DAS: Using deprected SDO method causes Type lookup failure</LI>
+	<LI>TUSCANY-1353 - Exception attempting to insert rows using DAS w/DataDirect JDBC driver</LI>
+	<LI>TUSCANY-1453 - DAS can't read or write the blob field</LI>
+	<LI>TUSCANY-1463 - Support for Clob and Array fields</LI>
+	<LI>TUSCANY-1462 - Consistent use of Parameters in Config</LI>
+	<LI>TUSCANY-1464 - Wrong query results when SELECT misses PKs</LI>
+	<LI>TUSCANY-1465 - Allow passing ResultDescriptor for dynamic Commands</LI>
+	<LI>TUSCANY-1720 - Modify sample readmes for - steps to run sample with other databases</LI>
+</UL>
+
+
+
+<H2><A name="DASJavaReleaseContents-Previousreleasescontent"></A>Previous releases content </H2>
+<H3><A name="DASJavaReleaseContents-DASBeta1ReleaseKeyFeatures"></A>DAS Beta1 Release - Key Features</H3>
+
+<P>What's new in Apache Tuscany DAS beta1?</P>
+
+<UL>
+	<LI>Support for J2SE connections in DAS config using Driver Manager.</LI>
+	<LI>Added support for multiple database schemas in queries</LI>
+	<LI>Enhanced Optimistic Concurrency Control with overqualified updates</LI>
+	<LI>Multiple enhancements around ApplyChanges API</LI>
+	<LI>Enhanced support for MySQL</LI>
+	<LI>Enhanced Documentation: User, Developer and Architect guides as well as javadocs</LI>
+	<LI>Enhanced and new sample applications</LI>
+</UL>
+
+
+<H3><A name="DASJavaReleaseContents-DASM2ReleaseKeyfeatures"></A>DAS M2 Release - Key features  </H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>To download DAS M2 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+
+<H3><A name="DASJavaReleaseContents-DASM1ReleaseKeyFeatures"></A>DAS M1 Release - Key Features</H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<P>To download DAS M1 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-releases.html b/site/trunk/site-publish/das-java-releases.html
new file mode 100644
index 0000000000..d67f42bf79
--- /dev/null
+++ b/site/trunk/site-publish/das-java-releases.html
@@ -0,0 +1,237 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56551">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Releases">DAS Java Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="DASJavaReleases-LatestRelease"></A>Latest Release</H2>
+
+<H3><A name="DASJavaReleases-DASJavaBeta2Release%28Oct.06%2C2007%29"></A>DAS Java Beta2 Release (Oct. 06, 2007)</H3>
+
+<P>What's new in Apache Tuscany DAS beta2?</P>
+
+<P>   The main purpose of the DAS beta2 release is to fix incompatibilities that were found with SDO 1.0 release.</P>
+
+<P>   The following JIRAs also were fixed on DAS beta2</P>
+
+<UL>
+	<LI>TUSCANY-986  - DAS integration with SDO 2.1 APIs</LI>
+	<LI>TUSCANY-961  - DAS: Using deprected SDO method causes Type lookup failure</LI>
+	<LI>TUSCANY-1353 - Exception attempting to insert rows using DAS w/DataDirect JDBC driver</LI>
+	<LI>TUSCANY-1453 - DAS can't read or write the blob field</LI>
+	<LI>TUSCANY-1463 - Support for Clob and Array fields</LI>
+	<LI>TUSCANY-1462 - Consistent use of Parameters in Config</LI>
+	<LI>TUSCANY-1464 - Wrong query results when SELECT misses PKs</LI>
+	<LI>TUSCANY-1465 - Allow passing ResultDescriptor for dynamic Commands</LI>
+	<LI>TUSCANY-1720 - Modify sample readmes for - steps to run sample with other databases</LI>
+</UL>
+
+
+
+<H3><A name="DASJavaReleases-DownloadDASJavaBeta2"></A>Download DAS Java Beta2</H3>
+
+<H3><A name="DASJavaReleases-Windows"></A>Windows</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="DASJavaReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz" class="external-link" rel="nofollow">tuscany-das-1.0-incubating-beta2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/das/1.0-incubating-beta2/tuscany-das-1.0-incubating-beta2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651096; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="97d8df14"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651096/0/97d8df14/1/" alt="free html hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+
+<H2><A name="DASJavaReleases-PreviousReleases"></A>Previous Releases</H2>
+
+<P>Below is a complete list of all Apache Tuscany DAS downloads. </P>
+
+<P><B>It is strongly recommended that you download the latest release instead of any of the previous releases since it is closer to the latest code in the trunk.</B></P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-beta1.html" title="DAS Java Beta1"><B>DAS Java Beta1 Release</B> <EM>(Aug. 21st, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m2.html" title="DAS Java M2"><B>DAS Java M2 Release</B> <EM>(Nov 20th, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>3.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m1.html" title="DAS Java M1"><B>DAS Java M1 Release</B> <EM>(June 7th, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java-subproject-menu.html b/site/trunk/site-publish/das-java-subproject-menu.html
new file mode 100644
index 0000000000..dd5f102b38
--- /dev/null
+++ b/site/trunk/site-publish/das-java-subproject-menu.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56222">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java Subproject Menu">DAS Java Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-java.data/das_class_diagram.jpg b/site/trunk/site-publish/das-java.data/das_class_diagram.jpg
new file mode 100644
index 0000000000..1a7c90023c
--- /dev/null
+++ b/site/trunk/site-publish/das-java.data/das_class_diagram.jpg
diff --git a/site/trunk/site-publish/das-java.data/das_class_diagram.jpg.jpeg b/site/trunk/site-publish/das-java.data/das_class_diagram.jpg.jpeg
new file mode 100644
index 0000000000..5a5552a160
--- /dev/null
+++ b/site/trunk/site-publish/das-java.data/das_class_diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/das-java.html b/site/trunk/site-publish/das-java.html
new file mode 100644
index 0000000000..3efdcdde54
--- /dev/null
+++ b/site/trunk/site-publish/das-java.html
@@ -0,0 +1,139 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56538">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Java">DAS Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H4><A name="DASJava-WhatisRDBDataAccessService%3F"></A>What is RDB Data Access Service?</H4>
+
+<P>RDB DAS provides provides transformation capability between SDO data graphs and relational databases and vise versa.</P>
+
+<P>By using RDB DAS, applications developers avoid the details and complications of working directly with a relational database and also the complex transformation between relational rows/columns and SDO Data Object types/properties.</P>
+
+<P>RDB DAS processes the SDO change summary and produces efficient update statements that only write to columns that have actually been modified.</P>
+
+<P>The following diagram illustrates a DAS client. The client starts by reading a graph of data specified by some query. The client then makes modifications to the graph, possibly by adding elements, and then requests the DAS to push the changes back to the database.</P>
+
+
+<P><SPAN class="image-wrap" style=""><IMG src="rdb-das-java.data/rdbDAS.gif" style="border: 0px solid black"></SPAN></P></TD></TR></TBODY></TABLE>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-lite-c.data/DAS Lite C   Class Diagram b/site/trunk/site-publish/das-lite-c.data/DAS Lite C   Class Diagram
new file mode 100644
index 0000000000..da5d22eb40
--- /dev/null
+++ b/site/trunk/site-publish/das-lite-c.data/DAS Lite C   Class Diagram
@@ -0,0 +1 @@
+<stage keygen_seq="2"><pageObj stg="0" pb="0" gr="0" fill="16777215" height="754" width="576"><objects><object order="0" text-horizontal-pos="center" text-vertical-pos="middle" fixed-aspect="false" rot="0" height="329" width="446.95" y="278" x="339" shp_id="6" class="text_shape"><text><![CDATA[<P ALIGN="CENTER"><FONT FACE="Arial" SIZE="96" COLOR="#000000" LETTERSPACING="0" KERNING="0">A new <FONT COLOR="#6CCFF7">Gliffy </FONT>diagram</FONT></P>]]></text></object></objects></pageObj></stage>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg b/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg
new file mode 100644
index 0000000000..9aefc7f42d
--- /dev/null
+++ b/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg
diff --git a/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg.jpeg b/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg.jpeg
new file mode 100644
index 0000000000..9a1189ebfb
--- /dev/null
+++ b/site/trunk/site-publish/das-lite-c.data/DAS_lite_diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/das-lite-c.html b/site/trunk/site-publish/das-lite-c.html
new file mode 100644
index 0000000000..d50ea3a399
--- /dev/null
+++ b/site/trunk/site-publish/das-lite-c.html
@@ -0,0 +1,104 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>DAS Lite C++ : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46512">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-c-architecture-guide.html" title="DAS C++ Architecture Guide">DAS C++ Architecture Guide</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Lite C++">DAS Lite C++</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20-%20FAQ&linkCreation=true&fromPageId=55080" title="Create Page: RDB DAS - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das-java.html" title="What's New in DAS JAVA">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="rdb-das-c-user-guide.html" title="RDB DAS C++ User Guide">User Guide</A><BR>
+<A href="rdb-das-c-architecture.html" title="RDB DAS C++ Architecture">Architecture Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20Project&linkCreation=true&fromPageId=55080" title="Create Page: DAS C++ Project" class="createlink">Get Involved<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<H1><A name="DASLiteC%2B%2B-Introduction"></A>Introduction</H1>
+
+<P>&nbsp;&nbsp;&nbsp; The DAS Lite C+&#43; library is a minimal collection of classes needed to implement a simple read&nbsp; webApp. This webApp should create a prepared statement using a given select statement string&nbsp; and return the selected rows. It also should generate a graph with the data returned by the database using SDO C+&#43; framework.&nbsp;</P>
+
+<P><B>DAS Lite is in its early stages of development. Your help is welcome</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-lite-cplus-menu.html b/site/trunk/site-publish/das-lite-cplus-menu.html
new file mode 100644
index 0000000000..b70a6e2768
--- /dev/null
+++ b/site/trunk/site-publish/das-lite-cplus-menu.html
@@ -0,0 +1,126 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Lite CPlus Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55080">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="das-cplus-menu.html" title="DAS CPlus Menu">DAS CPlus Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Lite CPlus Menu">DAS Lite CPlus Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20-%20FAQ&linkCreation=true&fromPageId=55080" class="createlink">FAQ</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das-java.html" title="What's New in DAS JAVA">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20C%2B%2B%20User%20Guide&linkCreation=true&fromPageId=55080" class="createlink">User Guide</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20C%2B%2B%20Architecture&linkCreation=true&fromPageId=55080" class="createlink">Architecture Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/" class="external-link" rel="nofollow">Source Code</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20Project&linkCreation=true&fromPageId=55080" class="createlink">Get Involved</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-menu.html b/site/trunk/site-publish/das-menu.html
new file mode 100644
index 0000000000..86c86481e4
--- /dev/null
+++ b/site/trunk/site-publish/das-menu.html
@@ -0,0 +1,81 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54961">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Menu">DAS Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-outline.html b/site/trunk/site-publish/das-outline.html
new file mode 100644
index 0000000000..712639e11b
--- /dev/null
+++ b/site/trunk/site-publish/das-outline.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Outline</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=49089">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="das.html" title="DAS">DAS</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Outline">DAS Outline</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H4><A name="DASOutline-TuscanyDAS"></A>Tuscany DAS</H4>
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20Documentation&linkCreation=true&fromPageId=49089" class="createlink">DAS Documentation</A><BR>
+<A href="das-java-release-contents.html" title="DAS Java Release Contents">DAS Java Release Contents</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-overview.data/RDB-DAS-Overview.pdf b/site/trunk/site-publish/das-overview.data/RDB-DAS-Overview.pdf
new file mode 100644
index 0000000000..2398de5cc2
--- /dev/null
+++ b/site/trunk/site-publish/das-overview.data/RDB-DAS-Overview.pdf
diff --git a/site/trunk/site-publish/das-overview.data/das-data-services-v01.pdf b/site/trunk/site-publish/das-overview.data/das-data-services-v01.pdf
new file mode 100644
index 0000000000..24082aeb07
--- /dev/null
+++ b/site/trunk/site-publish/das-overview.data/das-data-services-v01.pdf
diff --git a/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg b/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg
new file mode 100644
index 0000000000..c9c22fc646
--- /dev/null
+++ b/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg
diff --git a/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg.jpeg b/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg.jpeg
new file mode 100644
index 0000000000..1929dcd235
--- /dev/null
+++ b/site/trunk/site-publish/das-overview.data/sdo_das_sm.jpg.jpeg
diff --git a/site/trunk/site-publish/das-overview.html b/site/trunk/site-publish/das-overview.html
new file mode 100644
index 0000000000..14f1164a58
--- /dev/null
+++ b/site/trunk/site-publish/das-overview.html
@@ -0,0 +1,179 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Overview</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47561">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Overview">DAS Overview</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H4><A name="DASOverview-WhatisDataAccessService%3F"></A>What is Data Access Service?</H4>
+
+<P>Service Data Object(SDO) provides a uniform API for handling different types of data. Data Access Service (DAS) simplifies handling of data when interacting with the back-end data source and frees application developers from dealing with tedious and error-prone transformation between end source types and SDO Data Object Types/properties. </P>
+
+<P>Tuscany provides implementation for different flavors of DAS in two languages, Java and C++. Please follow the link under each language to explore what is available or is in progress. We welcome your help to extend support for other back-end data source types or complete the existing solutions.</P>
+
+<P>The following diagram illustrates a typical client interaction. The client starts by reading a graph of data and makes modifications to the graph, possibly by adding elements, and then requests the DAS to push the changes back to the data source.<BR>
+<SPAN class="image-wrap" style=""><IMG src="das-overview.data/sdo_das_sm.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="DASOverview-LearnmoreaboutDAS"></A>Learn more about DAS	</H3>
+
+<UL>
+	<LI><A href="http://incubator.apache.org/tuscany/RDB_DAS_white_paper_v-0.2.pdf" class="external-link" rel="nofollow">The Data Access Service: How to access relational data in terms of Service Data Objects</A>, a White Paper</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://java.sys-con.com/read/260053.htm" class="external-link" rel="nofollow">How to access relational data in terms of Service Data Objects</A>, Java Developer Journal Article by Kevin Williams</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="das-overview.data/RDB-DAS-Overview.pdf">Tuscany DAS Overview </A>, Kevin Williams and Luciano Resende</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://lresende.blogspot.com/" class="external-link" rel="nofollow">Luciano's blog on SDO/DAS and other SOA technologies</A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="das-overview.data/das-data-services-v01.pdf">Data Service and SCA</A>, Luciano Resende</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-previous-releases.html b/site/trunk/site-publish/das-previous-releases.html
new file mode 100644
index 0000000000..539e526502
--- /dev/null
+++ b/site/trunk/site-publish/das-previous-releases.html
@@ -0,0 +1,97 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Previous Releases : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=68172">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Previous Releases">DAS Previous Releases</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR clear="all"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <A href="das-java-beta1.html" title="DAS Java Beta1"><B>DAS Java Beta1 Release</B> <EM>(Aug. 21st, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m2.html" title="DAS Java M2"><B>DAS Java M2 Release</B> <EM>(Nov 20th, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>3.</B> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <A href="das-java-m1.html" title="DAS Java M1"><B>DAS Java M1 Release</B> <EM>(June 7th, 2006)</EM></A><BR clear="all"> </TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-rdb-menu.html b/site/trunk/site-publish/das-rdb-menu.html
new file mode 100644
index 0000000000..313fb3946e
--- /dev/null
+++ b/site/trunk/site-publish/das-rdb-menu.html
@@ -0,0 +1,129 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS RDB Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55092">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS RDB Menu">DAS RDB Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=55092" class="createlink">FAQ</A><BR>
+<A href="rdb-das-releases.html" title="RDB DAS Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS&linkCreation=true&fromPageId=55092" class="createlink">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<A href="rdb-das-architecture-guide.html" title="RDB DAS architecture guide">Architecture Guide</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/das-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-release-process-menu.html b/site/trunk/site-publish/das-release-process-menu.html
new file mode 100644
index 0000000000..98cf09e917
--- /dev/null
+++ b/site/trunk/site-publish/das-release-process-menu.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Release Process Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54979">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Release Process Menu">DAS Release Process Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Release Process</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-release-process.html" title="DAS Release Process">Release Process</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-release-process.html b/site/trunk/site-publish/das-release-process.html
new file mode 100644
index 0000000000..bc4c39e62d
--- /dev/null
+++ b/site/trunk/site-publish/das-release-process.html
@@ -0,0 +1,246 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Release Process</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51237">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Release Process">DAS Release Process</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="DASReleaseProcess-StartingaReleaseforDASSubproject"></A>Starting a Release for DAS Subproject</H2>
+<P><B>This is work in progress. At this point, thoughts are put together to review with the community. Please help to complete this</B></P>
+
+<H2><A name="DASReleaseProcess-What%27saRelease"></A>What's a Release</H2>
+
+<P>The <A href="http://www.apache.org/dev/release.html#what" class="external-link" rel="nofollow">ASF release definition</A> basically says that any artifact that is made available for people outside of the Apache Tuscany project is considered a release. The Release process usually consist of preparing the contents of the release on the project dev-list, voting release candidate(s) and, because Tuscany is still under Incubation, asking the iPMC to approve the release after it has already been approved on the project development community.</P>
+
+<H2><A name="DASReleaseProcess-Prerequisites"></A>Prerequisites</H2>
+
+<P>DAS releases are dependent on SDO release. Make sure we have a SDO release to base this release on.</P>
+
+<H2><A name="DASReleaseProcess-Startingthereleaseprocess"></A>Starting the release process</H2>
+<OL>
+	<LI>Identify a release manager on devlist.</LI>
+	<LI>The release manager initiates the discussion on the dev list or gathers previous dicussion threads related to the release content and starts a release thread discussion. Get consensus on the content from the community early.</LI>
+	<LI>Nail the must-have functions from the community that is required to be delivered in this release.</LI>
+	<LI>Target (or reTarget) all of the Jira defects and new function that is required for the release.  Move non-critical items to the next milestone.</LI>
+</OL>
+
+
+<H3><A name="DASReleaseProcess-Duringtherelease"></A>During the release</H3>
+<OL>
+	<LI>Keep Jiras under control during the milestone.   Make sure new opened ones are targeted for the appropriate release, and the backlog is decreasing.</LI>
+	<LI>Make sure the new function Jira are marked appropriately (since they will be used in the ReadMe file creation).</LI>
+	<LI>Look for Jira's that have patches attached to them and get the code integrated early in the cycle.   Don't wait until the last minute.</LI>
+	<LI>Make sure that you begin to obtain clean versions for all SNAPSHOTs in the build.  This can sometimes be a lengthy process as dependent packages are sometimes not available.</LI>
+	<LI>Lay out a plan for the distributed execution of the test suites (unit tests, integration tests, scenarios)</LI>
+	<LI>Ensure that all of the licenses are valid and replacements/remediation should be done.</LI>
+	<LI>Make sure that you remind the community that all modules should have the appropriate header file with the appropriate <A href="http://www.apache.org/legal/src-headers.html#headers" class="external-link" rel="nofollow">copyright statement</A>.</LI>
+	<LI>Prepare for signing/authenticating distro files
+	<OL>
+		<LI>identify/install s/w for public key infrastructure stuff and MD5 message digest generation</LI>
+		<LI>Create a PGP key for signing files</LI>
+		<LI>Lodge your PGP key with a keyserver</LI>
+		<LI>Put your public key in the svn KEYS file</LI>
+	</OL>
+	</LI>
+	<LI>Get set up for easy file transfer to people.apache.org
+	<OL>
+		<LI>Identify/Install clients for ssh, secure copying and secure ftping</LI>
+		<LI>Establish authentication with people.apache.org by key</LI>
+	</OL>
+	</LI>
+	<LI>Ensure that there is inter-module understanding of how we plan to sequence releasing modules and requesting IPMC votes</LI>
+	<LI>make the trunk reference the newly released parent pom and buildtools</LI>
+	<LI>optionally make a branch</LI>
+	<LI>stabilize code in branch (or trunk if development activity can be halted in trunk)
+	<OL>
+		<LI>check LICENSE and NOTICE files in project roots and in jar manifests
+		<OL>
+			<LI>run the rat tool against the source and check for exceptions</LI>
+			<LI>once exceptions have been fixed, store the rat log and make a note of rat log exceptions which are there because they have to be</LI>
+			<LI>repeat this as necessary during the release process if new files are included</LI>
+		</OL>
+		</LI>
+		<LI>update readme with the important New Function and a pointer to defect fixes for this release.   Put the delivery date of the release at the top of the readme.</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<OL>
+	<LI>
+	<OL>
+		<LI>Ensure the DAS Tuscany project's root level svn Status file is up to date, and then copy/update it into the root folders of any source distribution that will be made,</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<H2><A name="DASReleaseProcess-Exitingthereleasecycle"></A>Exiting the release cycle</H2>
+
+<OL>
+	<LI>Create a release candidate
+	<OL>
+		<LI>Create local copies of source hierarchies, , one per source distribution, using svn export &lt;uri&gt; &lt;local-dir&gt;</LI>
+		<LI>Make archives of your clean exports in order to be able to distribute source</LI>
+		<LI>Follow the instructions in BUILDING.txt in the root folders of the source distributions to produce the binary distribution</LI>
+		<LI>Test binary distro on a clean machine before publishing it as an RC.</LI>
+		<LI>When ready, put in place distro signing capabilities
+		<OL>
+			<LI>Sign and create md5 checksums for each of the source and binary distribution archives</LI>
+			<LI>transfer the archives to a logical place under your public_html people.apache.org space</LI>
+			<LI>create a suitable readme for the root level of your release candidate folder, and ensure the readme names the release candidate version</LI>
+		</OL>
+		</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<OL>
+	<LI>Declare a candidate build and ask for feedback on devlist and user list.  Work out any issues that are voiced.</LI>
+	<LI>Get some to verify that all of the samples pass without issues. Integration tests and unit tests should run and known problems need to be identifed.</LI>
+	<LI>Initiate a vote on tuscany-dev mailing list for the release candidate to make the build a public release.</LI>
+	<LI>After 3 days,  post the result to the devlist</LI>
+	<LI>Once the community approved the candidate, create a tag from the branch (or trunk if no branch)
+	<OL>
+		<LI>Note that a release must have a referenceable tag<BR>
+   <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> svn will complain when you try to do an svn commit into a tag, which is a warning only, and during this phase of the release process, updates to a tag are justifiable</LI>
+	</OL>
+	</LI>
+	<LI>Get approval from IPMC to make this a public release. Send a note to general@apache.org which summarizes the result of vote on devlist and include a pointer to the release in your note. 3 (+1) IPMC votes are required to make this a public release and of course no (-1).</LI>
+	<LI>Once you have IPMC approval, post the release to people.apache.org.</LI>
+	<LI>Update the version elements of the poms to define the version of the parent pom and buildtools that should be used</LI>
+	<LI>Update the tags version names of the distributable artifacts to non SNAPSHOT titles that match the release name</LI>
+	<LI>Update the tags version names of the dependencies to non SNAPSHOT versions, if not already done earlier in the release candidate process</LI>
+	<LI>Ideally update the tags version names of maven plugins to non SNAPSHOT versions if not already done earlier in the release candidate process (note that if the plugin behaviour changes after release, your tag or source distribution may not build in the same way as it did when you released if you rely on SNAPSHOT plugin versions)</LI>
+	<LI>Rebuild and upload a new release to /www/people.apache.org/dist/incubator/tuscany/java</LI>
+	<LI>update 'Download' link on the wiki and make it a goal to update or add documentation.</LI>
+	<LI>Announce the release by sending to anounce@apache.org (note that you must use an apache.org email address to do this), copying tuscany-dev, tuscany-user and general@incubator</LI>
+	<LI>Don't forget that all this could not have been done without everyone's help. Post a congratulation note to the dev list and thank the entire team for their efforts to make this happen <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"> And thank you for the extra ordinary effort to make this happen <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></LI>
+</OL>
+
+
+
+<H2><A name="DASReleaseProcess-GoodReferences"></A>Good References</H2>
+
+<UL>
+	<LI>Apache Release: <A href="http://www.apache.org/dev/release.html" class="external-link" rel="nofollow">http://www.apache.org/dev/release.html</A></LI>
+	<LI>Apache Release Management: <A href="http://incubator.apache.org/guides/releasemanagement.html" class="external-link" rel="nofollow">http://incubator.apache.org/guides/releasemanagement.html</A></LI>
+	<LI>Apache release publishing guide: <A href="http://www.apache.org/dev/release-publishing.html" class="external-link" rel="nofollow">http://www.apache.org/dev/release-publishing.html</A></LI>
+	<LI>ARAT: <A href="http://code.google.com/p/arat/" class="external-link" rel="nofollow">http://code.google.com/p/arat/</A></LI>
+	<LI>Apache Voting: <A href="http://www.apache.org/foundation/voting.html" class="external-link" rel="nofollow">http://www.apache.org/foundation/voting.html</A></LI>
+	<LI>Signing Releases: <A href="http://www.apache.org/dev/release-signing.html" class="external-link" rel="nofollow">http://www.apache.org/dev/release-signing.html</A></LI>
+</UL>
+
+
+<H2><A name="DASReleaseProcess-Examples"></A>Examples</H2>
+<P><A href="http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps" class="external-link" rel="nofollow">http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps</A></P>
+<UL>
+	<LI>Release process from Apache Cayenne: <A href="http://cwiki.apache.org/CAY/release-guide.html" class="external-link" rel="nofollow">http://cwiki.apache.org/CAY/release-guide.html</A></LI>
+	<LI>Release process from Apache Geronimo: <A href="http://cwiki.apache.org/GMOxPMGT/release-manager-checklist.html" class="external-link" rel="nofollow">http://cwiki.apache.org/GMOxPMGT/release-manager-checklist.html</A></LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das-releases.html b/site/trunk/site-publish/das-releases.html
new file mode 100644
index 0000000000..830d18dc41
--- /dev/null
+++ b/site/trunk/site-publish/das-releases.html
@@ -0,0 +1,129 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DAS Releases : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=49424">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="sandbox-for-website.html" title="Sandbox for website">Sandbox for website</A>&nbsp;&gt;&nbsp;<A href="das.html" title="DAS">DAS</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Releases">DAS Releases</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="DASReleases-DASReleases"></A>DAS Releases</H1>
+
+<H2><A name="DASReleases-DASM2ReleaseKeyFeatures"></A>DAS M2 Release - Key Features</H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>To download DAS M2 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+
+<H2><A name="DASReleases-DASM2ReleaseKeyFeatures"></A>DAS M2 Release - Key Features</H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<P>To download DAS M1 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/das-users-guide.html b/site/trunk/site-publish/das-users-guide.html
new file mode 100644
index 0000000000..6f123edd39
--- /dev/null
+++ b/site/trunk/site-publish/das-users-guide.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS Users Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=49510">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="das.html" title="DAS">DAS</A>&nbsp;&gt;&nbsp;<A href="" title="DAS Users Guide">DAS Users Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/das.html b/site/trunk/site-publish/das.html
new file mode 100644
index 0000000000..e05c233304
--- /dev/null
+++ b/site/trunk/site-publish/das.html
@@ -0,0 +1,202 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DAS</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47935">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="DAS">DAS</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+   <TD class="confluenceTd" valign="top" width="12%">
+      <H4><A name="DAS-TuscanyDAS"></A>Tuscany DAS</H4>
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20Documentation&linkCreation=true&fromPageId=49089" class="createlink">DAS Documentation</A><BR>
+<A href="das-java-release-contents.html" title="DAS Java Release Contents">DAS Java Release Contents</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A></P>
+      <H4><A name="DAS-General"></A>General</H4>
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Home" class="external-link" rel="nofollow">Home</A><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">News &amp; Events</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A><BR>
+<A href="http://www.apache.org/" class="external-link" rel="nofollow">ASF</A></P>
+      <H4><A name="DAS-Community"></A>Community</H4>
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://apache-tuscany.blogspot.com/" class="external-link" rel="nofollow">Blog</A></P>
+
+</TD>
+   <TD class="confluenceTd" valign="top" width="88%">
+      <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H4><A name="DAS-WhatisDataAccessService%3F"></A>What is Data Access Service?</H4>
+
+<P>Service Data Object(SDO) provides a uniform API for handling different types of data. Data Access Service (DAS) simplifies handling of data when interacting with the back-end data source and frees application developers from dealing with tedious and error-prone transformation between end source types and SDO Data Object Types/properties. </P>
+
+<P>Tuscany provides implementation for different flavors of DAS in two languages, Java and C++. Please follow the link under each language to explore what is available or is in progress. We welcome your help to extend support for other back-end data source types or complete the existing solutions.</P>
+
+<P>The following diagram illustrates a typical client interaction. The client starts by reading a graph of data and makes modifications to the graph, possibly by adding elements, and then requests the DAS to push the changes back to the data source.<BR>
+<SPAN class="image-wrap" style=""><IMG src="das-overview.data/sdo_das_sm.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="DAS-LearnmoreaboutDAS"></A>Learn more about DAS	</H3>
+
+<UL>
+	<LI><A href="http://incubator.apache.org/tuscany/RDB_DAS_white_paper_v-0.2.pdf" class="external-link" rel="nofollow">The Data Access Service: How to access relational data in terms of Service Data Objects</A>, a White Paper</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://java.sys-con.com/read/260053.htm" class="external-link" rel="nofollow">How to access relational data in terms of Service Data Objects</A>, Java Developer Journal Article by Kevin Williams</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="das-overview.data/RDB-DAS-Overview.pdf">Tuscany DAS Overview </A>, Kevin Williams and Luciano Resende</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://lresende.blogspot.com/" class="external-link" rel="nofollow">Luciano's blog on SDO/DAS and other SOA technologies</A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="das-overview.data/das-data-services-v01.pdf">Data Service and SCA</A>, Luciano Resende</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The</SUB> <SUB><A href="http://www.apache.org/" class="external-link" rel="nofollow"><SUB>Apache Software Foundation (ASF)</SUB></A></SUB><SUB>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf b/site/trunk/site-publish/delete-java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf
new file mode 100644
index 0000000000..aa2f5ffe41
--- /dev/null
+++ b/site/trunk/site-publish/delete-java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf
diff --git a/site/trunk/site-publish/delete-java-sca-architecture-overview.html b/site/trunk/site-publish/delete-java-sca-architecture-overview.html
new file mode 100644
index 0000000000..6a1eaed7e0
--- /dev/null
+++ b/site/trunk/site-publish/delete-java-sca-architecture-overview.html
@@ -0,0 +1,179 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : DELETE- Java SCA Architecture Overview</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="DELETE- Java SCA Architecture Overview">DELETE- Java SCA Architecture Overview</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Apache Tuscany SCA Java Architecture</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+At the moment we are pulling different pieces of information in one place and then we'll decide on how to organize the information.</P>
+<UL>
+	<LI><A href="#DELETE-JavaSCAArchitectureOverview-ArchitectureOverview">Architecture Overview</A></LI>
+	<LI><A href="#DELETE-JavaSCAArchitectureOverview-KernelDefinition">Core</A>
+	<UL>
+		<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Kernel%20Architecture%20Guide" class="external-link" rel="nofollow">Kernel Architecture</A></LI>
+		<LI><A href="http://cwiki.apache.org/confluence/download/attachments/47512/TuscanyJAVASCA.pdf" class="external-link" rel="nofollow">How it looked in M2 release?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#DELETE-JavaSCAArchitectureOverview-ExtensionDefinition">Extension</A></LI>
+	<LI><A href="#DELETE-JavaSCAArchitectureOverview-RuntimeDefinition">Runtime</A></LI>
+	<LI><A href="#DELETE-JavaSCAArchitectureOverview-Mediator">Data Binding </A></LI>
+</UL>
+
+
+<P><BR class="atl-forced-newline">
+&nbsp;</P>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="DELETE-JavaSCAArchitectureOverview-"></A><A name="DELETE-JavaSCAArchitectureOverview-ArchitectureOverview"></A><FONT color="#0099cc">Architecture Overview</FONT></H3>
+<P>The SCA Java runtime is composed of a <EM>kernel</EM> and extensions. The kernel is essentially a multi-VM wiring engine that connects components together using the principles of <A href="http://en.wikipedia.org/wiki/Dependency_injection" class="external-link" rel="nofollow">Dependency Injection</A>, or <A href="http://en.wikipedia.org/wiki/Inversion_of_control" class="external-link" rel="nofollow">Inversion of Control</A>.</P>
+
+<H3><A name="DELETE-JavaSCAArchitectureOverview-"></A><A name="DELETE-JavaSCAArchitectureOverview-KernelDefinition"></A><FONT color="#0099cc">Kernel</FONT></H3>
+<P>The kernel is designed to be simple and limited in its capabilities: it wires functional units together. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions. The kernel extension model is based on the SCA 1.0 Java programming and assembly model. In otherwords, the kernel uses SCA to bootstrap itself. The mechanics of how this is done are described in detail in <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Kernel%20Architecture%20Guide" class="external-link" rel="nofollow">Kernel Architecture Guide</A>. </P>
+
+<P>The kernel is divided into a number of modules: <EM>api</EM>, <EM>host_api</EM>, <EM>spi</EM> and <EM>core</EM>. The <EM>api</EM> module defines Tuscany proprietary programming model annotations and APIs. The <EM>host_api</EM> module defines APIs for interacting with the kernel. The <EM>spi</EM> module defines extension points and abstract helper classes. The <EM>core</EM> module contains the kernel implementation. </P>
+
+<H3><A name="DELETE-JavaSCAArchitectureOverview-"></A><A name="DELETE-JavaSCAArchitectureOverview-ExtensionDefinition"></A><FONT color="#0099cc">Extension</FONT></H3>
+<P>Extensions enhance the kernel with specific sets of functionality. Extension types are not fixed and the kernel is designed to be as flexible as possible by providing an open-ended extension model. From the kernel perspective, extensions are just a set of SCA components. However, there are a number of known extension types defined by the <EM>spi</EM> module, including:</P>
+
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+</UL>
+
+
+<P>There are also a number of add-on extensions that do not correspond to a well-know type:</P>
+
+<UL>
+	<LI>The JPA extension for O/R mapping</LI>
+	<LI>The Geronimo Transaction Manager extension for transactional support in the runtime</LI>
+	<LI>The HOWL-based Persistent Store extension for high-throughput persistence of conversational state</LI>
+</UL>
+
+
+<P>More detail can be found in the <A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extensions Guide</A>.</P>
+
+<H3><A name="DELETE-JavaSCAArchitectureOverview-"></A><A name="DELETE-JavaSCAArchitectureOverview-RuntimeDefinition"></A><FONT color="#0099cc">Runtime</FONT></H3>
+<P>The kernel is designed to be embedded in, or provisioned to, a number of different host environments. For example, the kernel may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or JEE application server. There is even a Maven runtime that embeds kernel for integration testing. Runtime capabilities may vary based on the host environment.     </P>
+
+
+<H3><A name="DELETE-JavaSCAArchitectureOverview-"></A><A name="DELETE-JavaSCAArchitectureOverview-mediator"></A><FONT color="#0099cc">Data Binding </FONT></H3>
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Not sure if this belongs to this page or not</P>
+
+<P>Data  provides transparent data mapping between different types of data that can be exchanged between caller of a service and the service itself given the format of the data that will be supplied by the client. Data Mediator will do this transformation given the following information:</P>
+<OL>
+	<LI>format of the data that can be consumed by the service</LI>
+	<LI>format of the data that will be sent by the client</LI>
+</OL>
+
+
+<P>You can find more detailed information about databinding at this <A href="http://cwiki.apache.org/confluence/display/~rfeng/Tuscany%20Databinding" class="external-link" rel="nofollow">link</A></P>
+
+<P></P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-java-sca-kernel.html b/site/trunk/site-publish/delete-java-sca-kernel.html
new file mode 100644
index 0000000000..eff6c48b09
--- /dev/null
+++ b/site/trunk/site-publish/delete-java-sca-kernel.html
@@ -0,0 +1,119 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Delete-Java SCA Kernel</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47694">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Delete-Java SCA Kernel">Delete-Java SCA Kernel</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="Delete-JavaSCAKernel-Links"></A>Links</H4>
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Kernel%20Architecture&linkCreation=true&fromPageId=47698" class="createlink">Architecture</A><BR>
+<A href="http://www.buildtuscany.com/" class="external-link" rel="nofollow">Build Status</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+<H3><A name="Delete-JavaSCAKernel-TheKernel"></A>The Kernel</H3></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-junk.html b/site/trunk/site-publish/delete-junk.html
new file mode 100644
index 0000000000..6fd503c216
--- /dev/null
+++ b/site/trunk/site-publish/delete-junk.html
@@ -0,0 +1,211 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Delete-Junk</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47709">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Delete-Junk">Delete-Junk</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+<H2><A name="Delete-Junk-SCAJavaDocumentationfor1.x"></A>SCA Java Documentation for 1.x</H2>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Getting Started with Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides help you to get setup in Tuscany, develop and run a simple application using comand line or Eclipse.</P>
+
+<UL>
+	<LI><A href="getting-started-with-tuscany-using-the-command-line.html" title="Getting Started with Tuscany ( using the Command Line)">Get Started with Tuscany using Command Line</A><BR>
+This is a quick getting started guide that shows you how to download the latest release, run the calculator sample and then how to use the calculator sample project as a basis for you own projects</LI>
+	<LI><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Get Started with Tuscany using Eclipse</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany SCA distribution manually installed into Eclipse</LI>
+	<LI><A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Get Started with Tuscany using Tuscany Eclipse plugins</A><BR>
+This quick guide goes trough the steps of building the store scenario using Tuscany Eclipse plugins.</LI>
+	<LI><A href="build-your-first-web-services-with-tuscany.html" title="Build your first Web Services with Tuscany">Building your first web services using Tuscany</A><BR>
+This is a quick guide that go trough the steps of exposing your pojo component as web services.</LI>
+	<LI><A href="import-existing-tuscany-sca-projects-into-eclipse.html" title="Import existing Tuscany SCA projects into Eclipse">Importing existing Tuscany SCA projects into Eclipse</A><BR>
+This is a quick guide to show you how to import Tuscany samples and tests into the Eclipse environment.</LI>
+</UL>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Introduction</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>provides a quick introduction to SCA and links to the SCA specifications <BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Quick%2BGuide%2Bto%2BSCA&linkCreation=true&fromPageId=47710" class="createlink">Introduction to SCA</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA User Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides provide the following information:</P>
+<UL>
+	<LI>How to develop and run applications using Tuscany in a single node or multi node environment<BR>
+<A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A></LI>
+	<LI>What are the available Tuscany extensions and how to use them? This includes bindings, impelementation types, interface types, policies, databindings.<BR>
+<A href="sca-java-user-reference.html" title="SCA Java User Reference">Extension Guide</A></LI>
+	<LI>Available development and management tools for Tuscany<BR>
+<A href="sca-java-tools-guides.html" title="SCA Java Tools Guides">SCA Java Tools Guides</A></LI>
+</UL>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA Extension Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>Although Tuscany provides many <A href="sca-java-user-reference.html" title="SCA Java User Reference">extensions</A>, you might be interested to add an extension that is not available today. This guide helps you understand how to develop extensions such <BR>
+as new bindings, implementation types, interfaces, policies, etc.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> You are welcome to contribute these new extensions to Tuscany and make them available to others in the community.</P>
+
+<UL>
+	<LI><A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Adding a new extension</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Databinding%20Guide&linkCreation=true&fromPageId=47710" class="createlink">Adding a new data binding</A></LI>
+</UL>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA Java Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides help you learn more about Tuscany architecture and how to get involved in the <BR>
+development of Tuscnay. We look forward to your help.</P>
+<UL>
+	<LI><A href="sca-java-development-guide.html" title="SCA Java Development Guide">Development Guide</A><BR>
+If you would like to contribute to the project, this guide explains how to build Java SCA and how to contribute code back to the project.</LI>
+	<LI><A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+This guide provides a high level view of SCA Java architecture.</LI>
+	<LI><A href="security-aware-programming-in-tuscany.html" title="Security Aware Programming in Tuscany">Security aware programming guide</A>  This guide shows the Tuscany developer how to write core and extension code that correctly employs the Java security features<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Also available in <A href="http://vcasmo.com/video/beckerdo/2750" class="external-link" rel="nofollow"><B>Video</B></A>, use tuscany passcode</LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Build%20Your%20Own%20Tuscany%20Distribution" class="external-link" rel="nofollow">Build Your Own Distribution </A></LI>
+	<LI><A href="http://tuscany.apache.org/doc/javadoc/java-sca-1.4/" class="external-link" rel="nofollow">JavaDocs API Documentation (Tuscany 1.4) </A> See classes and methods you can use in your Tuscany applications.</LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+<H3><A name="Delete-Junk-JavaSCADocumentation"></A>Java SCA Documentation</H3>
+
+<P>Documentation is a bit light at the moment <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png
diff --git a/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png.jpeg b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.png.jpeg
diff --git a/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.svg b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.svg
new file mode 100644
index 0000000000..4de33edb54
--- /dev/null
+++ b/site/trunk/site-publish/delete-old-sca-developer-guide.data/component.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300.6687"
+   height="122.19577"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   version="1.0"
+   sodipodi:docbase="/Users/jboynes"
+   sodipodi:docname="component.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.92365554"
+     inkscape:cx="375"
+     inkscape:cy="130.24431"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="1052.3622px"
+     height="744.09448px"
+     showborder="false"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1435"
+     inkscape:window-height="1255"
+     inkscape:window-x="882"
+     inkscape:window-y="149" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-26.546207,-185.20959)">
+    <g
+       id="g9423"
+       transform="matrix(0.2941487,0,0,0.3361663,58.563052,101.23705)">
+      <rect
+         ry="45.714287"
+         rx="45.714287"
+         y="335.21933"
+         x="168.57143"
+         height="245.71428"
+         width="448.57144"
+         id="rect2160"
+         style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="rect7442"
+         d="M 125.38134,380.60067 L 185.63561,380.60067 L 214.61869,408.07647 L 185.63561,435.55228 L 125.38134,435.55228 L 155.12712,408.07647 L 125.38134,380.60067 z "
+         style="fill:#4bad2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#4bad2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 125.38134,474.88638 L 185.63561,474.88638 L 214.61869,502.36218 L 185.63561,529.83799 L 125.38134,529.83799 L 155.12712,502.36218 L 125.38134,474.88638 z "
+         id="path8414"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#c839c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 572.51773,381.1874 L 632.772,381.1874 L 661.75508,408.6632 L 632.772,436.13901 L 572.51773,436.13901 L 602.26351,408.6632 L 572.51773,381.1874 z "
+         id="path8416"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path9387"
+         d="M 572.51773,471.1874 L 632.772,471.1874 L 661.75508,498.6632 L 632.772,526.13901 L 572.51773,526.13901 L 602.26351,498.6632 L 572.51773,471.1874 z "
+         style="fill:#c839c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="320.48761"
+         x="319.15961"
+         height="40.058224"
+         width="41.140877"
+         id="rect9389"
+         style="fill:#800000;fill-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         y="320.48761"
+         x="437.15961"
+         height="40.058224"
+         width="41.140877"
+         id="rect9393"
+         style="fill:#800000;fill-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="149.40634"
+       y="193.81702"
+       id="text9419"><tspan
+         sodipodi:role="line"
+         id="tspan9421"
+         x="149.40634"
+         y="193.81702">Properties</tspan></text>
+    <text
+       id="text9432"
+       y="256.61099"
+       x="25.983707"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       xml:space="preserve"><tspan
+         y="256.61099"
+         x="25.983707"
+         id="tspan9434"
+         sodipodi:role="line">Services</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="260.24225"
+       y="256.77631"
+       id="text9436"><tspan
+         sodipodi:role="line"
+         id="tspan9438"
+         x="260.24225"
+         y="256.77631">References</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="136.15839"
+       y="255.19771"
+       id="text9440"><tspan
+         sodipodi:role="line"
+         id="tspan9442"
+         x="136.15839"
+         y="255.19771">Implementation</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="157.40636"
+       y="307.16513"
+       id="text10413"><tspan
+         sodipodi:role="line"
+         id="tspan10415"
+         x="157.40636"
+         y="307.16513">Intents</tspan></text>
+  </g>
+</svg>
diff --git a/site/trunk/site-publish/delete-old-sca-developer-guide.html b/site/trunk/site-publish/delete-old-sca-developer-guide.html
new file mode 100644
index 0000000000..4bbe950b55
--- /dev/null
+++ b/site/trunk/site-publish/delete-old-sca-developer-guide.html
@@ -0,0 +1,164 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DELETE- (OLD) SCA Developer Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46583">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="sca-java-documentation.html" title="SCA Java Documentation">SCA Java Documentation</A>&nbsp;&gt;&nbsp;<A href="" title="DELETE- (OLD) SCA Developer Guide">DELETE- (OLD) SCA Developer Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>There's nothing to it.</B> Really. Seriously, one of the main goals of Tuscany and SCA is to avoid imposing rules and requirements on how people write applications. We want to let people write application code the way they want without being concerned about the environment in which it will be used. After all, writing code to handle plumbing just gets in the way of writing the interesting stuff. So basically, you write the code for interesting bits, and Tuscany provides the environment that lets it run.</P>
+
+<P>As a result of that, this guide does not actually contain a lot of gory details on how to write an application for SCA. What it does contain is a description of the information that Tuscany uses to figure out how to run your code, the things that it can handle, and the things that it can't. As part of that it provides guidelines and best practices that you can use to make your code easier for others to use or that allow it to run in more places. This guide also describes the different environments that Tuscany supports (such as command line clients or web applications) and how to package up applications to run in them.</P>
+
+<H2><A name="DELETE-%28OLD%29SCADeveloperGuide-Components"></A>Components</H2>
+
+<P>The basic building block for SCA is a component. When you're writing code for SCA, you are typically writing code that will either be the implementation of a component or will be used by such an implementation.</P>
+
+<P>An SCA component follows the <SPAN class="nobr"><A href="http://www.google.com/search?q=Inversion%20of%20Control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> design pattern with Tuscany providing the controlling framework. A typical component can be illustrated as:<BR>
+<DIV align="center"><IMG src="delete-old-sca-developer-guide.data/component.png" border="0"></DIV><BR>
+where</P>
+<UL>
+	<LI>Services describe the function this type of component provides</LI>
+	<LI>References are dependencies this type of component has in order to function</LI>
+	<LI>Properties define configuration parameters for this type of component</LI>
+	<LI>Intents describe assumptions this type of component has on how it will be used</LI>
+	<LI>and Implementation is some code that actually does the work (i.e. what a developer writes)</LI>
+</UL>
+
+
+<P>Although the Tuscany runtime is written in Java, the implementation of a component can be in other languages some of which may be more suitable to the form of implementation than Java code (for example, BPEL for business processes or XSL-T for transformations). How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type; Tuscany provides several including:</P>
+
+<UL>
+	<LI><A href="java-implementation.html" title="Java Implementation">Java</A> for POJO style components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JUnit%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: JUnit Implementation" class="createlink">JUnit<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing of SCA components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Spring%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: Spring Implementation" class="createlink">Spring<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integrating Spring components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JavaScript%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: JavaScript Implementation" class="createlink">JavaScript<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for components written in JavaScript</LI>
+</UL>
+
+
+<P>Please see each sub-section for detailed information on implementing components in any of these languages.</P>
+
+<H2><A name="DELETE-%28OLD%29SCADeveloperGuide-Composites"></A>Composites</H2>
+<P>Individual components like those above can be used on their own, or they can be grouped together to form composite components. A composite is a type of component whose implementation is not code but an aggregation of other components co-operating to provide Services as a whole. A composite provides Services, has References to other dependencies, and can be configured using Properties in just the same way as individual components can.</P>
+
+<P>The typical implementation of a composite is described using XML defined by the SCA Assembly Specification (known as SCA Component Definition Language or SCDL). For information on how this is used in Tuscany, please see:</P>
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Composite%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: Composite Implementation" class="createlink">Composite<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+<P>&gt;&gt; Comment: Is this a good place to talk about wires? We talk about wires in the next section for the first time and it is out of context</P>
+
+<H2><A name="DELETE-%28OLD%29SCADeveloperGuide-DomainAssemblies"></A>Domain Assemblies</H2>
+
+<P>The implementations of components above, either individual or composite, all form reusable units that can be run multiple times in different environments (in much the same way as you have multiple instances of a Java class). A component becomes instantiated when it is actually used in an SCA environment. This is done by using it as part of the assembly of an SCA Domain.</P>
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>A domain is self-defining - it is what it is. It is really just a coherent grouping of components that are working together, connected to each other using SCA wiring. In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services but during development the goal is to make that <B>Someone Else's Problem</B> as all that baggage really just gets in the way of writing code.</P>
+
+<P>Making it <B>Someone Else's Problem</B> though does mean that at some point you need to hand them the implementations that you have been developing. This generally goes better if the code being handed over has been well tested and packaged up nicely (sometimes with a bow on it). Tuscany provides some build-time tools to help with this:</P>
+<UL>
+	<LI>A <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-itest-plugin" title="Visit page outside Confluence" rel="nofollow">itest Maven plugin<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> to support integration testing</LI>
+	<LI>A <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-war-plugin" title="Visit page outside Confluence" rel="nofollow">war Maven plugin<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> to package a self contained web application</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/delete-overview.html b/site/trunk/site-publish/delete-overview.html
new file mode 100644
index 0000000000..198a715af2
--- /dev/null
+++ b/site/trunk/site-publish/delete-overview.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Delete-Overview</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47718">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Delete-Overview">Delete-Overview</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="Delete-Overview-JavaSCAProject"></A>Java SCA Project</H3>
+
+<P>The Java SCA project provides infrastructure for creating service-based systems. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-sca-java-documentation-delete.html b/site/trunk/site-publish/delete-sca-java-documentation-delete.html
new file mode 100644
index 0000000000..99549d2a3e
--- /dev/null
+++ b/site/trunk/site-publish/delete-sca-java-documentation-delete.html
@@ -0,0 +1,121 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>DELETE- SCA Java Documentation DELETE : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=34768">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Subproject</A>&nbsp;&gt;&nbsp;<A href="" title="DELETE- SCA Java Documentation DELETE">DELETE- SCA Java Documentation DELETE</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>Thanks for your interest in Apache Tuscany Java SCA.</P>
+
+<P>If you are just getting started and are interested to learn about SCA</P>
+<UL>
+	<LI><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+This introduces you to SCA concepts and shows you how to build simple sample applications.</LI>
+</UL>
+
+
+<P>If you would like to contribute to the project itself, we have a</P>
+<UL>
+	<LI><A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+This explains how to build Tuscany from the latest source code and also how to contribute code back to the project.</LI>
+</UL>
+
+
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Guide&linkCreation=true&fromPageId=34768" title="Create Page: Java SCA Extension Guide" class="createlink">Extension Development Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+This guide explains how to develop code that extends Tuscany.  </LI>
+</UL>
+
+
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Architecture%20Guide&linkCreation=true&fromPageId=34768" title="Create Page: Java SCA Architecture Guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+This covers how to add a component or binding extension.</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/delete-this-page-old-introduction-page.html b/site/trunk/site-publish/delete-this-page-old-introduction-page.html
new file mode 100644
index 0000000000..8f56a6bab5
--- /dev/null
+++ b/site/trunk/site-publish/delete-this-page-old-introduction-page.html
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>delete this page (old introduction page) : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="delete this page (old introduction page)">delete this page (old introduction page)</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <P>delete this page</P>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/delete-this-page-using-sdo-java.html b/site/trunk/site-publish/delete-this-page-using-sdo-java.html
new file mode 100644
index 0000000000..97e4cfda70
--- /dev/null
+++ b/site/trunk/site-publish/delete-this-page-using-sdo-java.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Delete This Page - Using SDO Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48494">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Delete This Page - Using SDO Java">Delete This Page - Using SDO Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="DeleteThisPage-UsingSDOJava-GettingStartedwithusingSDOJava"></A>Getting Started with using SDO Java</H3>
+<P><SPAN class="error">&#91;Note: Content of this page is moved to user guide&#93;</SPAN></P>
+
+<P>As an SDO user,  you have (at least) three ways of establishing a Tuscany SDO runtime environment on your machine.  In decreasing order of likelihood, you can either </P>
+<UL>
+	<LI><A href="sdo-java-download.html" title="SDO Java Download">download</A> a binary distribution of a Tuscany Java SDO milestone release, and follow the instructions in the release archive</LI>
+	<LI>Or you can <A href="getting-source.html" title="Getting Source">download</A> a Tuscany source distribution, and follow the instruction in the release archive to recreate the corresponding binary release</LI>
+	<LI>or you can <A href="getting-source.html" title="Getting Source">build from the svn repository</A> source code, giving you the flexibility to base your runtime on the most recent code, or a particular level of your choice.</LI>
+</UL>
+
+
+<P>If you are going to take either of the latter two approaches you will need to <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">establish a development environment</A>.</P>
+
+<P>For examples of how to use SDO, you can look at the <A href="sdo-java-user-guide.html" title="SDO Java User Guide">documents</A> or at the samples.  If you have downloaded the source distribution, the sample code will be part of that distribution.  If however you have downloaded a binary distribution,  you'll need to go and <A href="http://incubator.apache.org/tuscany/sca_downloads.html" class="external-link" rel="nofollow">download</A> the sample source code as a separate archive.</P>
+
+<P>Other sources of inspiration might come from the use of SDO within the Tuscany DAS and SCA code.  When you come across issues, please look at and/or post to the Tuscany <A href="mailing-lists.html" title="Mailing Lists">mailing lists</A>.</P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/delete-this-page.html b/site/trunk/site-publish/delete-this-page.html
new file mode 100644
index 0000000000..fea8cb2582
--- /dev/null
+++ b/site/trunk/site-publish/delete-this-page.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>delete this page</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="delete this page">delete this page</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">delete this page</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A> on Mar 21, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=45009&originalId=49542">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>delete this page</P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/delete-tuscany-sca-databinding-faq.html b/site/trunk/site-publish/delete-tuscany-sca-databinding-faq.html
new file mode 100644
index 0000000000..35209d395b
--- /dev/null
+++ b/site/trunk/site-publish/delete-tuscany-sca-databinding-faq.html
@@ -0,0 +1,179 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Delete - Tuscany SCA - DataBinding - FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43356">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">Tuscany SCA Java - FAQ</A>&nbsp;&gt;&nbsp;<A href="" title="Delete - Tuscany SCA - DataBinding - FAQ">Delete - Tuscany SCA - DataBinding - FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="Delete-TuscanySCA-DataBinding-FAQ-SCADataBindingFAQs"></A>SCA DataBinding FAQs</H2>
+
+<OL>
+	<LI><B>What is he difference between Logical Type and Physical Type?  From the comments in DataType.java, logical type is used by the assembly, physical type is used by the runtime, and for Tuscany Java the physical type is always a Java Type</B><BR>
+     The logical type represents the data type the user thinks is flowing across a wire. This could be a Java type, a XML type, a CORBA type, whatever depending on the /logical/ service contract defined in the assembly.<BR>
+     The physical type is the actual representation of that type that is flowed by the runtime. In the Java runtime this will always be a Java type (i.e. some subclass of Object). In some cases it will be the same as the logical type - e.g. when a Java component calls another Java component over a local wire using a Java interface then both logical and physical types will be the same. In many cases though they will be different - for example, if the service contract was WSDL then the logical type would be the XML type used by the WSDL.<BR>
+     Within the runtime the same logical type may have different physical forms. For example, the same XML document could be represented physically as a DOM, a StAX stream, an SDO, a JAXB object, or an AXIOM stream. The framework supports conversion between these different physical forms. <BLOCKQUOTE></BLOCKQUOTE></LI>
+	<LI><B>What is the role of a data mediator interceptor? Can you cite an example of how mediation works say for a component A with reference R that references a service S in component B.?</B><BR>
+     The interceptor gets added by the connector. A's outbound wire and B's inbound wire describe the datatypes their implementations can support. When the wire ends are connected the connector adds the interceptor if mediation is needed.<BR>
+     One job of a transport binding is to convert an in-memory physical representation to a suitable set of bits on the network (aka serialization and deserialization). Rather than reinvent the different transports we reuse existing implementations such as Axis2 or RMI. As such we need to convert the physical representation on our internal wire with that used by the transport. So, for example, Axis2 only understands AXIOM so in a reference we need to convert the user's physical representation to AXIOM and in a service we need to convert the AXIOM generated by the transport into the form the user's implementation requires. The steps could be described as follows:
+	<OL>
+		<LI>A calls reference R with physical Java object X(java)</LI>
+		<LI>X is placed on R's outbound wire</LI>
+		<LI>data mediation converts X(java) to AXIOM object X(axiom)</LI>
+		<LI>X(axiom) is placed on inbound wire for the Axis2 binding</LI>
+		<LI>Axis2 binding serializes X(axiom) onto the network as XML</LI>
+		<LI>Axis2 binding on the target deserializes the XML from the network to X(axiom)</LI>
+		<LI>X(axiom) is placed on the outbound wire from the Axis2 binding</LI>
+		<LI>data mediation converts X(axiom) to X(java) as needed by the target component</LI>
+		<LI>X(java) is placed on B's inbound wire</LI>
+		<LI>the target instance for B is invoked passing in X(java)<BR>
+. An important thing to note here is that from the fabric's perspective we are dealing with two physical wires: the wire on the client connecting the source component A to the outbound Axis2 transport and the wire on the server connecting the inbound Axis2 transport to the target component B.<BR>
+From a global perspective there is one logical wire from A to B but because A and B are located on two different runtimes that logical wire gets split into two physical wires A-&gt;net and net-&gt;B.</LI>
+	</OL>
+	</LI>
+</OL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/deploying-to-server-runtime.html b/site/trunk/site-publish/deploying-to-server-runtime.html
new file mode 100644
index 0000000000..48482d6592
--- /dev/null
+++ b/site/trunk/site-publish/deploying-to-server-runtime.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Deploying to server runtime</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44882">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Deploying to server runtime">Deploying to server runtime</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/deployment.data/Artifact Resolver.gif b/site/trunk/site-publish/deployment.data/Artifact Resolver.gif
new file mode 100644
index 0000000000..61ce76471e
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Artifact Resolver.gif
diff --git a/site/trunk/site-publish/deployment.data/Artifact Resolver.gif.jpeg b/site/trunk/site-publish/deployment.data/Artifact Resolver.gif.jpeg
new file mode 100644
index 0000000000..942d8795fc
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Artifact Resolver.gif.jpeg
diff --git a/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF b/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF
new file mode 100644
index 0000000000..78eaf36891
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF
diff --git a/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF.jpeg b/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF.jpeg
new file mode 100644
index 0000000000..083363a289
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Diagram.GIF.jpeg
diff --git a/site/trunk/site-publish/deployment.data/Contribution Processors.gif b/site/trunk/site-publish/deployment.data/Contribution Processors.gif
new file mode 100644
index 0000000000..f06307f2ad
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Processors.gif
diff --git a/site/trunk/site-publish/deployment.data/Contribution Processors.gif.jpeg b/site/trunk/site-publish/deployment.data/Contribution Processors.gif.jpeg
new file mode 100644
index 0000000000..c01b8d5c74
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Processors.gif.jpeg
diff --git a/site/trunk/site-publish/deployment.data/Contribution Services.gif b/site/trunk/site-publish/deployment.data/Contribution Services.gif
new file mode 100644
index 0000000000..aa8e5b6fd2
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Services.gif
diff --git a/site/trunk/site-publish/deployment.data/Contribution Services.gif.jpeg b/site/trunk/site-publish/deployment.data/Contribution Services.gif.jpeg
new file mode 100644
index 0000000000..f87c460f22
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Contribution Services.gif.jpeg
diff --git a/site/trunk/site-publish/deployment.data/Tuscany_deployment.doc b/site/trunk/site-publish/deployment.data/Tuscany_deployment.doc
new file mode 100644
index 0000000000..6b11c9918a
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/Tuscany_deployment.doc
diff --git a/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg b/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg
new file mode 100644
index 0000000000..9a58f8fd84
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg
diff --git a/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg.jpeg b/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg.jpeg
new file mode 100644
index 0000000000..3d003e1391
--- /dev/null
+++ b/site/trunk/site-publish/deployment.data/tuscany_contribution_service.jpg.jpeg
diff --git a/site/trunk/site-publish/deployment.html b/site/trunk/site-publish/deployment.html
new file mode 100644
index 0000000000..418cd9d8c6
--- /dev/null
+++ b/site/trunk/site-publish/deployment.html
@@ -0,0 +1,299 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Deployment</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43501">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Deployment">Deployment</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="Deployment-1%29Addacontribution%26nbsp%3BtotheSCAdomain"></A>1) Add a contribution&nbsp;to the SCA domain</H2>
+
+<P><B>The contribution&nbsp;process is about adding Types to the domain (composites, classes, XSD&nbsp; complexTypes, etc).</B></P>
+
+<P>1. An SCA application is developed and packaged as a jar or another archive format</P>
+
+<P>2. The <B>ContributionService</B> is requested to add this jar as a contribution to the SCA domain. In effect, the SCA domain has a store to keep all the contributions.&nbsp; The ContributionService is an API that allows users to put contributions in the store. The contributions are identified by the URI. 3. Registered <B>ContributionProcessor</B>'s will be&nbsp;selected based on the contentType of the contribution. The ContributionProcessor is responsible to introspect the contribution which is a collection of artifacts. It may enlist other services to help, e.g the annotation processors for Java classes.We'd support a few well-known types in the core, primarily the ones used by the runtime like &quot;jar&quot; and &quot;java class&quot;.&nbsp;Others could be contributed as extensions,&nbsp;e.g &quot;rpm&quot; </P>
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Introspection of a contribution</B><BR>In general the result of that introspection would be invariant so it can be cached&nbsp;and replicated in many places.&nbsp;Introspection will be intensive and so we should do it as little as possible and&nbsp;caching the results is good.&nbsp;Of course, we'd need invalidation too.
+
+<P>The caching is about storing the introspection results for&nbsp;&quot;production&quot; artifacts that are basically versioned and immutable.&nbsp;This is similar in concept to the way Maven caches artifacts locally&nbsp;and never needs to go back to an online repo once they have been&nbsp;downloaded. Given some introspections are likely to be expensive&nbsp;(e.g. scanning an EAR to look for EJBs and then processsing the class&nbsp;files for annotations) it would be good to avoid redoing that when&nbsp;its not necessary.</P></TD></TR></TABLE></DIV>
+
+<P>3. The <B>ContributionProcessor</B> introspects the contribution to create a list of artifacts of interest for SCA. Each artifact is classified&nbsp;by ContentTypes.</P>
+
+<P>4. The artifacts are parsed by the content type.&nbsp;&nbsp;we&nbsp;provide parsers for SCDL (StAXElementLoader)&nbsp;and we&nbsp;can reuse existing parsers for XSD and WSDL (XmlSchema, wsdl4j, woden). So the WSDL introspector would parse the document using, say, wsdl4j and then store the interesting things that it finds.</P>
+
+<P>5.&nbsp;The interesting definitions are added to the contribution store&nbsp;and that is the end of the contribution operation.&nbsp;We keep the contribution and cache the introspection results. </P>
+
+<P>The following diagram is created to illustrate the key players that interacts with the ContributionService.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="deployment.data/tuscany_contribution_service.jpg" style="border: 0px solid black"></SPAN></P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>We could merge the ContributionProcessor and ArtifactProcessor concepts into one. If so, the processor for the jar will be called first, it scans the files in the jar and delegate the processors which can handle the content types, for example, WSDLProcessor to load WSDLs, XSDProcessor to load XSDs, JavaAnnotationProcessor to introspect java classes and SCDL loaders to load SCDL files.</TD></TR></TABLE></DIV>
+
+
+<H1><A name="Deployment-ContributionServicesImplementation"></A>Contribution Services Implementation</H1>
+
+<P>The contribution services is available in multiple modules at java/sca/runtime/services</P>
+
+<H4><A name="Deployment-ContributionModules"></A>Contribution Modules</H4>
+
+<P><SPAN class="image-wrap" style=""><IMG src="deployment.data/Contribution%20Diagram.GIF" style="border: 0px solid black"></SPAN></P>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Note that the Contribution Services Implementation have dependencies on the Kernel SPI <BR>
+   -&gt; LooaderRegistry<BR>
+   -&gt; SCA Model objects
+
+<P>The Kernel will have dependency on Contribution-Framework once things get integrated</P></TD></TR></TABLE></DIV>
+
+<H4><A name="Deployment-TheContributionServiceinterface"></A>The ContributionService interface</H4>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+/**
+ * Service <SPAN class="code-keyword">interface</SPAN> that manages artifacts contributed to a Tuscany runtime.
+ *
+ * @version $Rev: 523009 $ $Date: 2007-03-27 10:38:24 -0700 (Tue, 27 Mar 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ContributionService {
+    /**
+     * Contribute an artifact to the SCA Domain. The type of the contribution is
+     * determined by the Content-Type of the resource or, <SPAN class="code-keyword">if</SPAN> that is undefined,
+     * by some implementation-specific means (such as mapping an extension in
+     * the URL's path).
+     * 
+     * @param contributionURI The URI that is used as the contribution unique ID. 
+     * @param sourceURL the location of the resource containing the artifact
+     * @param storeInRepository flag that identifies <SPAN class="code-keyword">if</SPAN> you want to copy the
+     *            contribution to the repository
+     * @<SPAN class="code-keyword">throws</SPAN> DeploymentException <SPAN class="code-keyword">if</SPAN> there was a problem with the contribution
+     * @<SPAN class="code-keyword">throws</SPAN> IOException <SPAN class="code-keyword">if</SPAN> there was a problem reading the resource
+     */
+    void contribute(URI contributionURI, URL sourceURL, <SPAN class="code-object">boolean</SPAN> storeInRepository) <SPAN class="code-keyword">throws</SPAN> ContributionException,
+        IOException;
+
+    /**
+     * Contribute an artifact to the SCA Domain.
+     * 
+     * @param contributionURI The URI that is used as the contribution unique ID.
+     * @param contributionContent a stream containing the resource being
+     *            contributed; the stream will not be closed but the read
+     *            position after the call is undefined
+     * @<SPAN class="code-keyword">throws</SPAN> DeploymentException <SPAN class="code-keyword">if</SPAN> there was a problem with the contribution
+     * @<SPAN class="code-keyword">throws</SPAN> IOException <SPAN class="code-keyword">if</SPAN> there was a problem reading the stream
+     */
+    void contribute(URI contributionURI, InputStream contributionContent)
+        <SPAN class="code-keyword">throws</SPAN> ContributionException, IOException;
+
+    /**
+     * Get the model <SPAN class="code-keyword">for</SPAN> an installed contribution
+     * 
+     * @param contribution The URI of an installed contribution
+     * @<SPAN class="code-keyword">return</SPAN> The model <SPAN class="code-keyword">for</SPAN> the contribution or <SPAN class="code-keyword">null</SPAN> <SPAN class="code-keyword">if</SPAN> there is no such
+     *         contribution
+     */
+    Contribution getContribution(URI contribution);
+
+    /**
+     * Adds or updates a deployment composite using a supplied composite
+     * (<SPAN class="code-quote">&quot;composite by value&quot;</SPAN> - a data structure, not an existing resource in the
+     * domain) to the contribution identified by a supplied contribution URI.
+     * The added or updated deployment composite is given a relative URI that
+     * matches the <SPAN class="code-quote">&quot;name&quot;</SPAN> attribute of the composite, with a <SPAN class="code-quote">&quot;.composite&quot;</SPAN>
+     * suffix.
+     */
+    void addDeploymentComposite(URI contribution, <SPAN class="code-object">Object</SPAN> composite);
+
+    /**
+     * Remove a contribution from the SCA domain
+     * 
+     * @param contribution The URI of the contribution
+     * @<SPAN class="code-keyword">throws</SPAN> DeploymentException
+     */
+    void remove(URI contribution) <SPAN class="code-keyword">throws</SPAN> ContributionException;
+
+    /**
+     * Resolve an artifact by QName within the contribution
+     * 
+     * @param &lt;T&gt; The java type of the artifact such as javax.wsdl.Definition
+     * @param contribution The URI of the contribution
+     * @param definitionType The java type of the artifact
+     * @param namespace The namespace of the artifact
+     * @param name The name of the artifact
+     * @<SPAN class="code-keyword">return</SPAN> The resolved artifact
+     */
+    &lt;T&gt; T resolve(URI contribution, <SPAN class="code-object">Class</SPAN>&lt;T&gt; definitionType, <SPAN class="code-object">String</SPAN> namespace, <SPAN class="code-object">String</SPAN> name);
+
+    /**
+     * Resolve the reference to an artifact by the location URI within the given
+     * contribution. Some typical use cases are:
+     * &lt;ul&gt;
+     * &lt;li&gt;Reference a XML schema using
+     * {http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema-instance}schemaLocation or
+</SPAN>     * &lt;li&gt;Reference a list of WSDLs using
+     * {http:<SPAN class="code-comment">//www.w3.org/2004/08/wsdl-instance}wsdlLocation
+</SPAN>     * &lt;/ul&gt;
+     * 
+     * @param contribution The URI of the contribution
+     * @param namespace The namespace of the artifact. This is <SPAN class="code-keyword">for</SPAN> validation
+     *            purpose. If the namespace is <SPAN class="code-keyword">null</SPAN>, then no check will be
+     *            performed.
+     * @param uri The location URI
+     * @param baseURI The URI of the base artifact where the reference is
+     *            declared
+     * @<SPAN class="code-keyword">return</SPAN> The URL of the resolved artifact
+     */
+    URL resolve(URI contribution, <SPAN class="code-object">String</SPAN> namespace, URI uri, URI baseURI);
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Deployment-ContributionServicesUMLDiagrams"></A>Contribution Services UML Diagrams</H4>
+
+<P><B>Contribution Services</B></P>
+
+<P><SPAN class="image-wrap" style=""><A class="confluence-thumbnail-link 1738x1275" href="deployment.data/Contribution%20Services.gif"><IMG src="deployment.data/Contribution%20Services.gif.jpeg" style="border: 0px solid black"></A></SPAN></P>
+
+<P><B>Contribution Processors</B></P>
+
+<P><SPAN class="image-wrap" style=""><A class="confluence-thumbnail-link 1325x1169" href="deployment.data/Contribution%20Processors.gif"><IMG src="deployment.data/Contribution%20Processors.gif.jpeg" style="border: 0px solid black"></A></SPAN></P>
+
+<P><B>Artifact Resolver</B></P>
+
+<P><SPAN class="image-wrap" style=""><A class="confluence-thumbnail-link 952x1413" href="deployment.data/Artifact%20Resolver.gif"><IMG src="deployment.data/Artifact%20Resolver.gif.jpeg" style="border: 0px solid black"></A></SPAN></P>
+
+
+<H2><A name="Deployment-2%29ApplyChangestotheAssembly"></A>2) Apply Changes to the Assembly</H2>
+
+<P><B>The assembly is about creating/modifying/ removing instances of things (primarily components).</B></P>
+
+<P>1. User calls &quot;addToDomainComosite&quot;&nbsp;or &quot;applyChanges&quot; aginst the <B>AssemblyService</B>.&nbsp;There is a changeSet which represents an atomic modification to the domain,&nbsp;for example, adding an &quot;include&quot; to the domain composite.</P>
+
+<P>2. The assembly service applies this to the current logical assembly creating a new revision of the assembly.</P>
+
+<P>3. The action in the changeSet will need to be expanded out, e.g.</P>
+<UL>
+	<LI>The &lt;include&gt; will need to be resolved to a composite.&nbsp;</LI>
+	<LI>The content of the composite will need to be examined and result in new components being defined</LI>
+	<LI>Those components will have implementations that need to be run and requirements on where&nbsp;and so forth</LI>
+</UL>
+
+
+<P>There is a resolution phase that is used to build a fully configured logical model where references (things like composite names, class names, etc) are resolved this is done using the contribution service&nbsp;to retrieve the target artifacts for the references. It calls back the contribution service to resolve the cross-references&nbsp;probably via&nbsp;a different api&nbsp;but it is going to the store.So now we have a fully resolved logical configuration model. Errors may be reported during the resolve phase&nbsp;such as:</P>
+<UL>
+	<LI>No such composite</LI>
+	<LI>No such service</LI>
+	<LI>WSDL portType cannot be resolved</LI>
+</UL>
+
+
+<P>But we also run a logical validation on the resulting model,&nbsp;e.g. checking that if wires connect.</P>
+
+<P>4. Convert the new logical model to a set of physical models which involves allocating pieces of the model to physical runtimes&nbsp;so that they can be consumed by the runtime to activate the components. This is done by creating physical changeSets for each runtime.</P>
+
+<P>5. The physical models are propagated to the given runtime by some means (via the FederatedDeployer suppor that Meeraj's working on) </P>
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Physical models for the runtime</B><BR>The changeSet for the physical runtime is meant to be very precise and&nbsp;the builder's role is to turn that into runnable code. So it's not SCDL stuff but much lower level. The&nbsp;idea is to keep the builder very simple (and hence quite testable) that means there is a bit more work in the conversion from logical to physical,&nbsp;bascially a &quot;portable&quot; builder.<BR>
+The conversion will&nbsp;use the introspection results from the store to generate the builder configuration,&nbsp;for example,&nbsp;suppose introspection discovers a component has an @Init method,&nbsp;we store that in the introspection result. The ContributionProcessor&nbsp;might load the java classes to introspect the annotations. (It may not actually load the class using a class loader since it could parse bytecode e.g. with ASM).&nbsp;But the result is an extended implemenation description. We need a langauge neutral form for that&nbsp;so ideally it can be used on both a Java and Native platform. It's something that goes beyond the componentType&nbsp;and it's the PojoComponentType type of thing, but more.
+
+<P>The idea of &quot;portable builders&quot; is about separating the node&nbsp; responsible for domain assembly from the nodes running component&nbsp; implementations. In a heterogeneous federation, it could be the&nbsp; assembly node(s) are running C+&#43; but the user wants to add a Java&nbsp; component that will actually run on a Java node. If the introspection&nbsp; results for the Java contribution are portable, it would be possible&nbsp; for the C+&#43; to set up the physical configuration for the Java&nbsp; builder; alternatively, it could delegate that to a service running&nbsp; in a native Java environment. Similarly, if the component was in some&nbsp; portable language (like Ruby or XSLT), then the configuration could&nbsp; be done on a Java node and passed to a C+&#43; runtime node.</P></TD></TR></TABLE></DIV>
+<P>6. The next steps&nbsp;is the build/connect/run. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/design-discussions.html b/site/trunk/site-publish/design-discussions.html
new file mode 100644
index 0000000000..361e89479c
--- /dev/null
+++ b/site/trunk/site-publish/design-discussions.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Design Discussions : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=67708">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="das-java-subproject-menu.html" title="DAS Java Subproject Menu">DAS Java Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Design Discussions">Design Discussions</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P><A href="transaction-intents-and-transaction-manager-support.html" title="Transaction Intents and Transaction Manager support">Transaction Intents and Transaction Manager support</A></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/developing-sdo-java.html b/site/trunk/site-publish/developing-sdo-java.html
new file mode 100644
index 0000000000..6a768c89dd
--- /dev/null
+++ b/site/trunk/site-publish/developing-sdo-java.html
@@ -0,0 +1,282 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Developing SDO Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48496">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Developing SDO Java">Developing SDO Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>How to get involved in development of Java SDO?</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P>This document is the development guideline for SDO Java project.</P>
+<UL>
+	<LI><A href="#DevelopingSDOJava-GeneralGuide">General Guide</A></LI>
+	<LI><A href="#DevelopingSDOJava-GettingSourceandSetup">Getting Source code and Setting Development Environment</A></LI>
+	<LI><A href="#DevelopingSDOJava-CodingGuidelines">Coding Guidelines</A></LI>
+	<LI><A href="#DevelopingSDOJava-Testing">Testing</A></LI>
+	<LI><A href="#DevelopingSDOJava-MavenBuildStructure">Maven Build Structure</A></LI>
+	<LI><A href="#DevelopingSDOJava-Providingpatches">Reporting Issues and Providing patches</A></LI>
+</UL>
+
+
+<P><BR class="atl-forced-newline">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-GeneralGuide"></A><DIV class="" style="background-color: #C3CDA1;">General Guide</DIV>
+</H3>
+
+<P>Welcome to the Tuscany SDO Java subproject. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SDO sub-project aims to provide uniform access to data from heterogeneous sources which could be XML, RDB, POJO, SOAP, etc.</LI>
+	<LI>Tuscany Java SDO is not just a reference implementation. We encourage innovation based on the tenets of SDO. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>SDO provides both a static (or strongly typed) programming model and a dynamic (or loosely typed) programming model. This provides a simple programming model without sacrificing the dynamic model needed by tools and frameworks.</LI>
+	<LI>It supports a disconnected model and provides Meta-data for easy introspection of data types.</LI>
+</UL>
+
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-GettingSourceandSetup"></A><DIV class="" style="background-color: #C3CDA1;">Getting Source code and Setting Development Environment</DIV>
+</H3>
+
+
+<P>The Java SDO project Subversion repository is located at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo</A>.<BR>
+The repository can also be viewed online at <A href="http://svn.apache.org/viewvc/incubator/tuscany/java/" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/incubator/tuscany/java/</A></P>
+
+<P>Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so.</P>
+
+<H4><A name="DevelopingSDOJava-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows (note that it uses http scheme so if you're a committer change it to https):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout http:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/sdo</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="DevelopingSDOJava-CommittingChangestoSubversion"></A>Committing Changes to Subversion</H4>
+
+<P>Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.</P>
+
+<P>Once your password is set, you can use a command like this to commit:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn commit
+</PRE>
+</DIV></DIV>
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn --username &lt;name&gt; commit
+</PRE>
+</DIV></DIV>
+<P>Subversion will prompt you for a password, and once you've entered it, it will remember it for you. Note this is the password you configured with svnpasswd not your shell or other password.</P>
+
+<P>For more details check <A href="http://cwiki.apache.org/TUSCANY/getting-source.html" class="external-link" rel="nofollow">Getting Source</A>. Also for setup details check <A href="http://cwiki.apache.org/TUSCANY/set-up-sdo-development-environment.html" class="external-link" rel="nofollow">Establishing a Development Environment</A>. Reference the code structure at <A href="http://cwiki.apache.org/TUSCANY/sdo-project-code-structure.html" class="external-link" rel="nofollow">SDO Project Code Structure</A>. </P>
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-CodingGuidelines"></A><DIV class="" style="background-color: #C3CDA1;">Coding Guidelines</DIV>
+</H3>
+
+<P>There are a few simple guidelines when developing for JAVA SDO:</P>
+<UL>
+	<LI>The basic coding style used is described at <A href="http://java.sun.com/docs/codeconv/" class="external-link" rel="nofollow">Sun Java coding standards</A> but the main thing is to be consistent with the existing code you're updating, so for example, if you're updating a method that uses the braces on the same line style don't add code with the hanging braces style.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files (both source code files and resource files such as xml documents)</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for check-ins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<H4><A name="DevelopingSDOJava-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. </P>
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-Testing"></A><DIV class="" style="background-color: #C3CDA1;">Testing</DIV>
+</H3>
+
+<P>Tuscany uses plain junit test cases to perform unit and integration testing. You can check <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/impl/src/test/" class="external-link" rel="nofollow">Test Cases</A> for some examples.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a &#42;*/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-MavenBuildStructure"></A><DIV class="" style="background-color: #C3CDA1;">Maven Build Structure</DIV>
+</H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>All poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.sdo</LI>
+	<LI>Version of our modules will be specified once in java/sdo/pom.xml, child poms don't need to specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SDO</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn &#45;Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H3><A name="DevelopingSDOJava-"></A><A name="DevelopingSDOJava-Providingpatches"></A><DIV class="" style="background-color: #C3CDA1;">Reporting issues and providing patches</DIV>
+</H3>
+
+<P>You are very welcome to help us develop Tuscany SDO Java.  You may have ideas that you want to pursue yourself or you may wish to pitch in with the design, coding and documentation.  If it's the first of these two then please put forward your suggestions on the <A href="mailto:tuscany-dev@ws.apache.org" class="external-link" rel="nofollow">development mailing list</A>.  If it's the latter, then feel free to ask on the <A href="mailto:tuscany-dev@ws.apache.org" class="external-link" rel="nofollow">mailing</A> list or browse the issue tracking.</P>
+
+<H3><A name="DevelopingSDOJava-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="DevelopingSDOJava-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="DevelopingSDOJava-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="DevelopingSDOJava-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P>
+<P></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/developing-using-tuscany-sca-best-practices.html b/site/trunk/site-publish/developing-using-tuscany-sca-best-practices.html
new file mode 100644
index 0000000000..c5bc80585d
--- /dev/null
+++ b/site/trunk/site-publish/developing-using-tuscany-sca-best-practices.html
@@ -0,0 +1,172 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Developing using Tuscany SCA - Best Practices</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45520">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Developing using Tuscany SCA - Best Practices">Developing using Tuscany SCA - Best Practices</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>After writing the Alert Aggregator sample for the Tuscany Native runtime I thought it would be worthwhile documenting my experiences. I've titled this &quot;Best Practices&quot; but perhaps &quot;Hints &amp; Tips&quot; or &quot;Andy's Observations&quot; would be more appropriate&#33; Anyway, below is a suggested list of things to do/think about when writing your own SCA based applications. A few of the points below are from general software development, but they apply equally to SCA development.</P>
+
+<P>Start by drawing your SCA diagram (example <A href="http://people.apache.org/~ajborley/web2demo.png" class="external-link" rel="nofollow">here</A>) - this helps with the componentization of your app. SCA diagrams aren't code path diagrams (such as a BPEL visualization): they simply show what blocks of function you have and which blocks are used by other blocks. Separating components into composites also helps you think about componentization and deployment, as (currently) the smallest deployable block is a composite. Similarly, an SCA diagram is not a class diagram - the smallest SCA unit is the component which could consist of multiple classes or scripts or similar. You may have a requirement for a &quot;Utilities&quot; class providing some basic function that is used by lots of other classes - SCA wires involve a certain amount of overhead, so it may not be worth creating a &quot;Utilities&quot; component that all other components reference. Instead, it can be valid to have multiple instances of the same class embedded as part of multiple components.</P>
+
+<P>Think about the services and references that your components and composites provide/require, so you can draw the wiring on the diagram and work out which components and composites you need, but don't worry too much about bindings (REST, WS, etc) - SCA/Tuscany makes it so easy to switch bindings that this can be decided at a later time.</P>
+
+<P>I didn't worry too much about interfaces at this point - I planned to do most of my components in scripting languages (which don't need defined interfaces in Tuscany Native). In other languages (Java, C++) it may be worth defining the public interfaces that your component implements, so you can see how and where functions are implemented within your composites.</P>
+
+<P>When coding the component implementations, it's easiest to start with the 'least-dependent' components - those that don't need lots of other infrastructure or other components or composites in place. For the Alert Aggregator sample (see <A href="http://people.apache.org/~ajborley/web2demo.png" class="external-link" rel="nofollow">here</A>), my order of component development was as follows:<BR>
+RSSChecker<BR>
+AlertConfig<BR>
+AlertChecker<BR>
+HTMLFormatter<BR>
+POPChecker<BR>
+Of course, as in normal software development, this was an iterative process where each component got revisited as necessary.</P>
+
+<P>Component implementations were developed in a standard test-driven manner, but deploying within an SCA runtime adds extra layers of required testing (think unit vs. system tests). I began by testing my component implementations in a standalone, unit-testing-style fashion, then tested under Tuscany via local clients, then via remote clients using whichever service bindings I had chosen and finally via full system tests (in the Alert Aggregator case, through clicking on a web page). The power of SCA meant that I could use the same client code for both local and remote testing , just by adding in a local SCA reference that called the remote service (see the PythonCalculator sample for an example of this - the sample.calculator.client/client.py code is almost exactly the same as the sample.calculator.wsclient/client.py code).</P>
+
+<P>I found I needed to programme somewhat defensively - Tuscany SCA Native (or at least the extensions I used) is not yet particularly good at handling exceptions or errors that get thrown, but not caught, in component code. Instead, I tried to check for bad data and catch exception cases within the component implementation. The handling of errors is something that definately needs more work in Tuscany SCA Native - should errors get propagated back to the original client, or should they be caught and logged? A problem that exacerbates this issue is that some of our logging messages don't provide much (or any&#33;) useful information&#33;</P>
+
+<P>The XML story with Tuscany SCA Native is pretty good - I found using SDO/XML/Python ElementTree objects easy and very useful. I would probably go as far as suggesting that developers use XML complex types and SDO rather than trying to flow multiple method parameters, as this can mean less changes required in code and interfaces throughout the development cycle. </P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/discovery.html b/site/trunk/site-publish/discovery.html
new file mode 100644
index 0000000000..9771e3d84f
--- /dev/null
+++ b/site/trunk/site-publish/discovery.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Discovery</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35462">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Discovery">Discovery</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Discovery-Discovery"></A>Discovery</H1>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution1.png b/site/trunk/site-publish/distributed-runtime.data/distribution1.png
new file mode 100644
index 0000000000..4de2314697
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution1.png
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution1.png.jpeg b/site/trunk/site-publish/distributed-runtime.data/distribution1.png.jpeg
new file mode 100644
index 0000000000..6c8f18066f
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution1.png.jpeg
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution3.png b/site/trunk/site-publish/distributed-runtime.data/distribution3.png
new file mode 100644
index 0000000000..3134bc52ac
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution3.png
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution3.png.jpeg b/site/trunk/site-publish/distributed-runtime.data/distribution3.png.jpeg
new file mode 100644
index 0000000000..156056028f
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution3.png.jpeg
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution4.png b/site/trunk/site-publish/distributed-runtime.data/distribution4.png
new file mode 100644
index 0000000000..619f4e28ee
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution4.png
diff --git a/site/trunk/site-publish/distributed-runtime.data/distribution4.png.jpeg b/site/trunk/site-publish/distributed-runtime.data/distribution4.png.jpeg
new file mode 100644
index 0000000000..03a1d14cac
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.data/distribution4.png.jpeg
diff --git a/site/trunk/site-publish/distributed-runtime.html b/site/trunk/site-publish/distributed-runtime.html
new file mode 100644
index 0000000000..d3fced09e4
--- /dev/null
+++ b/site/trunk/site-publish/distributed-runtime.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Distributed Runtime</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52987">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Distributed Runtime">Distributed Runtime</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page has moved to the wiki at <A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Distributed%20Runtime" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Distributed+Runtime</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png b/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png
new file mode 100644
index 0000000000..44edc197da
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png.jpeg b/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png.jpeg
new file mode 100644
index 0000000000..8f5a8fa2db
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator-distributed.png.jpeg
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png b/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png
new file mode 100644
index 0000000000..69b9027a44
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png.jpeg b/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png.jpeg
new file mode 100644
index 0000000000..c52fe73a5c
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator2.png.jpeg
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png b/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png
new file mode 100644
index 0000000000..33d13a9ed1
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png.jpeg b/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png.jpeg
new file mode 100644
index 0000000000..7c77067545
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/calculator3.png.jpeg
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png b/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png
new file mode 100644
index 0000000000..4dfd1052f3
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png.jpeg b/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png.jpeg
new file mode 100644
index 0000000000..f664149db4
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/distributed-overview.png.jpeg
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png b/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png
new file mode 100644
index 0000000000..a047c2416c
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png
diff --git a/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png.jpeg b/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png.jpeg
new file mode 100644
index 0000000000..d7ef63e34d
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.data/multi-node-abstract.png.jpeg
diff --git a/site/trunk/site-publish/distributed-sca-domain.html b/site/trunk/site-publish/distributed-sca-domain.html
new file mode 100644
index 0000000000..7aa99478f9
--- /dev/null
+++ b/site/trunk/site-publish/distributed-sca-domain.html
@@ -0,0 +1,421 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Distributed SCA Domain</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66885">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Distributed SCA Domain">Distributed SCA Domain</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="DistributedSCADomain-CreateADistributedApplication"></A>Create A Distributed Application</H1>
+
+<P>An SCA assembly can be run in a single or multi-node environment. Here we introduce the Tuscany node and SCA domain and explain how the calculator example can be distributed across multiple nodes. </P>
+
+<H2><A name="DistributedSCADomain-Nodes"></A>Nodes</H2>
+
+<P>Node is a Tuscany specific term (you won't find it in the OASIS SCA specifications). The node wraps the Tuscany SCA runtime. The runtime comprises the modules that are present in the modules directory of the Tuscany SCA Java distribution. As you might expect there are functions that read XML, create an in memory model of the SCA assembly, create the components and wire them together ready to process incoming messages. </P>
+
+<P>A node runs an SCA assembly described by one or more composite files. A node runs in a single JVM. You can start more than one node in a single JVM if you need to but we only tend to do this for testing purposes. In the first section of the user guide we built a <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/calculator/" class="external-link" rel="nofollow">calculator sample</A> that included Calculator, Add, Subtract, Multiply and Divide components included in a single composite. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="distributed-sca-domain.data/calculator2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The composite was run using the following API;</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        node = SCANodeFactory.newInstance().createSCANodeFromClassLoader(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>, getClass().getClassLoader());
+        node.start();
+</PRE>
+</DIV></DIV>
+
+<P>This loads the named composite, and any associated resources, and then starts the node to start up all of the components within the composite. </P>
+
+<H3><A name="DistributedSCADomain-ConfiguringNodes"></A>Configuring Nodes</H3>
+
+<P>Creating a node in code is straightforward. For example,</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2 node = SCANodeFactory.newInstance().createSCANodeFromClassLoader(<SPAN class="code-quote">&quot;calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">null</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>Here the &quot;null&quot; parameter means that the node factory uses the current class' classloader to locate the named composite file. The location of the composite file is assumed to be the location of the SCA contribution. The assumption here is that only one contribution is required. </P>
+
+<P>If more contributions must be loaded by the node the following interface can be used.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2  node = SCANodeFactory.newInstance().createSCANode(<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>,
+        		                               <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>),
+                                                       <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution2&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution2&quot;</SPAN>));
+</PRE>
+</DIV></DIV>
+<P>Where</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Is the explicit location of the composite file to be run and</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+                    <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Shows how to provide contribution details. The first parameter &quot;CalculatorContribution1&quot; gives a name for the contribution. The second parameter tells the node where to find the contribution. As this second parameter is a URL the contribution can be read from disk or directly from the network. </P>
+
+<P>Using multiple contributions can be useful if, for example, you have chosen to separate common artifacts from those specific to this composite. The contribution containing common artifacts can then be used in other SCA applications without change.</P>
+
+<H3><A name="DistributedSCADomain-StartingaNode"></A>Starting a Node</H3>
+
+<P>Once the node is created it is configured and ready to be started. It can be started as follows.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.start();
+</PRE>
+</DIV></DIV>
+
+<H3><A name="DistributedSCADomain-LocatingServices"></A>Locating Services</H3>
+
+<P>If the node has been created from within a piece of Java code using the node fatory interface a local service reference can be retrieved in the following way.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+calculatorService = ((SCAClient)node).getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>One a node has been started all of its remote bindings will be active so you can also access the component services that the node contains via any remote bindings that they define. </P>
+
+<H3><A name="DistributedSCADomain-StoppingaNode"></A>Stopping a Node</H3>
+
+<P>If you are done with the node or need to stop it processing messages use the following.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.stop();
+</PRE>
+</DIV></DIV>
+
+
+<H2><A name="DistributedSCADomain-SCADomain"></A>SCA Domain</H2>
+
+<P>When running standalone a node defines the scope of component services that references can target by name. SCA defines the term SCA Domain to describe this scope. Section 10 of the SCA Assembly specification actually describes an SCA Domain as defining &quot;the boundary of visibility for all SCA mechanisms&quot;.</P>
+
+<P>In a standalone node a reference can only target services that are running within the same node. However nodes running in separate JVMs can be configured to run an SCA assembly in a distributed fashion. In this way components running on one node can reference components running on a separate node. To make this configuration work the nodes must be running as part of the same distributed SCA domain. In Tuscany a distributed SCA domain is represented using a separate domain manager process. </P>
+
+<H3><A name="DistributedSCADomain-Creatingcompositestorunacrossmultiplenodes."></A>Creating composites to run across multiple nodes. </H3>
+<P>From the <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/calculator/" class="external-link" rel="nofollow">calculator sample</A> you can see that the wires between the component references and services, formed by adding a target component name to a reference, are resolved inside an SCA domain comprising a single node. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="distributed-sca-domain.data/calculator2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>For example, this section of the calculator composite file shows how the CalcuatorServiceComponent targets the AddServiceComponent.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+ 
+    ...
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>The target=&quot;AddServiceComponent&quot; of the CalculatorServiceComponent's addService reference refers to the AddServiceComponent defined later on in this composite. A single composite must run on a single node so to distribute this application we need to separate it into more than one composite.</P>
+
+<P>In the <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/calculator-distributed/" class="external-link" rel="nofollow">distributed calculator</A> sample the composite defines the calculator component but not the add component;</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+ 
+    ...
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Another composite defines the add component. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Add&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+ 
+    ...
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>These two composites are run by separate nodes within the context of a single domain and the calculator addService reference </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>is still be able to find the add component running on a separate node. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="distributed-sca-domain.data/calculator3.png" style="border: 0px solid black"></SPAN></P>
+
+<P>So a distributed SCA domain can consist of more than one node/composite and wires can run between components defined in the separate composites. </P>
+
+<H3><A name="DistributedSCADomain-StartingADomain"></A>Starting A Domain</H3>
+
+<P>There is a launcher that has a mainline for starting the domain. For example, </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+        DomainManagerLauncher.main(args);
+    }
+</PRE>
+</DIV></DIV>
+
+<P>In the <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/calculator-distributed/" class="external-link" rel="nofollow">calculator-distributed</A> sample this code is contained in the class node.LaunchDomain.java. Runing this will run the domain mananger. </P>
+
+<P>This <A href="http://www.ibm.com/developerworks/webservices/library/ws-sca-tuscany/index.html?S_TACT=105AGX04&S_CMP=EDU" class="external-link" rel="nofollow">article</A> that is hosted outside of Tuscany provides a step by step instruction for how to use the Tuscany web-based domain manager UI to administer an SCA domain and how to use the domain administrative UI to deploy an SOA solution comprised of SCA components.</P>
+
+<H3><A name="DistributedSCADomain-ConfiguringADomainThroughTheDomainManagerWebInterface"></A>Configuring A Domain Through The Domain Manager Web Interface</H3>
+
+<P>Once the domain manager is running you can get to the web interface of the default domain by pointing your browser at <A href="http://localhost:9990/ui" class="external-link" rel="nofollow">http://localhost:9990/ui</A>. This provides a number of different pages allowing you to </P>
+
+<UL>
+	<LI>Add contributions to the domain</LI>
+	<LI>Add node configurations to the domain</LI>
+	<LI>Configure composites to run on specific nodes</LI>
+	<LI>Start local node instances to test the configuration</LI>
+</UL>
+
+
+<P>When you start the domain manager for the distributed calculator sample you will see the pages already populated with the information needed to execture the sample. </P>
+
+<H3><A name="DistributedSCADomain-ConfiguringaDomainThroughTheFileSystem"></A>Configuring a Domain Through The File System</H3>
+
+<P>Behind the domain manager web application there are three files where the configuration information is stored. </P>
+
+<P><B>workspace.xml</B> - stores the ID and location of each contribution that has been added to the domain.</P>
+
+<P><B>domain.composite</B> - the virtual domain composite. This is an SCA composite that represents the virtual domain which includes all of the composites that will run in the domain. A URI is provided which indicates which contribution each composite comes from. Ultimately an SCANode instance will be started for each composite included in the virtual domain. Each SCANode instance can be running on separate/distributed processors. So the virtual domain is a consolidated description of you distributed SCA application</P>
+
+<P><B>cloud.composite</B> - describes the compute cloud (the set of distributed SCANode instances) being used to run the SCA application. Each node is assigned a composite and also has details of the configuration of bindings when they run on that node, for example, the root URI is set. It's possibly slightly confusing that this file is in SCA composite format also but this is a convenience because firstly we didn't have to create a new file format and secondly there may be some benefit in the future of representing this network of nodes as a network of SCA services for management purposes although we don't do that yet.</P>
+
+<P>These files are updated when you make changes to the domain through the domain manager interface but they have a fairly simple XML format and can be edited manually or new utilities could be constructed to edit them automatically. In the distributed calculator sample you can find these files in the root directory. </P>
+
+<H3><A name="DistributedSCADomain-ConnectiontononSCAservices"></A>Connection to non-SCA services</H3>
+
+<P>To connect to services outside of the SCA Domain (whether they be services provided by SCA or by other means) you can still configure an explicit binding, for example,  lets now assume that the DivideServiceComponent is a non-sca web service out there on the network somewhere. As this is outside the SCA domain we can use an explicit remote binding to talk to it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> &gt;&lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN>&gt;&lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN>&gt;&lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN>&gt;
+            &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/sample-calculator-ws-webapp/AddServiceComponent&quot;</SPAN>/&gt;
+</SPAN>        &lt;/reference&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="DistributedSCADomain-StartingNodesInADistributedDomain"></A>Starting Nodes In A Distributed Domain</H3>
+
+<P>The domain manager is used to pre-process each composited prior to the composites being deployed to nodes for running. Contributions (containing the composites) are added to the domain manager. Configuration must be provided which tells the domain manager where the nodes are that are going to run the composites and which composites they will run. Based on this information the domain manager makes an atom feed available for each composite that is deployed to a node. The node to which the composite is assigned must read the correct atom feed in order to configure itself by downloading the composite to run and the contributions required provide the artifacts required by the composite. There is a Node API that takes as input the URL of an atom feed exposed by the domain manager as follows. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2 node = SCANodeFactory.newInstance().createSCANodeFromURL(<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:9990/node-config/NodeA&quot;</SPAN>);</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>The URL <A href="http://localhost:9990/node-config/NodeA" class="external-link" rel="nofollow">http://localhost:9990/node-config/NodeA</A> is the URL of the atom feed that the domain manager provides.</P>
+
+<P>The domain manager processes all the relationships between all composite components and provides a fully configured composite to each node, i.e. all of the binding URIs are filled out correctly so it's basically a pre-processing step.</P>
+
+<P>In the <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/calculator-distributed/" class="external-link" rel="nofollow">calculator-distributed</A> sample java classes are provided which are set up ready to start the required nodes. Look at the files.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.LaunchCalculatorNodeA
+node.LaunchCalculatorNodeB
+node.LaunchCalculatorNodeC
+</PRE>
+</DIV></DIV>
+
+<P>The README provided with the samples gives more detailed instruction on how to run the sample.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/01-overview.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/01-overview.html b/site/trunk/site-publish/documentation-2x/01-overview.html
new file mode 100644
index 0000000000..d1c889e61b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/01-overview.html
@@ -0,0 +1,229 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>01-Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="01-Overview">01-Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">01-Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109103">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109103">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 04, 2009
+                      &nbsp;(<A class="noprint" href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109103&originalId=109228">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H2><A name="01-Overview-SCAJavaDocumentationfor2.x"></A>SCA Java Documentation for 2.x</H2>
+
+<STYLE type="text/css">
+    table.lozenge {
+        border: none;
+        border-collapse: collapse;
+        height: 75px;
+    }
+    table.lozenge td.icon {
+        width: 91px;
+        height: 75px;
+        text-align: center;
+        vertical-align: middle;
+    }
+    table.lozenge td.top {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_top.gif");
+    }
+    table.lozenge td.topRight, table.lozenge img.border {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_tright.gif");
+    }
+    table.lozenge td.body, table.lozenge td.breaker {
+        height: 59px;
+        vertical-align: top;
+        background-color: #F3F3E9;
+    }
+    table.lozenge td.breaker {
+        width: 8px;
+    }
+    table.lozenge td.right {
+        width: 8px;
+        height: 59px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_right.gif");
+    }
+    table.lozenge td.bottom {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bot.gif");
+    }
+    table.lozenge td.bottomRight {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bright.gif");
+    }
+</STYLE>
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/02-Getting+Started&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/02-Getting+Started&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_blue_blue.gif')" class="icon" rowspan="3"><B><A onclick="return false;" href="02-getting-started.html" title="View Getting Started with Tuscany"><IMG src="01-overview.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B></TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="02-getting-started.html" title="View Getting Started with Tuscany">Getting Started with Tuscany</A></B> <BR>             
+These guides help you to get setup in Tuscany, develop and run a simple application using comand line or Eclipse.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/03-SCA+Introduction&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/03-SCA+Introduction&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_pink_blue.gif')" class="icon" rowspan="3"><B><A onclick="return false;" href="03-sca-introduction.html" title="View SCA Introduction"><IMG src="01-overview.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B></TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="03-sca-introduction.html" title="View SCA Introduction">SCA Introduction</A></B> <BR>             
+Provides a quick introduction to SCA and links to the SCA Specifications.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+
+
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/04-Development+Guides&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/04-Development+Guides&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_red_blue.gif')" class="icon" rowspan="3"><B><A onclick="return false;" href="04-development-guides.html" title="View Development Guide"><IMG src="01-overview.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B></TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="04-development-guides.html" title="View Development Guide">Development Guide</A></B> <BR>             
+These guides help you learn more about Tuscany architecture and how to get involved in the development of Tuscany. We look forward to your help.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.10.3 Build: 1519 Apr 15, 2009)
+      <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0.beta1)
+    </DIV>
+  </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/02-getting-started.html b/site/trunk/site-publish/documentation-2x/02-getting-started.html
new file mode 100644
index 0000000000..5cdd5cc3bd
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-getting-started.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>02-Getting Started</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="02-Getting Started">02-Getting Started</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">02-Getting Started</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109152">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109152">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A class="noprint" href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109152&originalId=109155">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In Progress</TD></TR></TABLE></DIV>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.10.3 Build: 1519 Apr 15, 2009)
+      <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0.beta1)
+    </DIV>
+  </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg
new file mode 100644
index 0000000000..4c1ea05f6d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg.jpeg b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg.jpeg
new file mode 100644
index 0000000000..b0e371f303
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/calc.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png.jpeg b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/component.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg
new file mode 100644
index 0000000000..587094badc
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg.jpeg b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg.jpeg
new file mode 100644
index 0000000000..829bd77110
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.data/domain.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/02-sca-introduction.html b/site/trunk/site-publish/documentation-2x/02-sca-introduction.html
new file mode 100644
index 0000000000..fe1f949a88
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/02-sca-introduction.html
@@ -0,0 +1,222 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>02-SCA Introduction</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="02-SCA Introduction">02-SCA Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">02-SCA Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109106&originalId=109143">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <UL>
+	<LI><A href="#02-SCAIntroduction-whatisSCA" title="what is SCA on 02-SCA Introduction">What is SCA?</A></LI>
+	<LI><A href="#02-SCAIntroduction-scacomponent" title="sca component on 02-SCA Introduction">SCA Component</A></LI>
+	<LI><A href="#02-SCAIntroduction-scawire" title="sca wire on 02-SCA Introduction">SCA Wire</A></LI>
+	<LI><A href="#02-SCAIntroduction-scacomposite" title="sca composite on 02-SCA Introduction">SCA Composite</A></LI>
+	<LI><A href="#02-SCAIntroduction-scacontribution" title="sca contribution on 02-SCA Introduction">SCA Contribution</A></LI>
+	<LI><A href="#02-SCAIntroduction-scadomain" title="sca domain on 02-SCA Introduction">SCA Domain</A></LI>
+	<LI><A href="#02-SCAIntroduction-scabinding" title="sca binding on 02-SCA Introduction">SCA Binding</A></LI>
+	<LI><A href="#02-SCAIntroduction-scapolicy" title="sca policy on 02-SCA Introduction">SCA Policy</A></LI>
+</UL>
+
+
+<H2><A name="02-SCAIntroduction-WhatisSCA%3F"></A><A name="02-SCAIntroduction-whatisSCA"></A>What is SCA?</H2>
+<P>SCA is a standard programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Now let's talk about SCA building blocks and concepts.</P>
+
+<H2><A name="02-SCAIntroduction-SCAComponent"></A><A name="02-SCAIntroduction-scacomponent"></A>SCA Component</H2>
+
+<P>The basic building block for SCA is a component. It is the abstraction of a given business function. A component is described with the following attributes:</P>
+
+<UL>
+	<LI><B>Service:</B> Describes the functions that this type of component provides. A component can offer one ore more services. A service is an interface.</LI>
+	<LI><B>Reference:</B> This describes the dependencies this type of component has in order to function. A reference is an interface.</LI>
+	<LI><B>Property:</B> This defines configuration parameters that can controls how the business function can behave. For example, what currency to use for an account component.</LI>
+	<LI><B>Intent policies:</B> This describes assumptions on how the component will behave. There are two types of policies.
+	<UL>
+		<LI>Implementation policy- Impact the behavior of an implementation. For example, transaction, monitor and logging</LI>
+		<LI>Interaction policy - defines how the components behave with one another. For example, security.</LI>
+	</UL>
+	</LI>
+	<LI><B>Implementation:</B>  Every component has some implementation associated with it. This can be a new business logic or an existing one that is now being used in the assembly.  A business logic can handle different operations and some of which are exposed externally as callable services.  Component implementation can be in any technology, for example for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.</LI>
+</UL>
+
+
+<P>This is demonstrated below.<BR>
+<DIV align="center"><IMG src="02-sca-introduction.data/component.png" border="0"></DIV></P>
+
+<P>The implementation of a component can be in any language that is suitable for the user, for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.  </P>
+
+<H2><A name="02-SCAIntroduction-SCAWire"></A><A name="02-SCAIntroduction-scawire"></A>SCA Wire</H2>
+
+<P>As mentioned above, an SCA component may have zero or more references. Refrences in SCA define how SCA components invoke services. The relationship between a reference and a service is typically demonstrated through a line in a SCA diagrams and is referred to as a wire. </P>
+
+<P>The term wire can at the begining seem confusing because you may ask how a wire is realized. There is no physical definition for a wire, it is really derived from the relationship between a Service and its refrence(s) at runtime. This is realized through dependency injection in Tuscany. </P>
+
+
+<H2><A name="02-SCAIntroduction-SCAComposite"></A><A name="02-SCAIntroduction-scacomposite"></A>SCA Composite</H2>
+
+<P>An SCA composite consists of components, services, references, and wires that connect them. A composite is the unit of deployment for SCA.<BR>
+A composite can be viewed as a component whose implementation is not code but an aggregation of one or more components co-operating to provide higher level services. Think of composite as a solution, for example a credit check composite may consist of multiple components that together perform the credit checking work. A composite can also be used within a larger solution, for example credit check can be part of a order processing composite. A composite has the same charactersitics as a component. It provides Services, has References to other dependencies, and can be configured using Properties and can have intent policies in just the same way as an individual components can. In thise case, attributes of some of the components that are embedded in the composite get 'promoted' and becom the attribute of the composite. In the example below, you see a calculator composite which consists of 5 components, a calculator service has references to four components:Add, Subtract, Multiply and Divide.</P>
+
+<P><DIV align="center"><IMG src="02-sca-introduction.data/calc.jpg" border="0"></DIV><BR>
+<IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The assembly or wiring is defined in .composite file through Service Component Definition Language (SCDL) that is in XML. For example, calculator.composite would define that calculator component references the other four components.</P>
+
+<H2><A name="02-SCAIntroduction-SCAContribution"></A><A name="02-SCAIntroduction-scacontribution"></A>SCA Contribution</H2>
+
+<P>The artifacts that make up a solution get packaged into what is called a contribution. A contribution can take a number of different forms.  For example, it could be a jar file, or it could be a directory tree on the file system. A contribution can contain composites, java classes, BPEL processes, XSD files, wsdl files, etc. An SCA application can be divided into multiple contributions with dependencies between them. In general, some services depend closely on other services and it makes sense to package them together.  If services are more independent it is best to package them separately so that they can be reused in different contexts. A contribution is a deployable unit. A solution may require multiple contributions that share artifacts and artifacts can be shared between (imported) between contributions.</P>
+
+<H2><A name="02-SCAIntroduction-SCADomain"></A><A name="02-SCAIntroduction-scadomain"></A>SCA Domain</H2>
+
+<P>Contribution packages get contributed to what is called SCA domain which is the scope of adminstration at runtime. An SCA Domain represents a complete runtime configuration, potentially distributed over a series of interconnected runtime nodes and is a logical view of the running applications or a coherent grouping of components that are working together. An SCA Domain typically represents an area of business functionality controlled by a single organization. For example, an SCA Domain may be the whole of a business, or it may be a department within a business.</P>
+
+<P>Therefore, an SCA domain consists of the definitions of composites, components, their implementations, <B>and the nodes</B> on which they run. Components deployed into a domain can directly wire to other components within the same domain. Communication with services outside of a domain is done through bindings. </P>
+
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services. However, during development one is not concerned with all this. The code is packaged and made available for deployment. Tuscany SCA Java supports contributions in the form of JAR or filesystem. </P>
+
+<P>Below is an example of domain with two contributions.<BR>
+<DIV align="center"><IMG src="02-sca-introduction.data/domain.jpg" border="0"></DIV></P>
+
+<H2><A name="02-SCAIntroduction-SCABinding"></A><A name="02-SCAIntroduction-scabinding"></A>SCA Binding</H2>
+<P>A binding is used as a means of communication between services and handles the protocols. It defines with what communication method a service can be accessed with or with what communication method it can will access other services.  There can be different types of bindings depending on technologies used to develop a solution. For example JMS binding, Webservices binding, Atom binding for web20 interaction, etc. </P>
+
+<P>Services can be configured with different bindings and there can be multiple bindings for a service.  Bindings for the services and references get defined declaratively in the .composite file. There is a default binding called binding.sca which when used leaves the choice of binding to the underlying infrastructure by default.</P>
+
+<P>The declarative bindings and the abstraction of protocols from business logic brings agility to SCA applications. This allows SCA applications to be purely focused on business logic and not be contaminated with protocol handling information. It also enables the SCA compositions to grow or change without code modification while also working with applications that are not enabled with SCA.</P>
+
+
+<H2><A name="02-SCAIntroduction-SCAPolicy"></A><A name="02-SCAIntroduction-scapolciy"></A>SCA Policy</H2>
+<P>An enterprise application requires control beyond the business functional capability which can include how security is handled in the enterprise or what transactional capability should be applied to services that are offered. SCA policies define the constraints or capabilities that get applied to services and their interaction. Two types of policies are defined in SCA.</P>
+<UL>
+	<LI>Interaction Policies - Define the policies that influence interaction of services for example whether authentication is required or not.</LI>
+	<LI>Implementation Policies - Define how the components behave at runtime for example whether it is transactional or not.</LI>
+</UL>
+
+
+<P>SCA mechanisms for defining policies such as intents and policySets can only be used in the context of a single domain. The fact that policies can be defined declaratively make applications adaptive to the environment that they get deployed into or to changes in the business requirements. <BR>
+For more information about policy check out the <SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf" title="Visit page outside Confluence" rel="nofollow">sca policy framework specification<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>version=1]</P>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-development-guides.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03-development-guides.html b/site/trunk/site-publish/documentation-2x/03-development-guides.html
new file mode 100644
index 0000000000..fde070d137
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-development-guides.html
@@ -0,0 +1,221 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>03-Development Guides</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="03-Development Guides">03-Development Guides</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">03-Development Guides</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109130&originalId=109151">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <STYLE type="text/css">
+    table.lozenge {
+        border: none;
+        border-collapse: collapse;
+        height: 75px;
+    }
+    table.lozenge td.icon {
+        width: 91px;
+        height: 75px;
+        text-align: center;
+        vertical-align: middle;
+    }
+    table.lozenge td.top {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_top.gif");
+    }
+    table.lozenge td.topRight, table.lozenge img.border {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_tright.gif");
+    }
+    table.lozenge td.body, table.lozenge td.breaker {
+        height: 59px;
+        vertical-align: top;
+        background-color: #F3F3E9;
+    }
+    table.lozenge td.breaker {
+        width: 8px;
+    }
+    table.lozenge td.right {
+        width: 8px;
+        height: 59px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_right.gif");
+    }
+    table.lozenge td.bottom {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bot.gif");
+    }
+    table.lozenge td.bottomRight {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bright.gif");
+    }
+</STYLE><TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_red_blue.gif')" class="icon" rowspan="3">
+            <B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide"><IMG src="03-development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B>
+        </TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide">Development Guide</A></B> <BR>             
+If you would like to contribute to the project, this guide explains how to build Java SCA and how to contribute code back to the project.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_red_blue.gif')" class="icon" rowspan="3">
+            <B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany"><IMG src="03-development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B>
+        </TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A></B> <BR>             
+This guide shows the Tuscany developer how to write code and extension code that would comply to some of the OSGi modularity concepts
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-development-guide.html" title="SCA Java Development Guide">SCA Java Development Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg
new file mode 100644
index 0000000000..4c1ea05f6d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg.jpeg b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg.jpeg
new file mode 100644
index 0000000000..b0e371f303
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/calc.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png.jpeg b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/component.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg
new file mode 100644
index 0000000000..587094badc
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg.jpeg b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg.jpeg
new file mode 100644
index 0000000000..829bd77110
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.data/domain.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03-sca-introduction.html b/site/trunk/site-publish/documentation-2x/03-sca-introduction.html
new file mode 100644
index 0000000000..5067bc52fc
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03-sca-introduction.html
@@ -0,0 +1,222 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>03-SCA Introduction</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="03-SCA Introduction">03-SCA Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">03-SCA Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A class="noprint" href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109106&originalId=109153">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <UL>
+	<LI><A href="#03-SCAIntroduction-whatisSCA">What is SCA?</A></LI>
+	<LI><A href="#03-SCAIntroduction-scacomponent">SCA Component</A></LI>
+	<LI><A href="#03-SCAIntroduction-scawire">SCA Wire</A></LI>
+	<LI><A href="#03-SCAIntroduction-scacomposite">SCA Composite</A></LI>
+	<LI><A href="#03-SCAIntroduction-scacontribution">SCA Contribution</A></LI>
+	<LI><A href="#03-SCAIntroduction-scadomain">SCA Domain</A></LI>
+	<LI><A href="#03-SCAIntroduction-scabinding">SCA Binding</A></LI>
+	<LI><A href="#03-SCAIntroduction-scapolicy">SCA Policy</A></LI>
+</UL>
+
+
+<H2><A name="03-SCAIntroduction-WhatisSCA%3F"></A><A name="03-SCAIntroduction-whatisSCA"></A>What is SCA?</H2>
+<P>SCA is a standard programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Now let's talk about SCA building blocks and concepts.</P>
+
+<H2><A name="03-SCAIntroduction-SCAComponent"></A><A name="03-SCAIntroduction-scacomponent"></A>SCA Component</H2>
+
+<P>The basic building block for SCA is a component. It is the abstraction of a given business function. A component is described with the following attributes:</P>
+
+<UL>
+	<LI><B>Service:</B> Describes the functions that this type of component provides. A component can offer one ore more services. A service is an interface.</LI>
+	<LI><B>Reference:</B> This describes the dependencies this type of component has in order to function. A reference is an interface.</LI>
+	<LI><B>Property:</B> This defines configuration parameters that can controls how the business function can behave. For example, what currency to use for an account component.</LI>
+	<LI><B>Intent policies:</B> This describes assumptions on how the component will behave. There are two types of policies.
+	<UL>
+		<LI>Implementation policy- Impact the behavior of an implementation. For example, transaction, monitor and logging</LI>
+		<LI>Interaction policy - defines how the components behave with one another. For example, security.</LI>
+	</UL>
+	</LI>
+	<LI><B>Implementation:</B>  Every component has some implementation associated with it. This can be a new business logic or an existing one that is now being used in the assembly.  A business logic can handle different operations and some of which are exposed externally as callable services.  Component implementation can be in any technology, for example for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.</LI>
+</UL>
+
+
+<P>This is demonstrated below.<BR>
+<DIV align="center"><IMG src="03-sca-introduction.data/component.png" border="0"></DIV></P>
+
+<P>The implementation of a component can be in any language that is suitable for the user, for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.  </P>
+
+<H2><A name="03-SCAIntroduction-SCAWire"></A><A name="03-SCAIntroduction-scawire"></A>SCA Wire</H2>
+
+<P>As mentioned above, an SCA component may have zero or more references. Refrences in SCA define how SCA components invoke services. The relationship between a reference and a service is typically demonstrated through a line in a SCA diagrams and is referred to as a wire. </P>
+
+<P>The term wire can at the begining seem confusing because you may ask how a wire is realized. There is no physical definition for a wire, it is really derived from the relationship between a Service and its refrence(s) at runtime. This is realized through dependency injection in Tuscany. </P>
+
+
+<H2><A name="03-SCAIntroduction-SCAComposite"></A><A name="03-SCAIntroduction-scacomposite"></A>SCA Composite</H2>
+
+<P>An SCA composite consists of components, services, references, and wires that connect them. A composite is the unit of deployment for SCA.<BR>
+A composite can be viewed as a component whose implementation is not code but an aggregation of one or more components co-operating to provide higher level services. Think of composite as a solution, for example a credit check composite may consist of multiple components that together perform the credit checking work. A composite can also be used within a larger solution, for example credit check can be part of a order processing composite. A composite has the same charactersitics as a component. It provides Services, has References to other dependencies, and can be configured using Properties and can have intent policies in just the same way as an individual components can. In thise case, attributes of some of the components that are embedded in the composite get 'promoted' and becom the attribute of the composite. In the example below, you see a calculator composite which consists of 5 components, a calculator service has references to four components:Add, Subtract, Multiply and Divide.</P>
+
+<P><DIV align="center"><IMG src="03-sca-introduction.data/calc.jpg" border="0"></DIV><BR>
+<IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The assembly or wiring is defined in .composite file through Service Component Definition Language (SCDL) that is in XML. For example, calculator.composite would define that calculator component references the other four components.</P>
+
+<H2><A name="03-SCAIntroduction-SCAContribution"></A><A name="03-SCAIntroduction-scacontribution"></A>SCA Contribution</H2>
+
+<P>The artifacts that make up a solution get packaged into what is called a contribution. A contribution can take a number of different forms.  For example, it could be a jar file, or it could be a directory tree on the file system. A contribution can contain composites, java classes, BPEL processes, XSD files, wsdl files, etc. An SCA application can be divided into multiple contributions with dependencies between them. In general, some services depend closely on other services and it makes sense to package them together.  If services are more independent it is best to package them separately so that they can be reused in different contexts. A contribution is a deployable unit. A solution may require multiple contributions that share artifacts and artifacts can be shared between (imported) between contributions.</P>
+
+<H2><A name="03-SCAIntroduction-SCADomain"></A><A name="03-SCAIntroduction-scadomain"></A>SCA Domain</H2>
+
+<P>Contribution packages get contributed to what is called SCA domain which is the scope of adminstration at runtime. An SCA Domain represents a complete runtime configuration, potentially distributed over a series of interconnected runtime nodes and is a logical view of the running applications or a coherent grouping of components that are working together. An SCA Domain typically represents an area of business functionality controlled by a single organization. For example, an SCA Domain may be the whole of a business, or it may be a department within a business.</P>
+
+<P>Therefore, an SCA domain consists of the definitions of composites, components, their implementations, <B>and the nodes</B> on which they run. Components deployed into a domain can directly wire to other components within the same domain. Communication with services outside of a domain is done through bindings. </P>
+
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services. However, during development one is not concerned with all this. The code is packaged and made available for deployment. Tuscany SCA Java supports contributions in the form of JAR or filesystem. </P>
+
+<P>Below is an example of domain with two contributions.<BR>
+<DIV align="center"><IMG src="03-sca-introduction.data/domain.jpg" border="0"></DIV></P>
+
+<H2><A name="03-SCAIntroduction-SCABinding"></A><A name="03-SCAIntroduction-scabinding"></A>SCA Binding</H2>
+<P>A binding is used as a means of communication between services and handles the protocols. It defines with what communication method a service can be accessed with or with what communication method it can will access other services.  There can be different types of bindings depending on technologies used to develop a solution. For example JMS binding, Webservices binding, Atom binding for web20 interaction, etc. </P>
+
+<P>Services can be configured with different bindings and there can be multiple bindings for a service.  Bindings for the services and references get defined declaratively in the .composite file. There is a default binding called binding.sca which when used leaves the choice of binding to the underlying infrastructure by default.</P>
+
+<P>The declarative bindings and the abstraction of protocols from business logic brings agility to SCA applications. This allows SCA applications to be purely focused on business logic and not be contaminated with protocol handling information. It also enables the SCA compositions to grow or change without code modification while also working with applications that are not enabled with SCA.</P>
+
+
+<H2><A name="03-SCAIntroduction-SCAPolicy"></A><A name="03-SCAIntroduction-scapolciy"></A>SCA Policy</H2>
+<P>An enterprise application requires control beyond the business functional capability which can include how security is handled in the enterprise or what transactional capability should be applied to services that are offered. SCA policies define the constraints or capabilities that get applied to services and their interaction. Two types of policies are defined in SCA.</P>
+<UL>
+	<LI>Interaction Policies - Define the policies that influence interaction of services for example whether authentication is required or not.</LI>
+	<LI>Implementation Policies - Define how the components behave at runtime for example whether it is transactional or not.</LI>
+</UL>
+
+
+<P>SCA mechanisms for defining policies such as intents and policySets can only be used in the context of a single domain. The fact that policies can be defined declaratively make applications adaptive to the environment that they get deployed into or to changes in the business requirements. <BR>
+For more information about policy check out the <A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf" rel="nofollow">sca policy framework specification</A>version=1]</P>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.10.3 Build: 1519 Apr 15, 2009)
+      <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0.beta1)
+    </DIV>
+  </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03development-guides.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/03development-guides.html b/site/trunk/site-publish/documentation-2x/03development-guides.html
new file mode 100644
index 0000000000..a7bd32b146
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/03development-guides.html
@@ -0,0 +1,221 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>03.Development Guides</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="03.Development Guides">03.Development Guides</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">03.Development Guides</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109130&originalId=109144">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <STYLE type="text/css">
+    table.lozenge {
+        border: none;
+        border-collapse: collapse;
+        height: 75px;
+    }
+    table.lozenge td.icon {
+        width: 91px;
+        height: 75px;
+        text-align: center;
+        vertical-align: middle;
+    }
+    table.lozenge td.top {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_top.gif");
+    }
+    table.lozenge td.topRight, table.lozenge img.border {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_tright.gif");
+    }
+    table.lozenge td.body, table.lozenge td.breaker {
+        height: 59px;
+        vertical-align: top;
+        background-color: #F3F3E9;
+    }
+    table.lozenge td.breaker {
+        width: 8px;
+    }
+    table.lozenge td.right {
+        width: 8px;
+        height: 59px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_right.gif");
+    }
+    table.lozenge td.bottom {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bot.gif");
+    }
+    table.lozenge td.bottomRight {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bright.gif");
+    }
+</STYLE><TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_blue_blue.gif')" class="icon" rowspan="3">
+            <B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide"><IMG src="03development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B>
+        </TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide">Development Guide</A></B> <BR>             
+If you would like to contribute to the project, this guide explains how to build Java SCA and how to contribute code back to the project.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_blue_blue.gif')" class="icon" rowspan="3">
+            <B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany"><IMG src="03development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B>
+        </TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A></B> <BR>             
+This guide shows the Tuscany developer how to write code and extension code that would comply to some of the OSGi modularity concepts
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-development-guide.html" title="SCA Java Development Guide">SCA Java Development Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/04-development-guides.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/04-development-guides.html b/site/trunk/site-publish/documentation-2x/04-development-guides.html
new file mode 100644
index 0000000000..7e53a8c0c5
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/04-development-guides.html
@@ -0,0 +1,223 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>04-Development Guides</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="04-Development Guides">04-Development Guides</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">04-Development Guides</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      &nbsp;(<A class="noprint" href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=109130&originalId=109154">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <STYLE type="text/css">
+    table.lozenge {
+        border: none;
+        border-collapse: collapse;
+        height: 75px;
+    }
+    table.lozenge td.icon {
+        width: 91px;
+        height: 75px;
+        text-align: center;
+        vertical-align: middle;
+    }
+    table.lozenge td.top {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_top.gif");
+    }
+    table.lozenge td.topRight, table.lozenge img.border {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_tright.gif");
+    }
+    table.lozenge td.body, table.lozenge td.breaker {
+        height: 59px;
+        vertical-align: top;
+        background-color: #F3F3E9;
+    }
+    table.lozenge td.breaker {
+        width: 8px;
+    }
+    table.lozenge td.right {
+        width: 8px;
+        height: 59px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_right.gif");
+    }
+    table.lozenge td.bottom {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bot.gif");
+    }
+    table.lozenge td.bottomRight {
+        height: 8px;
+        width: 8px;
+        background-image: url("/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_bright.gif");
+    }
+</STYLE>
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/SCA+Java+Development+Guide&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_red_blue.gif')" class="icon" rowspan="3"><B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide"><IMG src="04-development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B></TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="sca-java-development-guide.html" title="View Development Guide">Development Guide</A></B> <BR>             
+If you would like to contribute to the project, this guide explains how to build Java SCA and how to contribute code back to the project.
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+
+<TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0" class="lozenge" onclick="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;" onkeypress="document.location.href=&quot;/confluence/display/TUSCANYxDOCx2x/OSGi+Aware+Programming+in+Tuscany&quot;;">
+    <TR>
+        <TD style="background-image: url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_red_blue.gif')" class="icon" rowspan="3"><B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany"><IMG src="04-development-guides.data/guide_icon.jpeg" align="absmiddle" border="0"></A></B></TD>
+        <TD class="top" colspan="2"></TD>
+        <TD class="topRight"></TD>
+    </TR>
+    <TR>
+        <TD class="breaker">&nbsp;</TD>
+        <TD style="width:auto" class="body" height="59" align="left" valign="top" bgcolor="#F3F3E9">
+             <B><A onclick="return false;" href="osgi-aware-programming-in-tuscany.html" title="View OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A></B> <BR>             
+This guide shows the Tuscany developer how to write code and extension code that would comply to some of the OSGi modularity concepts
+        </TD>
+        <TD class="right">&nbsp;</TD>
+    </TR>
+    <TR>
+        <TD class="bottom" colspan="2"></TD>
+        <TD class="bottomRight"></TD>
+    </TR>
+</TABLE>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-development-guide.html" title="SCA Java Development Guide">SCA Java Development Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-enablement-for-tuscany-runtime.html" title="OSGi Enablement for Tuscany Runtime">OSGi Enablement for Tuscany Runtime</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.10.3 Build: 1519 Apr 15, 2009)
+      <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0.beta1)
+    </DIV>
+  </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/20-beta-samples-documentation.html b/site/trunk/site-publish/documentation-2x/20-beta-samples-documentation.html
new file mode 100644
index 0000000000..112b2faee3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/20-beta-samples-documentation.html
@@ -0,0 +1,1740 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>2.0-beta-Samples documentation : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="samples.html" title="Samples">Samples</A>&nbsp;&gt;&nbsp;<A href="" title="2.0-beta-Samples documentation">2.0-beta-Samples documentation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="samples.html" title="Samples">Samples</A>&nbsp;&gt;&nbsp;<A href="" title="2.0-beta-Samples documentation">2.0-beta-Samples documentation</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">2.0-beta-Samples documentation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23338770">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23338770">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23338770">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23338770">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23338770">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23338770">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+
+<H1><A name="2.0-beta-Samplesdocumentation-"></A><FONT color="#003366"><B>Tuscany 2.0-Beta1 Samples</B></FONT></H1>
+
+<P>The Tuscany samples are shipped with Tuscany binary and source releases (see the /samples directory). If you are using Tuscany from a release distribution then make sure you are looking at the documentation that corresponds to the samples as they stood at the time of the release. </P>
+
+<P>The contents of the <A href="samples.html" title="Samples">Samples</A> page contains links to the various different versions of samples documentation.</P>
+
+<P>In a distribution, the samples source code is found in the samples directory, directly under the root directory. The following sections are laid out to match the structure of the samples directory and its subdirectories.</P>
+
+<P>If you're new to Tuscany SCA start with the getting-started. Samples are generally presented in the form on an SCA contribution (look for directories ending in &quot;-contribution&quot;) or as a webapp (look for directories ending in &quot;-webapp&quot;). The directories getting-started, learning-more and applications all contain sample SCA contributions of increasing complexity. The running-tuscany directory describes the various different ways you can start the Tuscany runtime and install contributions. The extending-tuscany directory contains some examples of how to build new binding and implementation extensions for using in Tuscany.</P>
+
+<P>In the following text we use &lt;some_text&gt; to mean you have to replace it with whatever is appropriate in your environment. For example &lt;tuscany_bin_distro&gt; means the directory in which you install the Tuscany binary distribution.</P>
+
+<P>Instructions are colour coded as follows:</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>Instructions in pink boxes are for the Ant user</P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>Instructions in silver boxes are for the Maven user</P>
+</DIV></DIV>
+
+<P>Note. As some of these samples create and use local network connections you may need to configure your firewall, if you are running one, to allow the test to run successfully. </P>
+
+<DIV>
+<UL>
+    <LI><SPAN class="TOCOutline">1</SPAN> <A href="#2.0-beta-Samplesdocumentation-gettingstarted">getting-started</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">1.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldcontribution">helloworld-contribution</A></LI>
+    <LI><SPAN class="TOCOutline">1.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldwebapp">helloworld-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">1.3</SPAN> <A href="#2.0-beta-Samplesdocumentation-callbackapi">callback-api</A></LI>
+    <LI><SPAN class="TOCOutline">1.4</SPAN> <A href="#2.0-beta-Samplesdocumentation-scascopes">sca-scopes</A></LI>
+    <LI><SPAN class="TOCOutline">1.5</SPAN> <A href="#2.0-beta-Samplesdocumentation-scaincludecontribution">sca-include-contribution</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2</SPAN> <A href="#2.0-beta-Samplesdocumentation-learningmore">learning-more</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-async">async</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.1.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorcontribution">calculator-contribution</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingcomet">binding-comet</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.2.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-weatherwebapp">weather-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.3</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingjms">binding-jms</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.3.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldwebapp">helloworld-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.4</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingjsonrpc">binding-jsonrpc</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.4.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorcontribution">calculator-contribution</A></LI>
+    <LI><SPAN class="TOCOutline">2.4.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorwebapp">calculator-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.5</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingrmi">binding-rmi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.5.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorservicecontribution">calculator-service-contribution</A></LI>
+    <LI><SPAN class="TOCOutline">2.5.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorreferencecontribution">calculator-reference-contribution</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.6</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingsca">binding-sca</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.6.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorcontribution">calculator-contribution</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.7</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingws">binding-ws</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.7.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorcontribution">calculator-contribution</A></LI>
+    <LI><SPAN class="TOCOutline">2.7.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-contributionhelloworldwssdo">contribution-helloworld-ws-sdo</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.8</SPAN> <A href="#2.0-beta-Samplesdocumentation-distributedosgi">distributed-osgi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.8.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-dosgidynamiccalculatoroperations">dosgi-dynamic-calculator-operations</A></LI>
+    <LI><SPAN class="TOCOutline">2.8.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-dosgidynamiccalculator">dosgi-dynamic-calculator</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.9</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationbpel">implementation-bpel</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.9.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-contributionhelloworldbpel">contribution-helloworld-bpel</A></LI>
+    <LI><SPAN class="TOCOutline">2.9.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldbpelwebapp">helloworld-bpel-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.10</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationcomposite">implementation-composite</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.10.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldrecursive">helloworld-recursive</A></LI>
+    <LI><SPAN class="TOCOutline">2.10.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldrecursivews">helloworld-recursive-ws</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.11</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationjava">implementation-java</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.11.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-contributioncalculator">contribution-calculator</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.12</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementation.osgi">implementation.osgi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.12.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-dosgicalculator">dosgi-calculator</A></LI>
+    <LI><SPAN class="TOCOutline">2.12.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-dosgicalculatoroperations">dosgi-calculator-operations</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.13</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationscript">implementation-script</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.13.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-contributioncalculator">contribution-calculator</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.14</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationspring">implementation-spring</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.14.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-contributionhelloworldspring">contribution-helloworld-spring</A></LI>
+    <LI><SPAN class="TOCOutline">2.14.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldspringwebapp">helloworld-spring-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.15</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationweb">implementation-web</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.15.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldjaxrswebapp">helloworld-jaxrs-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">2.15.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldjsclientwebapp">helloworld-js-client-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">2.15.3</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldjsfwebapp">helloworld-jsf-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">2.15.4</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldjspwebapp">helloworld-jsp-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">2.15.5</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldservletwebapp">helloworld-servlet-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">2.15.6</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldstripeswebapp">helloworld-stripes-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.16</SPAN> <A href="#2.0-beta-Samplesdocumentation-loggingscribe">logging-scribe</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.16.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-GettingtherequiresApacheThriftlibrary">Getting the requires Apache Thrift library</A></LI>
+    <LI><SPAN class="TOCOutline">2.16.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-StartingaScribeserver">Starting a Scribe server</A></LI>
+    <LI><SPAN class="TOCOutline">2.16.3</SPAN> <A href="#2.0-beta-Samplesdocumentation-RunningtheLoggingTestsampletestprogram">Running the LoggingTest sample test program</A></LI>
+    <LI><SPAN class="TOCOutline">2.16.4</SPAN> <A href="#2.0-beta-Samplesdocumentation-CheckingtheScribelogoutput">Checking the Scribe log output</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.17</SPAN> <A href="#2.0-beta-Samplesdocumentation-mavenosgijunit">maven-osgi-junit</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.17.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorosgi">calculator-osgi</A></LI>
+    <LI><SPAN class="TOCOutline">2.17.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorrestosgi">calculator-rest-osgi</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2.18</SPAN> <A href="#2.0-beta-Samplesdocumentation-scaclient">sca-client</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.18.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-calculatorscaclient">calculator-scaclient</A></LI>
+    <LI><SPAN class="TOCOutline">2.18.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-helloworldscaclient">helloworld-scaclient</A></LI>
+</UL>
+</UL>
+    <LI><SPAN class="TOCOutline">3</SPAN> <A href="#2.0-beta-Samplesdocumentation-runningtuscany">running-tuscany</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-commandline">command-line</A></LI>
+    <LI><SPAN class="TOCOutline">3.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-eclipse">eclipse</A></LI>
+    <LI><SPAN class="TOCOutline">3.3</SPAN> <A href="#2.0-beta-Samplesdocumentation-embeddedjse">embedded-jse</A></LI>
+    <LI><SPAN class="TOCOutline">3.4</SPAN> <A href="#2.0-beta-Samplesdocumentation-embeddedosgi">embedded-osgi</A></LI>
+    <LI><SPAN class="TOCOutline">3.5</SPAN> <A href="#2.0-beta-Samplesdocumentation-maven">maven</A></LI>
+    <LI><SPAN class="TOCOutline">3.6</SPAN> <A href="#2.0-beta-Samplesdocumentation-mavenjunit">maven-junit</A></LI>
+    <LI><SPAN class="TOCOutline">3.7</SPAN> <A href="#2.0-beta-Samplesdocumentation-mavenjunitosgi">maven-junit-osgi</A></LI>
+    <LI><SPAN class="TOCOutline">3.8</SPAN> <A href="#2.0-beta-Samplesdocumentation-osgi">osgi</A></LI>
+    <LI><SPAN class="TOCOutline">3.9</SPAN> <A href="#2.0-beta-Samplesdocumentation-shell">shell</A></LI>
+    <LI><SPAN class="TOCOutline">3.10</SPAN> <A href="#2.0-beta-Samplesdocumentation-webapp">webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">4</SPAN> <A href="#2.0-beta-Samplesdocumentation-extendingtuscany">extending-tuscany</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">4.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-bindingextension">binding-extension</A></LI>
+    <LI><SPAN class="TOCOutline">4.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-implementationextension">implementation-extension</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">5</SPAN> <A href="#2.0-beta-Samplesdocumentation-applications">applications</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">5.1</SPAN> <A href="#2.0-beta-Samplesdocumentation-store">store</A></LI>
+    <LI><SPAN class="TOCOutline">5.2</SPAN> <A href="#2.0-beta-Samplesdocumentation-storewebapp">store-webapp</A></LI>
+</UL>
+</UL></DIV>
+
+<H2><A name="2.0-beta-Samplesdocumentation-gettingstarted"></A>getting-started</H2>
+
+<P>SCA defines a concept called a Contribution which is the way that SCA composite applications are packed for deployment. See <A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A> for more information on SCA concepts.</P>
+
+<P>The getting-started samples consist of simple SCA contributions that you can build and run as your first step to getting up and running with the Tuscany SCA Java runtime.</P>
+
+<P>You can build the sample contributions with either Maven or Ant and the running-tuscany directory contains information about the various ways you can start Tuscany and run these contributions.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-helloworldcontribution"></A>helloworld-contribution</H3>
+
+<P>This is a simple SCA contribution. It describes a composite application with a single component, HelloWorldComponent, implemented in Java. The component's Java implementation provides service &quot;business logic&quot; for saying hello to a person whose name is supplied as input to the service. The component is described in a composite called helloworld.composite as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//docs.oasis-open.org/ns/opencsa/sca/200912&quot;</SPAN>
+</SPAN>           xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.1&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;helloworld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloworldComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.HelloworldImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The contribution also contains a composite called helloworldws.composite which describes a component, HelloworldWSComponent, that uses the same implementation but uses a web services binding:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//docs.oasis-open.org/ns/opencsa/sca/200912&quot;</SPAN>
+</SPAN>           xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.1&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;helloworldws&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloworldWSComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.HelloworldImpl&quot;</SPAN>/&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;Helloworld&quot;</SPAN>&gt;
+           &lt;binding.ws /&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This gives us a number of options for interacting with the components in this application. </P>
+
+<P>Firstly there is a JUnit test inside this project called HelloworldTestCase.java. This starts the Tuscany runtime and loads the contribution. It then talks to the HelloworldComponent over the default SCA binding (binding.sca) using a local Java proxy.</P>
+
+<P>Secondly the HelloworldWSComponent exposes a service with a web services binding. You can talk to this component using your favourite web services client. You can retrieve the WSDL for the web service automatically (see later)</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To build this contribution using Ant do the following:</P>
+
+<P>TODO</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>To build this contribution using Maven do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd helloworld-contribution
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>This will produce the contribution as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+helloworld-contribution/target/helloworld-contribution.jar
+</PRE>
+</DIV></DIV>
+
+<P>As the JUnit test deploys and runs the contribution we can use it as a first simple example of a running SCA application. </P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To run the JUnit test using Ant do the following:</P>
+
+<P>TODO</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution will be run automatically during the Maven build step and you will see the output from the JUnit test printed on the console in amongst the other output:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Response from helloworld.sayHello(<SPAN class="code-quote">&quot;Petra&quot;</SPAN>) = Hello Petra
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>To access the web service that the HelloworldWSComponent exposes we have to keep the runtime runntime running. </P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To run the sample Ant so that you can access the web service do the following:</P>
+
+<P>TODO</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>We have a Maven plugin that will run SCA contributions. You use it in Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd helloworld-contribution
+mvn tuscany:run
+</PRE>
+</DIV></DIV>
+
+<P>You will note that in the console output you can see a web service being exposed by the binding.ws JAXWS provider:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Binding.ws JAXWS provider - Service URI: http:<SPAN class="code-comment">//localhost:8085/HelloworldWSComponent/Helloworld</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>If you point you web browser at this address and add ?wsdl on the end:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8085/HelloworldWSComponent/Helloworld?wsdl</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You'll see the WSDL for the service returned. Using you're favourite web services client, for example, the Web Services Explorer in Eclipse, you can send messages to this web service. </P>
+
+<P>When you're done use CTRL-C to stop the sample. </P>
+</DIV></DIV>
+
+<P>For more information on getting started with the Apache Tuscany SCA Java runtime see the <A href="getting-started.html" title="Getting Started">Getting Started</A> page.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-helloworldwebapp"></A>helloworld-webapp</H3>
+
+<P>This sample is not a contribution in it's own right but demonstrates how to run the helloworld-contribution inside a web application. As it's the same contribution the same two components, HelloworldComponent and HelloworldWSComponnet, will be started. </P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To build this contribution using Ant do the following:</P>
+
+<P>TODO</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>To build this contribution using Maven do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd helloworld-webapp
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>This will produce a webapp as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+helloworld-webapp/target/helloworld.war
+</PRE>
+</DIV></DIV>
+
+
+<P>You can run this webapp by deploying it to you're favourite webapp container. For example, you can deploy to Tomcat and run as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cp helloworld-webapp/target/helloworld.war my_tomcat_install/webapps
+my_tomcat_install/bin/catalina run
+</PRE>
+</DIV></DIV>
+
+<P>Once running point your web browser at:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8080/helloworld/hello.html</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You'll see a link there to the WSDL that's automatically generated for the web service binding of the HelloworldWSComponent. Again you can use your favourite web services client to send messages to the service. </P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>There is no example of accessing binding.sca from within the webapp. Do we want to include this?</TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>For more information on creating webapps to run SCA contributions with Tuscany see - ?</TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-callbackapi"></A>callback-api</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on callbacks with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-scascopes"></A>sca-scopes</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on scopes with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-scaincludecontribution"></A>sca-include-contribution</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on inclusion with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H2><A name="2.0-beta-Samplesdocumentation-learningmore"></A>learning-more</H2>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>All of the run instructions here are subject to change. I just picked ones that works but ideally we'd use the command line consistently when that is operating correctly. Also Mike commented that it's unnatural and confusing to &quot;cd running-tuscany/xyz&quot; to run a sample. This should also be solved if we can go with the command line.</TD></TR></TABLE></DIV>
+
+<P>The samples found in the contributions below illustrate more of SCA and Tuscany's features in action. The contributions here are primarily focused on demonstrating the various SCA extensions that the Tuscany runtime supports, for example, bindings and implementations. The directories are named to let you easily find a sample of the extension you're interested in.</P>
+
+<P>You can identify contributions here as the name of the directory from which they are built ends with &quot;-contribution&quot;. There are also webapp samples here. The names of these directories end with &quot;-webapp&quot;.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-async"></A>async</H3>
+
+<P>This sample demonstrates the SCA asynchronous progamming model in action as typified by services that are configured with the asyncInvocation intent. For example, from calculator-contribution</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Remotable
+@AsyncInvocation
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CalculatorServiceAsync {
+    void calculateAsync(<SPAN class="code-object">Integer</SPAN> n1, ResponseDispatch&lt;<SPAN class="code-object">String</SPAN>&gt; response);
+}
+</PRE>
+</DIV></DIV>
+
+<P>A client component can access an asynchronous service either synchronously or asynchronously. Asynchronous reference interfaces also have a special form, again from calculator-contribution:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CalculateReferenceAsync {
+	<SPAN class="code-comment">// Sync
+</SPAN>	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> calculate(<SPAN class="code-object">Integer</SPAN> i1);
+
+	<SPAN class="code-comment">// Aysnc Poll
+</SPAN>	<SPAN class="code-keyword">public</SPAN> Response&lt;<SPAN class="code-object">String</SPAN>&gt; calculateAsync(<SPAN class="code-object">Integer</SPAN> i1);
+
+	<SPAN class="code-comment">// Async Callback
+</SPAN>	<SPAN class="code-keyword">public</SPAN> Future&lt;<SPAN class="code-object">String</SPAN>&gt; calculateAsync(<SPAN class="code-object">Integer</SPAN> i1, AsyncHandler&lt;<SPAN class="code-object">String</SPAN>&gt; handler);
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorcontribution"></A>calculator-contribution</H4>
+
+<P>This contribution defines synchronous and asynchronous component services and a client component which references both. During the test the client component exercise all three styles of reference interface operation against both the synchronous and asynchronous service.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/async/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-implementation-java-calculator-async-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/async/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the sample-implementation-java-calculator-async-contribution.</P>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingcomet"></A>binding-comet</H3>
+
+<P>The Comet protocol allows a servlet to process IO asynchronously, receiving events when data is available for reading on the connection (rather than always using a blocking read), and writing data back on connections asynchronously (most likely responding to some event raised from some other source).</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-weatherwebapp"></A>weather-webapp</H4>
+
+<P>Executing the command &quot;mvn&quot; in this sample project creates a web archive suitable for deployment to Tomcat.  It makes use of the tuscany comet binding.</P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The webapp can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-commet/weather-webapp
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>The webapp can be installed and run as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-commet/weather-webapp
+cp target/sample-binding-comet-1.0.war &lt;your_container_deployment-dir&gt;
+start the container as appropriate
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingjms"></A>binding-jms</H3>
+
+<P>This binding supports message orient communication via the JMS API.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldwebapp"></A>helloworld-webapp</H4>
+
+<P>This contribution packages an SCA application inside a webapp. The application has two components which exchange helloworld style messages over the JMS binding. </P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The webapp can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jms/helloworld-webapp
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>The webapp can be installed and run as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jms/helloworld-webapp
+cp target/helloworld-jms.war &lt;your_container_deployment-dir&gt;
+start the container as appropriate
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>By rights the webapp should be called sample-binding-jms-helloworld-webapp.war</TD></TR></TABLE></DIV>
+
+<P>Once the webapp is deployed point your browser at:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8080/helloworld-jms/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingjsonrpc"></A>binding-jsonrpc</H3>
+
+<P>This binding supports communication over the JSON-RPC protocol.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorcontribution"></A>calculator-contribution</H4>
+
+<P>This sample demonstrates using the simple calculator service component which makes use of four other services for add, subtract, multiply and divide functions. In this variant of the calculator sample the AddService is configured to be invoked using the JSON-RPC protocol. You can see the configuration by looking in the src/main/resources/Calculator.composite xml file.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jsonrpc/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-implementation-java-calculator-async-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jsonrpc/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the sample-implementation-java-calculator-async-contribution.</P>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorwebapp"></A>calculator-webapp</H4>
+
+<P>This contribution packages the same calculator-contribution inside a webapp. </P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The webapp can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jsonrpc/calculator-webapp
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<P>The webapp can be installed and run as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-jsonrpc/calculator-webapp
+cp target/sample-binding-jsonrpc-calculator-webapp.war &lt;your_container_deployment-dir&gt;
+start the container as appropriate
+</PRE>
+</DIV></DIV>
+
+<P>Once the webapp is deployed point your browser at:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8080/sample-binding-jsonrpc-calculator-webapp/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingrmi"></A>binding-rmi</H3>
+
+<P>In this example the calculator function is split over two contributions in order to demonstrate the remote method invocation binding (binding.rmi). The calculator-service-contribution contains a composite which defines a CalculatorServiceComponent which exposes a CalculatorService using binding.rmi. The calculator-reference-contribution contains a composite which also defines a CalculatorServiceComponent but which in this case calls the add, subtract, multiple and divide operations offered by the component in the calculator-service-contribution. The two contributions are run using separate Tuscany nodes and the resulting components communicate over RMI. Both contributions must be deployed and started for the sample to work;</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contributions can be installed and the composite they contain run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-binding-rmi-calculator-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV> 
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contributions can be installed and the composite they contain run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the binding-rmi sample contributions</P>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorservicecontribution"></A>calculator-service-contribution</H4>
+
+<P>This contribution defines a CalculatorServiceComponent whose add, subtract, multiply and divide operations are available over RMI. </P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-rmi/calculator-service-contribution
+ant
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-rmi/calculator-service-contribution
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorreferencecontribution"></A>calculator-reference-contribution</H4>
+
+<P>This sample extends the calculator sample by replacing the local wired  connections with RMI bindings. Instead of local add, subtract, multiply and  divide components, an RMI service implementation now provides the add, subtract, multiply and divide interfaces and is hosted as an RMI server. References specified in the .composite file include an RMI binding which targets<BR>
+this RMI server.</P>
+
+
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-rmi/calculator-reference-contribution
+ant
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-rmi/calculator-reference-contribution
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingsca"></A>binding-sca</H3>
+
+<P>This sample is the simplest sample other than that shown in the getting starting section. It uses the default SCA protocol for communicating between the various components of the caluclator application.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorcontribution"></A>calculator-contribution</H4>
+<P>The service and reference definitions in the Calculator.composite and CalculatorClient.composite files have no binding attributes, thereby defaulting to the SCA binding for communication between the running instances of the components.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-sca/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-binding-sca-calculator-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-sca/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the sample-binding-sca-calculator-contribution.</P>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingws"></A>binding-ws</H3>
+
+<P>The web service binding allows components to expose and call services using SOAP formatted messages primarily over HTTP. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorcontribution"></A>calculator-contribution</H4>
+
+<P>This contribution provides the four arithmetic operations in the calculator service, with the AddService being accessible as a web service via the URL <A href="http://localhost:8085/AddServiceComponent" class="external-link" rel="nofollow">http://localhost:8085/AddServiceComponent</A>, as configured in the Calculator.composite file.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-ws/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-binding-ws-calculator-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/binding-ws/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the sample-binding-sca-calculator-contribution.</P>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-contributionhelloworldwssdo"></A>contribution-helloworld-ws-sdo</H4>
+
+<P>This sample demonstrates an SCA reference that uses a web service binding which works with SDO. Instead if using JAXB style Java beans in the service interface they are replaced with SDO object. </P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Sample not currently enabled - awaiting SDO support</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-distributedosgi"></A>distributed-osgi</H3>
+
+<P>These samples demonstrate the execution of Tuscany contributions in a OSGI environment. In particular the two bundle project in this directory define calculator objects that communicate with one another using the mechanisms defined in the OSGi remote services specifications. Here the Tuscany SCA runtime provides dynamic service discovery functionality. The calculator objects are registered as services directly with the OSGi bundle context by the bundle activator. Under the covers SCA provides the remote service disovery features that allow OSGi registered service to discover and communicate with one another across two JVMs. </P>
+
+<P>To run the sample each bundle must be build using maven and then loaded into a separate OSGi environment into which the Tuscany SCA runtime has already been installed (See &quot;osgi&quot; under running-tuscany)</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-dosgidynamiccalculatoroperations"></A>dosgi-dynamic-calculator-operations</H4>
+
+<P>This bundle provides the calculator add, subtract, multiple, divide operations services.</P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/distributed-osgi/dosgi-dynamic-calculator-operations
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>projects should be called dosgi-dynamic-calculator-operations-bundle</TD></TR></TABLE></DIV>
+
+<P>To run the bundle see &quot;osgi&quot; under running-tuscany. In short do the following:</P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ..\..\..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\..\..\features\configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console. You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start the bundle that's just been built:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./target/sample-dosgi-dynamic-calculator-operations.jar
+</PRE>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-dosgidynamiccalculator"></A>dosgi-dynamic-calculator</H4>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/distributed-osgi/dosgi-dynamic-calculator
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>projects should be called dosgi-dynamic-calculator-bundle</TD></TR></TABLE></DIV>
+
+<P>To run the bundle see &quot;osgi&quot; under running-tuscany. In short do the following:</P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ..\..\..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\..\..\features\configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console. You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start the bundle that's just been built:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./target/sample-dosgi-dynamic-calculator.jar
+</PRE>
+</DIV></DIV>
+
+<P>You should see the calculator service start. </P>
+
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationbpel"></A>implementation-bpel</H3>
+
+<P>BPEL component implementations will be useful to those who wish to describe a sequence of calls that must be made to other component services. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-contributionhelloworldbpel"></A>contribution-helloworld-bpel</H4>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-bpel/helloworld-bpel-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+????
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-bpel/helloworld-bpel-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+????
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldbpelwebapp"></A>helloworld-bpel-webapp</H4>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationcomposite"></A>implementation-composite</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldrecursive"></A>helloworld-recursive</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>Understand and Document</TD></TR></TABLE></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldrecursivews"></A>helloworld-recursive-ws</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationjava"></A>implementation-java</H3>
+<P>The sample provides a single calculator service with a default SCA binding. The CalculatorClient exercises this interface by calling add, subtract, multiply and divide operations. This results in messages passing to the appropriate components in the composite across the local wires.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-contributioncalculator"></A>contribution-calculator</H4>
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-java/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+ant sample-implementation-java-calculator-contribution
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The contribution Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-java/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Maven as follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd running-tuscany/embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>This will run several contributions including the sample-implementation-java-calculator-contribution.</P>
+</DIV></DIV>
+
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementation.osgi"></A>implementation.osgi</H3>
+
+<H4><A name="2.0-beta-Samplesdocumentation-dosgicalculator"></A>dosgi-calculator</H4>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-osgi/dosgi-calculator
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>projects should be called dosgi-calculator-bundle</TD></TR></TABLE></DIV>
+
+<P>To run the bundle see &quot;osgi&quot; under running-tuscany. In short do the following:</P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ..\..\..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\..\..\features\configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console. You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start the bundle that's just been built:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./target/sample-dosgi-calculator.jar
+</PRE>
+</DIV></DIV>
+
+<P>You should see the calculator service start. </P>
+
+
+
+<H4><A name="2.0-beta-Samplesdocumentation-dosgicalculatoroperations"></A>dosgi-calculator-operations</H4>
+<P>This bundle provides the calculator add, subtract, multiple, divide operations services.</P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/distributed-osgi/dosgi-calculator-operations
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>projects should be called dosgi-calculator-operations-bundle</TD></TR></TABLE></DIV>
+
+<P>To run the bundle see &quot;osgi&quot; under running-tuscany. In short do the following:</P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ..\..\..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\..\..\features\configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console. You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start the bundle that's just been built:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./target/sample-dosgi-calculator-operations.jar
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationscript"></A>implementation-script</H3>
+
+<P>This sample provides a simple calculator service whose operations are implemented using four different script languages. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-contributioncalculator"></A>contribution-calculator</H4>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-script/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>The contribution Jar can be built using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-script/calculator-contribution
+ant
+</PRE>
+</DIV></DIV>
+
+<P>The contribution can be installed and the composite it contains run using Ant as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+????
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationspring"></A>implementation-spring</H3>
+
+<P>The Spring implementation sample contains a simple Hello World service and client using implementation.spring. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-contributionhelloworldspring"></A>contribution-helloworld-spring</H4>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-spring/helloworld-spring-contribution
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldspringwebapp"></A>helloworld-spring-webapp</H4>
+
+<P>The HelloWorld Spring WebApp sample contains a simple Hello World service implemented using Spring and wrapped in a webApp. </P>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>The bundle Jar can be built using Maven as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd learning-more/implementation-spring/helloworld-spring-webapp
+mvn
+</PRE>
+</DIV></DIV>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationweb"></A>implementation-web</H3>
+
+<P>The Web implementation samples contain examples of a HelloWorld service implemented using implementation.web and accessed with various different technologies. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldjaxrswebapp"></A>helloworld-jaxrs-webapp</H4>
+
+<P>The HelloWorld JAX-RS WebApp sample uses implementation.web with JAX-RS to display a simple &quot;Hello World&quot; message from a webapp. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldjsclientwebapp"></A>helloworld-js-client-webapp</H4>
+
+<P>The HelloWorld JavaScript client Webapp sample uses implementation.web and a javascript client to call a simple &quot;Hello World&quot; service and display the results. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldjsfwebapp"></A>helloworld-jsf-webapp</H4>
+<P>The HelloWorld JSF WebApp sample shows a simple &quot;Hello World&quot; service implemented in a webapp and accessed using Java Server Faces. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldjspwebapp"></A>helloworld-jsp-webapp</H4>
+<P>The HelloWorld JSP WebApp sample uses implementation.web and a JSP client to invoke a simple &quot;Hello World&quot; service and display the results. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldservletwebapp"></A>helloworld-servlet-webapp</H4>
+
+<P>The HelloWorld Servlet WebApp sample uses implementation.web with a servlet to return a simple &quot;Hello World&quot; message in response to a request.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldstripeswebapp"></A>helloworld-stripes-webapp</H4>
+<P>The HelloWorld Stripes WebApp sample uses implementation.web with Stripes to display a simple &quot;Hello World&quot; message from a webapp. </P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-loggingscribe"></A>logging-scribe</H3>
+
+<P>This Tuscany sample shows how to implement and use a simple Logger component that logs string messages to a Scribe logging server. </P>
+
+<P>Scribe is an open source server for aggregating streaming log data. It is designed to scale to a very large number of nodes and be robust to network and node failures.</P>
+
+<P>See the Scribe Wiki <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=1&linkCreation=true&fromPageId=23338770" class="createlink">1</A> for more information on Scribe.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-GettingtherequiresApacheThriftlibrary"></A>Getting the requires Apache Thrift library</H4>
+
+<P>This sample uses Apache Thrift's libthrift.jar to communicate with Scribe servers. Libthrift is not yet available in a Maven repository, so before building the sample with maven you need to download libthrift <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=2&linkCreation=true&fromPageId=23338770" class="createlink">2</A> and install it in your local maven repository like this:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn install:install-file -DgroupId=org.apache.thrift -DartifactId=libthrift -Dversion=1.0-SNAPSHOT -Dpackaging=jar -Dfile=libthrift-r917130.jar
+</PRE>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-StartingaScribeserver"></A>Starting a Scribe server</H4>
+<P>Before running the LoggingTest sample test program, you need to start a Scribe server for the sample program to connect to.</P>
+
+<P>Steps to start a Scribe server are described in the Scribe examples README <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=3&linkCreation=true&fromPageId=23338770" class="createlink">3</A>. A simple scribe server configuration can be found in the Scribe examples <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=4&linkCreation=true&fromPageId=23338770" class="createlink">4</A>. </P>
+
+<P>LoggingTest will try to connect to a Scribe server at localhost:1463. To use a Scribe server at a different host or port, configure the host and port properties in scribe.composite to match your server. </P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-RunningtheLoggingTestsampletestprogram"></A>Running the LoggingTest sample test program</H4>
+
+<P>To run the LoggingTest sample test program, do this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Dtest=LoggingTest test
+</PRE>
+</DIV></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-CheckingtheScribelogoutput"></A>Checking the Scribe log output</H4>
+<P>After running LoggingTest, you should find the logged string &quot;Hello There&quot; in file sample/sample_current under your Scribe log store directory.</P>
+
+<P>If you've used the example1.conf Scribe configuration from the Scribe examples <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=4&linkCreation=true&fromPageId=23338770" class="createlink">4</A>, you should find your log message in /tmp/scribetest/sample/sample_current.</P>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=1&linkCreation=true&fromPageId=23338770" class="createlink">1</A> <A href="http://wiki.github.com/facebook/scribe/" class="external-link" rel="nofollow">http://wiki.github.com/facebook/scribe/</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=2&linkCreation=true&fromPageId=23338770" class="createlink">2</A> <A href="http://svn.apache.org/repos/asf/cassandra/trunk/lib/libthrift-r917130.jar" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/cassandra/trunk/lib/libthrift-r917130.jar</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=3&linkCreation=true&fromPageId=23338770" class="createlink">3</A> <A href="http://github.com/facebook/scribe/blob/master/examples/README" class="external-link" rel="nofollow">http://github.com/facebook/scribe/blob/master/examples/README</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=4&linkCreation=true&fromPageId=23338770" class="createlink">4</A> <A href="http://github.com/facebook/scribe/blob/master/examples/example1.conf" class="external-link" rel="nofollow">http://github.com/facebook/scribe/blob/master/examples/example1.conf</A></P>
+
+
+<H3><A name="2.0-beta-Samplesdocumentation-mavenosgijunit"></A>maven-osgi-junit</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorosgi"></A>calculator-osgi</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorrestosgi"></A>calculator-rest-osgi</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-scaclient"></A>sca-client</H3>
+
+<P>Samples that demonstrate the OASIS defined SCA Client API being used in simple Java applications to access SCA components running in the domain.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-calculatorscaclient"></A>calculator-scaclient</H4>
+
+<P>Disabled in this Beta1 release pending some up-coming changes in <BR>
+the way that domains are addressed and accessed.</P>
+
+<H4><A name="2.0-beta-Samplesdocumentation-helloworldscaclient"></A>helloworld-scaclient</H4>
+
+<P>Disabled in this Beta1 release pending some up-coming changes in <BR>
+the way that domains are addressed and accessed.</P>
+
+<H2><A name="2.0-beta-Samplesdocumentation-runningtuscany"></A>running-tuscany</H2>
+
+<P>Running something in Tuscany requires one or more contributions, and a method of launching the contributions to make the services they provide available. The sections below describes various means of launching contributions with the Tuscany SCA Java runtime. It's not important that you try all of these but they show you what's possible and hopefully show you how to use Tuscany in an environment that makes sense to you.</P>
+
+<P>Some of the running-tuscany sub-directories just contain a README that gives you instructions. For example, maven just tells you how to configure and run contributions using the maven-tuscany-plugin. Others contain code. For example, embedded-jse contains simple Java launchers that show you how to start some of the sample contributions from a Java program.</P>
+
+<P>The sample contributions in getting-started and learning-more should work regardless of which approach you adopt. However some approaches, like embedded-jse, don't have launchers for every single sample contribution.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-commandline"></A>command-line</H3>
+
+<P>You can execute a sample contribution from the command line on Windows or Linux.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>Waiting for tuscany.bat to be reworked before correcting</TD></TR></TABLE></DIV>
+
+<P>To execute a sample contribution from the command line</P>
+
+<P>on Windows, from a command prompt in the samples directory, run the command ...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;tuscany_din_distro&gt;\bin\tuscany.bat <SPAN class="code-quote">&quot;contribution-name&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd &lt;tuscany_din_distro&gt;\samples\learning-more\binding-sca\calculator-contribution
+&lt;tuscany_din_distro&gt;\bin\tuscany.bat sample-binding-sca-calculator-contribution.jar
+</PRE>
+</DIV></DIV>
+
+<P>or on &#42;nix platforms, from a shell prompt in the samples directory, run the command ...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd &lt;tuscany_din_distro&gt;/samples/learning-more/binding-sca/calculator-contribution
+&lt;tuscany_din_distro&gt;/bin/tuscany.sh sample-binding-sca-calculator-contribution.jar
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-eclipse"></A>eclipse</H3>
+
+<P>To import sample contributions into Eclipse you first need to import the Tuscany runtime. You then need to import the sample contribution into Eclipse as a project. Instructions for doing both of these things can be found here</P>
+
+<P><A href="http://tuscany.apache.org/import-existing-tuscany-sca-projects-into-eclipse.html" class="external-link" rel="nofollow">http://tuscany.apache.org/import-existing-tuscany-sca-projects-into-eclipse.html</A></P>
+
+
+
+<P>Note. these instructions refer to our 1.x code base but it holds true for our 2.x code base.</P>
+
+<P>Once you have a contribution imported into Eclipse and cleanly compiling against the Tuscany runtime jars you probably want to be able to run and debug it. The easiest way to do this is with a simple Java launcher. If you import the running-tuscany/embedded-jse project into Eclipse you'll see a number of such launcher programs which you can copy to launch the contribution(s) of your choice. Alternatively you can add a JUnit test case to the contribution that starts Tuscany and launches the contribution. See maven-junit as an example of how to do this.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-embeddedjse"></A>embedded-jse</H3>
+
+<P>This directory contains sample java launchers for the some of the Tuscany sample contributions from the learning-more directory. It shows you how to embed the Tuscany runtime in a Java program. To make you're own launchers simply copy and existing one and change the details of the contribution being loaded. You'll note that the same launcher code is used inside the contribution unit test demonstrated by maven-junit.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To use the sample JSE launchers with ant execute the command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant &lt;contributionname&gt;
+</PRE>
+</DIV></DIV>
+
+<P>where &lt;contributionname&gt; is one of the targets in the provided build.xml file</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>To use the sample JSE launchers from Maven do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd embedded-jse
+mvn
+</PRE>
+</DIV></DIV>
+<P>This runs a JUnit test case that runs all the launchers in turn.</P>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-embeddedosgi"></A>embedded-osgi</H3>
+
+<P>The Tuscany runtime jars will also work within an OSGi enviroment. If you want to load them into a vanilla OSGi environment see the osgi directory. If you want Tuscany to create an OSGi environment for you this directory contains launchers that do just that.</P>
+
+<DIV class="panel" style="background-color: pink;border-width: 1px;"><DIV class="panelContent" style="background-color: pink;">
+<P>To use the sample OSGI launchers with ant do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd embedded-osgi
+ant &lt;contributionname&gt;
+</PRE>
+</DIV></DIV>
+
+<P>where &lt;contributionname&gt; is one of the targets in the build.xml file</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: silver;border-width: 1px;"><DIV class="panelContent" style="background-color: silver;">
+<P>To use the sample JSE launchers from Maven do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd embedded-osgi
+mvn
+</PRE>
+</DIV></DIV>
+<P>This runs a JUnit test case that runs all the launchers in turn.</P>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-maven"></A>maven</H3>
+
+<P>Maven can be used to install contributions. Tuscany has a special plugin (maven-tuscany-plugin) that makes this happen. Look for contributions that have the following configuration in their pom.xml file:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;plugin&gt;
+&lt;groupId&gt;org.apache.tuscany.maven.plugins&lt;/groupId&gt;
+&lt;artifactId&gt;maven-tuscany-plugin&lt;/artifactId&gt;
+&lt;version&gt;2.0-SNAPSHOT&lt;/version&gt;
+&lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For contributions that have this, for example, learning-more/binding-sca/contribution-calculator, do the following</P>
+
+<P>cd samples/learning-more/binding-sca/contribution-calculator<BR>
+mvn tuscany:run</P>
+
+<P>This will install the contribution in the Tuscany runtime, start the composite it contains, and then wait. At this point you can use<BR>
+other clients to send messages to services that the running SCA applcation exposes, for example, try learning-more/sca-client/calculator-scaclient.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-mavenjunit"></A>maven-junit</H3>
+
+<P>Maven will run JUnit tests found in a module's src/test/java directory automatically. If you use embedded-jse style code in the JUnit test to install a contribution and start any composites it contains they you can unit test your contributions. This directory contains a contribution and a unit test which installs the contribution using very similar code to that found in embedded-jse.</P>
+
+<P>To run the contributions unit test do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd maven-junit/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-mavenjunitosgi"></A>maven-junit-osgi</H3>
+
+<P>You can use a special Tuscany Maven plugin (maven-osgi-junit-plugin) to unit test contributions in a JUnit environment. This relies on adding some configuration to the Maven pom.xml. For example, if you look in maven-junit-osgi/calculator-osgi you'll see:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.tuscany.maven.plugins&lt;/groupId&gt;
+                &lt;artifactId&gt;maven-osgi-junit-plugin&lt;/artifactId&gt;
+                &lt;version&gt;1.0&lt;/version&gt;
+                &lt;dependencies&gt;
+                   &lt;dependency&gt;
+                      &lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt;
+                      &lt;artifactId&gt;tuscany-node-launcher-equinox&lt;/artifactId&gt;
+                      &lt;version&gt;${pom.version}&lt;/version&gt;
+                   &lt;/dependency&gt;
+                &lt;/dependencies&gt;
+                &lt;executions&gt;
+                    &lt;execution&gt;
+                        &lt;id&gt;osgi-test&lt;/id&gt;
+                        &lt;phase&gt;test&lt;/phase&gt;
+                        &lt;goals&gt;
+                            &lt;goal&gt;test&lt;/goal&gt;
+                        &lt;/goals&gt;
+                        &lt;configuration&gt;
+                            &lt;systemProperties&gt;
+                                &lt;property&gt;
+                                    &lt;name&gt;osgi.configuration.area&lt;/name&gt;
+                                    &lt;value&gt;${project.build.directory}/equinox&lt;/value&gt;
+                                &lt;/property&gt;
+                            &lt;/systemProperties&gt;
+                        &lt;/configuration&gt;
+                    &lt;/execution&gt;
+                &lt;/executions&gt;
+            &lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This configures the maven-osgi-junit-plugin to use the tuscany-node-launcher-equinox to install the contribution represented by the calculator-osgi directory. As an alternative to this configuration you could use the contents of tuscany-node-launcher-equinox directly in your JUnit test to launch the Tuscany runtime using OSGi.</P>
+
+<P>To run the contributions unit test do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd maven-junit/calculator-contribution
+mvn
+</PRE>
+</DIV></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-osgi"></A>osgi</H3>
+
+<P>The Tuscany runtime can be run in a vanilla OSGi container such as Equinox. To do this you have to:</P>
+
+<UL class="alternate" type="square">
+	<LI>launch the OSGi container itself</LI>
+	<LI>load the Tuscany runtime bundles (all our jars are bundles) into the container</LI>
+	<LI>install a contribution packaged as an OSGi bundle</LI>
+</UL>
+
+
+<P>For example, to install a contribution in Equinox do the following</P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ..\..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\..\features\configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>On &#42;Unix, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -jar ../../../modules/osgi-3.5.0-v20090520.jar -configuration ../../../features/configuration -clean -console
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt;
+
+osgi&gt; Jun 22, 2009 1:32:27 PM org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator start
+
+INFO: Equinox-based service discoverer is now configured.
+
+</PRE>
+</DIV></DIV>
+
+<P>You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start contributions as bundles by doing the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./path/to/&lt;contribution_bundle.jar&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Note that &lt;contribution_bundle.jar&gt; will need an activator in order to register the bundle as a SCA contribution</P>
+
+<P>Running on Felix</P>
+
+<P>See <A href="http://tuscany.apache.org/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html" class="external-link" rel="nofollow">http://tuscany.apache.org/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html</A></P>
+
+
+<H3><A name="2.0-beta-Samplesdocumentation-shell"></A>shell</H3>
+
+<P>This directory contains a sample shell program supporting simple commands to start and stop SCA composites.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>We currently have two similar approaches available (see command-line). We need to merge the two together.</TD></TR></TABLE></DIV>
+
+<P>To build the sample shell do this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn install
+</PRE>
+</DIV></DIV>
+<P>To run it:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca
+</PRE>
+</DIV></DIV>
+
+<P>at the prompt:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+start myNode ../../applications/store/target/sample-store.jar
+</PRE>
+</DIV></DIV>
+<P>or:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+start myNode http:<SPAN class="code-comment">//people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar</SPAN>
+</PRE>
+</DIV></DIV>
+<P>also try:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+status
+stop myNode
+bye
+</PRE>
+</DIV></DIV>
+<P>Starting and stopping composites is pretty fast. To see that, try the following<BR>
+two scripts, which start/stop the sample store composite 10 times.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca &lt;scripts/test.txt
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca &lt;scripts/test-remote.txt
+</PRE>
+</DIV></DIV>
+
+<P>The shell can also run as a Webapp. To try it install target/scashell.war in<BR>
+a Web container, point your Web browser to <A href="http://localhost:8080/scashell" class="external-link" rel="nofollow">http://localhost:8080/scashell</A><BR>
+and try the links on that page.</P>
+
+<H3><A name="2.0-beta-Samplesdocumentation-webapp"></A>webapp</H3>
+
+<P>Tuscany can be embedded inside a webapp alongside one or more SCA contributions. To execute sample webapp based contributions (contributions that have webapp at the end of their name) you can build the contribution using maven and then copy the resulting war file to your container of choice</P>
+
+<P>For example, for binding-jsonrpc/contribution-calculator-webapp, do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd samples/binding-jsonrpc/contribution-calculator-webapp
+mvn
+cp target/sample-contribution-binding-jsonrpc-calculator-webapp.war &lt;your_container_deployment-dir&gt;
+</PRE>
+</DIV></DIV>
+
+<P>As an alternative, sample webapp based contributions can be run within Jetty directly from Maven, look for webapp contributions that have the following configuration in their pom.xml file:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;plugin&gt;
+    &lt;groupId&gt;org.mortbay.jetty&lt;/groupId&gt;
+    &lt;artifactId&gt;maven-jetty-plugin&lt;/artifactId&gt;
+    &lt;version&gt;6.1.18&lt;/version&gt;
+&lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For contributions that have this, for example, binding-jsonrpc/contribution-calculator-webapp, do the following</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd samples/binding-sca/contribution-calculator
+mvn jetty:run
+</PRE>
+</DIV></DIV>
+
+<P>This will launch the contribution in the Jetty runtime and then wait. At this point you can use HTTP clients to send messages to services that the running SCA applcation exposes. For this example try pointing your browser at:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8080/sample-binding-jsonrpc-calculator-webapp/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="2.0-beta-Samplesdocumentation-extendingtuscany"></A>extending-tuscany</H2>
+
+<H3><A name="2.0-beta-Samplesdocumentation-bindingextension"></A>binding-extension</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-implementationextension"></A>implementation-extension</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H2><A name="2.0-beta-Samplesdocumentation-applications"></A>applications</H2>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-store"></A>store</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="2.0-beta-Samplesdocumentation-storewebapp"></A>store-webapp</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : 2.0- beta- Samples documentation';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/20-release-notes.html b/site/trunk/site-publish/documentation-2x/20-release-notes.html
new file mode 100644
index 0000000000..fa3d9b1da2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/20-release-notes.html
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+
+        <TITLE>2.0 Release Notes : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANYxDOCx2x&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=108928">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="2.0 Release Notes">2.0 Release Notes</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <H3><A name="2.0ReleaseNotes-2.0ReleaseNotes"></A>2.0 Release Notes</H3>
+
+<P>The OASIS SCA specification are going to be released around June/July 2009 so we're <A href="http://apache.markmail.org/message/2nvxv4xlrkva6jku" rel="nofollow">planning </A> on having a 2.0 release ready at the same time. To help work out what we need to do this is a draft of the release notes:</P>
+
+<P>Apache Tuscany SCA 2.0 June 2009 Release Notes<BR>
+==============================================</P>
+
+<P>Apache Tuscany provides a runtime based on the Service Component<BR>
+Architecture. SCA is a set of specifications aimed at simplifying SOA<BR>
+Application Development which are being standardized at OASIS as part<BR>
+of Open Composite Services Architecture (Open CSA) - <A href="http://www.oasis-opencsa.org/" rel="nofollow">http://www.oasis-opencsa.org/</A>.</P>
+
+<P>Overview<BR>
+--------</P>
+
+<P>     The Apache Tuscany SCA 2.0 release includes implementations of the<BR>
+     main SCA specifications including:</P>
+
+<P>        SCA Assembly Model V1.1<BR>
+        SCA Policy Framework V1.1<BR>
+        SCA Java Common Annotations and APIs V1.1<BR>
+        SCA Java Component Implementation V1.1<BR>
+        SCA Spring Component Implementation V1.1<BR>
+        SCA BPEL Client and Implementation V1.1<BR>
+        SCA JMS Binding Specification V1.1<BR>
+        SCA Web Services Binding V1.1<BR>
+        SCA EJB Session Bean Binding V1.1<BR>
+        SCA Java EE Integration Specification V1.1</P>
+
+<P>    It also includes implementations of many features not yet defined<BR>
+    by SCA specifications, including:</P>
+
+<UL class="alternate" type="square">
+	<LI>SCA bindings for CORBA, Direct Web Remoting, RSS and ATOM Feeds,<BR>
+          HTTP resources, JSONP, JSON-RPC, Hessian, and RMI.</LI>
+	<LI>SCA implementation types for OSGI, XQuery, and various dynamic<BR>
+          languages including Groovy, Javascript, Python and Ruby</LI>
+	<LI>Databindings for Service Data Objects (SDO), JAXB, XmlBeans,<BR>
+          Axis2's AXIOM, JSON, SAXON, XStream, DOM, SAX and StAX</LI>
+</UL>
+
+
+<P>    The Tuscany SCA Runtime can be configured as a single node SCA domain or <BR>
+    as an SCA domain distributed across multiple nodes. <BR>
+    In addition Tuscany SCA supports the following host-deployment options: -</P>
+<UL class="alternate" type="square">
+	<LI>running standalone in JSE or OSGi</LI>
+	<LI>running with distributed nodes across multiple JVMs</LI>
+	<LI>running with embedded Jetty or Tomcat</LI>
+	<LI>running as a standard web application</LI>
+	<LI>running as a module in Geronimo</LI>
+</UL>
+
+
+<P>See the CHANGES file for a detailed list of the features in this release.</P>
+
+<P>Support<BR>
+-------</P>
+
+<P>For more information on Apache Tuscany visit the website at:</P>
+
+<P>    <A href="http://tuscany.apache.org/" rel="nofollow">http://tuscany.apache.org/</A></P>
+
+<P>Any issues with this release can be reported to Apache Tuscany<BR>
+using the mailing lists or in the JIRA issue tracker.</P>
+
+<P>    Mailing list archives:</P>
+
+<P>       <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/</A><BR>
+       <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/</A></P>
+
+<P>    Jira:</P>
+
+<P>       <A href="http://issues.apache.org/jira/browse/TUSCANY" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY</A></P>
+
+<P>To join the project's mailing lists follow the instructions at:</P>
+
+<P>    <A href="http://tuscany.apache.org/mailing-lists.html" rel="nofollow">http://tuscany.apache.org/mailing-lists.html</A></P>
+
+<P>To find out more about OASIS Open CSA go to: </P>
+
+<P>    <A href="http://www.oasis-opencsa.org/" rel="nofollow">http://www.oasis-opencsa.org</A>.</P>
+
+<P>Apache Tuscany welcomes your help. Any contribution, including code,<BR>
+testing, improving the documentation, or bug reporting is always<BR>
+appreciated. </P>
+
+<P>Thank you for using Apache Tuscany!</P>
+
+<UL class="alternate" type="square">
+	<LI>The Tuscany Team.</LI>
+</UL>
+
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/classloading.html b/site/trunk/site-publish/documentation-2x/classloading.html
new file mode 100644
index 0000000000..aa51c96265
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/classloading.html
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Classloading : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Classloading">Classloading</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Classloading">Classloading</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Classloading</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644728">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644728">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644728">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644728">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644728">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644728">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>Need to detail the various ways the Tuscany runtime loads classes and the issues involved. Here are some notes to kick of this document</P>
+
+<H1><A name="Classloading-ClassloadingObjectives"></A>Classloading Objectives</H1>
+
+<P>The runtime must work in both OSGi and non-OSGI environments. I.e. we can't rely on the OSGi service registry for extensibility<BR>
+The runtime must not be generally environment specific. I.e. no buddy classloading<BR>
+...</P>
+
+<H1><A name="Classloading-GeneralPatterns"></A>General Patterns</H1>
+
+<H2><A name="Classloading-ExtensionloadingJSE"></A>Extension loading - JSE</H2>
+
+<P>tuscany-extensibility<BR>
+Tuscany finds extensions by looking for META-INF/services files on the classpath.</P>
+
+<H2><A name="Classloading-ExtensionloadingOSGi"></A>Extension loading - OSGi</H2>
+
+<P>tuscany-extensibility-equinox<BR>
+It's a bit more complicated here. The extensibility-equinox bundle is given the entire OSGi context at start up and from there is looks in all of the loaded bundles looking for META-INF/services files. It caches them against the bundle in which they are found.</P>
+
+<P>The tuscany-extensibility-equinox bundle also has a dynamic import</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox,
+ javax.transaction;version=<SPAN class="code-quote">&quot;1.1&quot;</SPAN>,
+ javax.transaction.xa;version=<SPAN class="code-quote">&quot;1.1&quot;</SPAN>,
+</PRE>
+</DIV></DIV>
+
+<P>Which allows it to generally load any classes in the runtime</P>
+
+<H2><A name="Classloading-SplitPackagesJSE"></A>Split Packages - JSE</H2>
+
+<P>We don't take any special account of this in JSE <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"><BR>
+We avoid split packages across the JARs we create as it messes OSGi up.</P>
+
+<H2><A name="Classloading-SplitPackagesOSGI"></A>Split Packages - OSGI</H2>
+
+<P>We avoid split packages across the bundles we create<BR>
+They may exist in third party bundles (or jars that we turn into bundles) so we need a way round it</P>
+
+<P>The Tuscany eclipse plugin is used to generate bundles manifest for jars which don't have them. This is done automatically with all packages exported <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> and the resulting bundle it in the distribution modules directory in the following form</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+bundle-name
+  META-INF
+     MANIFEST.MF
+  bundle-name.jar
+</PRE>
+</DIV></DIV>
+
+<P>The MANIFEST.MF is generated and will have a bundle classpath pointing to the jar (which doesn't itself have a manifest</P>
+
+<P>The runtime (node-launcher-equinox) has code to load these directories as bundles.</P>
+
+<P>There is a way of overriding these automatically generated bundles so that split packages (or any other manifest problems) can be worked round. Generate the manifest manually and put it in</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+distribution/all/manifests
+</PRE>
+</DIV></DIV>
+
+<P>Update distribution/pom.xml to configure the Tuscany version of the maven bundle plugin to apply this manifest</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.tuscany.maven.plugins&lt;/groupId&gt;
+                &lt;artifactId&gt;maven-bundle-plugin&lt;/artifactId&gt;
+                &lt;version&gt;1.0.6&lt;/version&gt;
+                &lt;executions&gt;
+                    &lt;execution&gt;
+                        &lt;id&gt;distribution-modules&lt;/id&gt;
+                        &lt;phase&gt;generate-resources&lt;/phase&gt;
+                        &lt;goals&gt;
+                             &lt;goal&gt;generate-modules&lt;/goal&gt;
+                        &lt;/goals&gt;
+                        &lt;configuration&gt;
+                             &lt;targetDirectory&gt;target/modules&lt;/targetDirectory&gt;
+                             &lt;useDistributionName&gt;${useDistributionName}&lt;/useDistributionName&gt;
+                             &lt;generateAggregatedBundle&gt;${generateAggregatedBundle}&lt;/generateAggregatedBundle&gt;
+                             &lt;generateManifestJar&gt;true&lt;/generateManifestJar&gt;
+                             &lt;artifactManifests&gt;
+                                 &lt;artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.ws.commons.axiom&lt;/groupId&gt;
+                                     &lt;artifactId&gt;axiom-api&lt;/artifactId&gt;
+                                     &lt;version&gt;1.2.8&lt;/version&gt;
+                                     &lt;manifestFile&gt;${basedir}/manifests/axiom-api-1.2.8.MF&lt;/manifestFile&gt;
+                                 &lt;/artifactManifest&gt;
+                                 &lt;artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.woden&lt;/groupId&gt;
+                                     &lt;artifactId&gt;woden-impl-dom&lt;/artifactId&gt;
+                                     &lt;version&gt;1.0M8&lt;/version&gt;
+                                     &lt;manifestFile&gt;${basedir}/manifests/woden-impl-dom-1.0M8.MF&lt;/manifestFile&gt;
+                                 &lt;/artifactManifest&gt;
+                                 &lt;!--artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.tuscany.sdo&lt;/groupId&gt;
+                                     &lt;artifactId&gt;tuscany-sdo-api-r2.1&lt;/artifactId&gt;
+                                     &lt;version&gt;1.1.1&lt;/version&gt;
+                                     &lt;manifestFile&gt;${basedir}/manifests/tuscany-sdo-api-r2.1-1.1.1.MF&lt;/manifestFile&gt;
+                                 &lt;/artifactManifest--&gt;
+                                 &lt;!-- artifactAggregations (below) is the right approach to solving the split
+                                      package between axis-kernel and axis2-transport-http however the Tuscany
+                                      runtime doesn't take any notice of it so using a fragment at the moment --&gt;
+                                 &lt;artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.axis2&lt;/groupId&gt;
+                                     &lt;artifactId&gt;axis2-kernel&lt;/artifactId&gt;
+                                     &lt;version&gt;1.5.1&lt;/version&gt;
+                                     &lt;manifestFile&gt;${basedir}/manifests/axis2-kernel-1.5.1.MF&lt;/manifestFile&gt;
+                                 &lt;/artifactManifest&gt;
+                                 &lt;artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.axis2&lt;/groupId&gt;
+                                     &lt;artifactId&gt;axis2-transport-http&lt;/artifactId&gt;
+                                     &lt;version&gt;1.5.1&lt;/version&gt;
+                                     &lt;manifestFile&gt;${basedir}/manifests/axis2-transport-http-1.5.1.MF&lt;/manifestFile&gt;
+                                 &lt;/artifactManifest&gt;
+                                 &lt;artifactManifest&gt;
+                                     &lt;groupId&gt;org.apache.axis2&lt;/groupId&gt;
+                                     &lt;artifactId&gt;*&lt;/artifactId&gt;
+                                     &lt;version&gt;*&lt;/version&gt;
+                                 &lt;/artifactManifest&gt;
+                             &lt;/artifactManifests&gt;
+                             &lt;!--artifactAggregations&gt;
+                                  &lt;artifactAggregation&gt;
+                                      &lt;symbolicName&gt;org.apache.tuscany.sca.axis2-kernel&lt;/symbolicName&gt;
+                                      &lt;version&gt;1.5.1&lt;/version&gt;
+                                      &lt;artifactMembers&gt;
+                                          &lt;artifactMember&gt;
+                                              &lt;groupId&gt;org.apache.axis2&lt;/groupId&gt;
+                                              &lt;artifactId&gt;axis2-kernel&lt;/artifactId&gt;
+                                              &lt;version&gt;1.5.1&lt;/version&gt;
+                                          &lt;/artifactMember&gt;
+                                          &lt;artifactMember&gt;
+                                              &lt;groupId&gt;org.apache.axis2&lt;/groupId&gt;
+                                              &lt;artifactId&gt;axis2-transport-http&lt;/artifactId&gt;
+                                              &lt;version&gt;1.5.1&lt;/version&gt;
+                                          &lt;/artifactMember&gt;
+                                      &lt;/artifactMembers&gt;
+                                  &lt;/artifactAggregation&gt;
+                              &lt;/artifactAggregations--&gt;
+                        &lt;/configuration&gt;
+                    &lt;/execution&gt;
+                &lt;/executions&gt;
+                &lt;dependencies&gt;
+                   &lt;dependency&gt;
+                      &lt;groupId&gt;org.eclipse&lt;/groupId&gt;
+                      &lt;artifactId&gt;osgi&lt;/artifactId&gt;
+                      &lt;version&gt;3.3.0-v20070530&lt;/version&gt;
+                   &lt;/dependency&gt;
+                &lt;/dependencies&gt;
+            &lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>You'll note that there is an artifact aggregation element that doesn't work at the moment. This should aggregate the two bundles together so that a split package isn't an issue. As this doesn't work at the moment another way to achieve the same result is to make one package a fragement of the other by configuring separate manifests manually.</P>
+
+<P>NOTE&#33;&#33;&#33;&#33;&#33; you also need to put the manually generated manifest in node-launcher-equinox\src\main\resources\org\apache\tuscany\sca\node\equinox\launcher otherwise you'll spend a lot of time trying to get this to work. (we need to fix this&#33;)</P>
+
+<H2><A name="Classloading-ThirdpartylibrariesJSE"></A>Third-party libraries - JSE</H2>
+
+<P>TBD</P>
+
+<H2><A name="Classloading-ThirdpartylibrariesOSGI"></A>Third-party libraries - OSGI</H2>
+
+<P>Third-party libraries often rely on TCCL to load implementation classes in an extensible way. For example, the SDO API loads the HelperContext implementation in this way. In an OSGi environment there will not be a static dependency between the api bundle and the impl bundle so we need to fake it. Typically we do this by setting up the TCCL appropriately before the library us called.</P>
+
+<P>See ClassLoaderContext which help us to set up a multi-classloader configurations.</P>
+
+<P>Typically in OSGi one of the classloaders we pass in here will be the extensibiliy-equinox bundle classloader (the ServiceDiscoverer) as this bundles has a dynamic import which allows it to load any class in the runtime.</P>
+
+
+<H2><A name="Classloading-TuscanyNodeAPIJSE"></A>Tuscany Node API - JSE</H2>
+
+<P>TBD</P>
+
+<H2><A name="Classloading-TuscanyNodeAPIOSGi"></A>Tuscany Node API - OSGi</H2>
+
+<P>There are a small number of Tuscany Jars you need to use in the app launcher in the OSGi environment</P>
+
+<P>tuscany-sca-api<BR>
+tuscany-node-api<BR>
+tuscany-node-launcher-equinox</P>
+
+<P>The node API has to load the node implementation and has a dynamic import in its manifest</P>
+
+<P>DynamicImport-Package: org.apache.tuscany.sca.node.impl,org.apache.tuscany.sca.extensibility</P>
+
+
+
+<H2><A name="Classloading-SCAClientAPIJSE"></A>SCA Client API - JSE</H2>
+
+<P>Factory finder impl is injected into the API class by the implementation</P>
+
+<H2><A name="Classloading-SCAClientAPIOSGi"></A>SCA Client API - OSGi</H2>
+
+<P>NodeFactory maintains a NodeProxy inner class that supports cross-classloader calls. The calling client api will have been loaded by the app classloader but the underlying node will have been loaded by a bundle classloader. We need to bridge that gap.</P>
+
+<H2><A name="Classloading-%23ContributionClassLoading"></A><A href="#Classloading-Contribution">Contribution</A> Class Loading </H2>
+
+<P>When a contribution is read, containing an implementation.java element, a ClassReference is instantiated, which contains the name of the class. ClassReference instances are resolved by a ClassLoaderModelResolver, by virtue of the entry in&nbsp;[2]</P>
+
+<P>The ClassLoaderModelResolver (CLMR) specializes java.net.URL.URLClassLoader and implements o.a.t.s....ModelResolver. Each contribution is associated with a single CLMR . On construction the CLMR is endowed with a set of URLs that allow it to find all classes in its contribution via the URLClassLoader behaviour.</P>
+
+<P>The itest project <EM>import-export-tests</EM> has a class TestTestCase with method testOneNode which demonstrates a&nbsp;more complex scenario&nbsp;where a cross contribution import/export of a java package exists between the contributions. &nbsp;In this example a node is created using 2 composite URIs for contributions ... &quot;../exports/target/classes&quot;, &quot;../imports/target/classes&quot;. An imported class is resolved using the CLMR of the exporting contribution. &nbsp;The exporter's CLMR is made available to the importing CLMR by deployment [1] code which traverses all contributions, identifying cross contribution dependencies (see buildDependencies at [1])&nbsp;&nbsp;and using the set of remaining contributions to resolve the import, potentially more than once.</P>
+
+<P>[<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=1&linkCreation=true&fromPageId=20644728" class="createlink">1</A>]&nbsp;<A href="http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?view=markup&pathrev=948564" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?view=markup&amp;pathrev=948564</A>&#124;http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?view=markup&amp;pathrev=948564]</P>
+
+<P>[2]&nbsp;<A href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver</A></P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Classloading';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-applications.html b/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-applications.html
new file mode 100644
index 0000000000..2540d77245
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-applications.html
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Converting Tuscany 1.x Applications : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Converting Tuscany 1.x Applications">Converting Tuscany 1.x Applications</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Converting Tuscany 1.x Applications">Converting Tuscany 1.x Applications</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Converting Tuscany 1.x Applications</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23336783">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23336783">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23336783">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23336783">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23336783">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23336783">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> under construction</P>
+<H1><A name="ConvertingTuscany1.xApplications-Overview"></A>Overview</H1>
+<P>There are not huge differences in the SCA that Tuscany 1.x implements (OSOA v1.0) and the SCA that Tuscany 2.x implements (OASIS v1.1). However there are detailed differences that you need to be aware of in SCA and in the Tuscany runtime in order to get your 1.x application to work in 2.x. </P>
+
+<H1><A name="ConvertingTuscany1.xApplications-ConvertingcompositesandotherSCAXMLartifacts"></A>Converting composites and other SCA XML artifacts</H1>
+<H2><A name="ConvertingTuscany1.xApplications-Namespaces"></A>Namespaces</H2>
+<P>The SCA and Tuscany namespaces may be used in the following files</P>
+
+<UL class="alternate" type="square">
+	<LI>*.composite</LI>
+	<LI>sca-contribution.xml</LI>
+	<LI>defintions.xml</LI>
+</UL>
+
+
+<P>Each occurrence needs changing for 2.x </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> 1.x Namespace</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> 2.x Namespace </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.osoa.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://www.osoa.org/xmlns/sca/1.0</A> </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> <A href="http://docs.oasis-open.org/ns/opencsa/sca/200912" class="external-link" rel="nofollow">http://docs.oasis-open.org/ns/opencsa/sca/200912</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://tuscany.apache.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.0</A> </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> <A href="http://tuscany.apache.org/xmlns/sca/1.1" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.1</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="ConvertingTuscany1.xApplications-Features"></A>Features</H1>
+<H2><A name="ConvertingTuscany1.xApplications-Featuresthatarein1.xbutnotin2.x"></A>Features that are in 1.x but not in 2.x</H2>
+
+<UL class="alternate" type="square">
+	<LI>Support for conversational interfaces<BR>
+-</LI>
+</UL>
+
+
+<H2><A name="ConvertingTuscany1.xApplications-Featuresthatarein2.xbutnotin1.x"></A>Features that are in 2.x but not in 1.x</H2>
+
+<UL class="alternate" type="square">
+	<LI>Asynchronous reference and service APIs</LI>
+	<LI></LI>
+</UL>
+
+
+<H1><A name="ConvertingTuscany1.xApplications-Buildingandlaunchingcontributions"></A>Building and launching contributions</H1>
+<H2><A name="ConvertingTuscany1.xApplications-Convertingdependencies"></A>Converting dependencies</H2>
+
+<P>You need to re-configure the project pom.xml</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> 1.x Dependencies </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> 2.x Dependencies </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;dependency&gt; <BR class="atl-forced-newline">
+&lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt; <BR class="atl-forced-newline">
+&lt;artifactId&gt;tuscany-assembly&lt;/artifactId&gt; <BR class="atl-forced-newline">
+&lt;version&gt;1.6-SNAPSHOT&lt;/version&gt; <BR class="atl-forced-newline">
+&lt;/dependency&gt; </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> &lt;dependency&gt; <BR class="atl-forced-newline">
+&lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt; <BR class="atl-forced-newline">
+&lt;artifactId&gt;tuscany-assembly&lt;/artifactId&gt; <BR class="atl-forced-newline">
+&lt;version&gt;2.0-SNAPSHOT&lt;/version&gt; <BR class="atl-forced-newline">
+&lt;/dependency&gt; </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO - need to note what the final Tuscany feature grouping solution is for 2.x</P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Converting Tuscany 1.x Applications';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-extensions.html b/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-extensions.html
new file mode 100644
index 0000000000..152bf98fdc
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/converting-tuscany-1x-extensions.html
@@ -0,0 +1,486 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Converting Tuscany 1.x Extensions : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Converting Tuscany 1.x Extensions">Converting Tuscany 1.x Extensions</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Converting Tuscany 1.x Extensions">Converting Tuscany 1.x Extensions</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Converting Tuscany 1.x Extensions</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=3475132">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=3475132">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=3475132">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=3475132">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=3475132">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=3475132">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="ConvertingTuscany1.xExtensions-Converting1.xdependencies"></A>Converting 1.x dependencies</H1>
+
+<P>You should configure the project pom.xml and</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> 1.x Dependencies </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> 2.x Dependencies </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;dependency&gt; <BR class="atl-forced-newline">
+&lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt; <BR class="atl-forced-newline">
+&lt;artifactId&gt;tuscany-assembly&lt;/artifactId&gt; <BR class="atl-forced-newline">
+&lt;version&gt;1.6-SNAPSHOT&lt;/version&gt; <BR class="atl-forced-newline">
+&lt;/dependency&gt; </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> &lt;dependency&gt; <BR class="atl-forced-newline">
+&lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt; <BR class="atl-forced-newline">
+&lt;artifactId&gt;tuscany-assembly&lt;/artifactId&gt; <BR class="atl-forced-newline">
+&lt;version&gt;2.0-SNAPSHOT&lt;/version&gt; <BR class="atl-forced-newline">
+&lt;/dependency&gt; </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>The following core modules are not ported yet :</P>
+
+<UL>
+	<LI>some policies</LI>
+</UL>
+
+
+<P>The following modules are deprecated :</P>
+
+<UL>
+	<LI>host-embedded
+	<UL>
+		<LI>use the new Node APIs</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H1><A name="ConvertingTuscany1.xExtensions-ConvertingCompositesandotherSCAXMLArtifacts"></A>Converting Composites and other SCA XML Artifacts</H1>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> 1.x Namespace</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> 2.x Namespace </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.osoa.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://www.osoa.org/xmlns/sca/1.0</A> </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> <A href="http://docs.oasis-open.org/ns/opencsa/sca/200912" class="external-link" rel="nofollow">http://docs.oasis-open.org/ns/opencsa/sca/200912</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://tuscany.apache.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.0</A> </TD>
+<TD class="confluenceTd"> ===&gt; </TD>
+<TD class="confluenceTd"> <A href="http://tuscany.apache.org/xmlns/sca/1.1" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.1</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="ConvertingTuscany1.xExtensions-GeneratingOSGiManifest"></A>Generating OSGi Manifest</H1>
+
+<P>Configure pom to use Apache Felix <A href="http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html" class="external-link" rel="nofollow">maven-bundle-plugin</A></P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;build&gt;
+        &lt;plugins&gt;
+            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;
+                &lt;artifactId&gt;maven-bundle-plugin&lt;/artifactId&gt;
+
+                &lt;configuration&gt;
+                    &lt;instructions&gt;
+                        &lt;Bundle-Version&gt;${tuscany.version}&lt;/Bundle-Version&gt;
+                        &lt;Bundle-SymbolicName&gt;org.apache.tuscany.sca.binding.atom&lt;/Bundle-SymbolicName&gt;
+                        &lt;Bundle-Description&gt;${pom.name}&lt;/Bundle-Description&gt;
+                        &lt;Export-Package&gt;org.apache.tuscany.sca.binding.atom*&lt;/Export-Package&gt;
+                        &lt;Import-Package&gt;org.apache.tuscany.sca.assembly.xml;version=<SPAN class="code-quote">&quot;2.0.0&quot;</SPAN>, *&lt;/Import-Package&gt;
+                    &lt;/instructions&gt;
+                &lt;/configuration&gt;
+            &lt;/plugin&gt;
+        &lt;/plugins&gt;
+    &lt;/build&gt;
+
+</PRE>
+</DIV></DIV>
+
+<P>Generate the manifest</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn org.apache.felix:maven-bundle-plugin:manifest
+</PRE>
+</DIV></DIV>
+
+<P>Copy the generated manifest from target folder to</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;module-root&gt;/META_INF/manifest.mf
+</PRE>
+</DIV></DIV>
+
+<P>Add manifest to source control</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+git add META-INF
+or
+svn add META-INF
+</PRE>
+</DIV></DIV>
+
+<P>Make any manual modifications as necessary</P>
+
+<H1><A name="ConvertingTuscany1.xExtensions-Convertingyourextensionmodel"></A>Converting your extension model</H1>
+
+<P>Your extension model needs to provide a new getType method</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> AtomCBinding <SPAN class="code-keyword">extends</SPAN> Binding {
+   QName TYPE = <SPAN class="code-keyword">new</SPAN> QName(SCA11_TUSCANY_NS, <SPAN class="code-quote">&quot;binding.atom&quot;</SPAN>);
+   ...
+}
+
+<SPAN class="code-keyword">public</SPAN> class AtomBindingImpl <SPAN class="code-keyword">implements</SPAN> AtomBinding {
+   <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> name;
+   <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> uri;
+
+   <SPAN class="code-keyword">public</SPAN> QName getType() {
+	<SPAN class="code-keyword">return</SPAN> TYPE;
+   }
+
+    ...
+}
+</PRE>
+</DIV></DIV>
+
+<H1><A name="ConvertingTuscany1.xExtensions-ConvertingArtifactProcessors"></A>Converting Artifact Processors</H1>
+
+<P>Make sure you update your META-INF\services\org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor with new namespace and any other necessary changes to reflect the current 2.x structure.</P>
+
+<H1><A name="ConvertingTuscany1.xExtensions-ConvertingyouBindingruntimeartifacts"></A>Converting you Binding runtime artifacts</H1>
+
+<H3><A name="ConvertingTuscany1.xExtensions-ProviderFactory"></A>Provider Factory</H3>
+
+<UL>
+	<LI>The provider factory interface has changed to accommodate the new Endpoint/EndPointReference support
+	<UL>
+		<LI>Although the interface has changed, all the previous available information are encapsulated and available from the Endpoint and EndpointReference object</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> BindingProviderFactory&lt;M <SPAN class="code-keyword">extends</SPAN> Binding&gt; <SPAN class="code-keyword">extends</SPAN> ProviderFactory&lt;M&gt; {
+
+    /**
+     * Creates a <SPAN class="code-keyword">new</SPAN> reference binding provider <SPAN class="code-keyword">for</SPAN> the given endpoint reference
+     *
+     * @param endpointReference defines the component/reference/binding against which to create the provider
+     * @<SPAN class="code-keyword">return</SPAN> The binding provider
+     */
+    ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference);
+
+    /**
+     * Creates a <SPAN class="code-keyword">new</SPAN> service binding provider <SPAN class="code-keyword">for</SPAN> the given component and
+     * service.
+     *
+     * @param endpoint defines the component/service/binding against which to create the provider
+     * @<SPAN class="code-keyword">return</SPAN> The binding provider
+     */
+    ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint);
+
+}
+</PRE>
+</DIV></DIV>
+
+<UL>
+	<LI>If you are using ModelFactoryExtensionPoint, it was renamed to FactoryExtensionPoint</LI>
+</UL>
+
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="ConvertingTuscany1.xExtensions-ReferenceBindingProviderandServiceBindingProvider"></A>ReferenceBindingProvider and ServiceBindingProvider</H3>
+
+<P>The previous SCA Models that were previously passed directly to these SPIs, is now available via Endpoint and EndpointReference as described in the code below:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class AtomReferenceBindingProvider <SPAN class="code-keyword">implements</SPAN> ReferenceBindingProvider {
+
+    <SPAN class="code-keyword">private</SPAN> RuntimeComponentReference reference;
+    <SPAN class="code-keyword">private</SPAN> AtomBinding binding;
+
+    <SPAN class="code-keyword">public</SPAN> AtomReferenceBindingProvider(EndpointReference endpointReference,
+                                        AtomBinding binding) {
+
+    	<SPAN class="code-keyword">this</SPAN>.reference = (RuntimeComponentReference) endpointReference.getReference();
+        <SPAN class="code-keyword">this</SPAN>.binding = (AtomBinding) endpointReference.getBinding();
+    }
+
+    ...
+}
+
+<SPAN class="code-keyword">public</SPAN> class AtomServiceBindingProvider <SPAN class="code-keyword">implements</SPAN> ServiceBindingProvider {
+
+
+    <SPAN class="code-keyword">private</SPAN> MessageFactory messageFactory;
+
+    <SPAN class="code-keyword">private</SPAN> Endpoint endpoint;
+    <SPAN class="code-keyword">private</SPAN> RuntimeComponent component;
+    <SPAN class="code-keyword">private</SPAN> RuntimeComponentService service;
+    <SPAN class="code-keyword">private</SPAN> InterfaceContract serviceContract;
+    <SPAN class="code-keyword">private</SPAN> AtomBinding binding;
+    <SPAN class="code-keyword">private</SPAN> ServletHost servletHost;
+
+    ...
+
+    <SPAN class="code-keyword">public</SPAN> AtomServiceBindingProvider(Endpoint endpoint,
+                                         MessageFactory messageFactory,
+                                         ServletHost servletHost) {
+        <SPAN class="code-keyword">this</SPAN>.endpoint = endpoint;
+        <SPAN class="code-keyword">this</SPAN>.component = (RuntimeComponent)endpoint.getComponent();
+        <SPAN class="code-keyword">this</SPAN>.service = (RuntimeComponentService)endpoint.getService();
+        <SPAN class="code-keyword">this</SPAN>.binding = (AtomBinding) endpoint.getBinding();
+        <SPAN class="code-keyword">this</SPAN>.messageFactory = messageFactory;
+        <SPAN class="code-keyword">this</SPAN>.servletHost = servletHost;
+
+    }
+
+    ....
+
+</PRE>
+</DIV></DIV>
+
+<H1><A name="ConvertingTuscany1.xExtensions-ConvertingyouImplementationruntimeartifacts"></A>Converting you Implementation runtime artifacts</H1>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+...
+</PRE>
+</DIV></DIV>
+
+<H1><A name="ConvertingTuscany1.xExtensions-Convertingtestcases"></A>Converting test cases</H1>
+
+<P>In 2.x we removed the Host-Embedded module and the SCADomain, and the recommended way is to use the Node SPI to build your test cases. We also are recommending using JUnit 4.5 test styles. See below a quick</P>
+
+<P><B>1.x Style</B></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class AtomTestCase {
+
+	<SPAN class="code-keyword">private</SPAN> SCADomain domain;
+
+	@Before
+	<SPAN class="code-keyword">public</SPAN> void setUp() <SPAN class="code-keyword">throws</SPAN> Exception {
+		domain = SCADomain.newInstance(<SPAN class="code-quote">&quot;AtomBinding.composite&quot;</SPAN>);
+	}
+
+	@After
+	<SPAN class="code-keyword">public</SPAN> void tearDown() <SPAN class="code-keyword">throws</SPAN> Exception {
+		domain.close();
+	}
+
+        ....
+}
+</PRE>
+</DIV></DIV>
+
+<P><B>2.x Style</B></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class AtomTestCase {
+
+	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Node node;
+
+	@BeforeClass
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void setUp() <SPAN class="code-keyword">throws</SPAN> Exception {
+	    <SPAN class="code-keyword">try</SPAN> {
+                <SPAN class="code-comment">// use the contribution helper to find the location of the contribution directory
+</SPAN>                <SPAN class="code-comment">// based on a class that is know to be in the contribution
+</SPAN>    		<SPAN class="code-object">String</SPAN> contribution = ContributionLocationHelper.getContributionLocation(AtomTestCase.class);
+
+                <SPAN class="code-comment">// create a note to load the contribution and run the named composite
+</SPAN>    		node = NodeFactory.newInstance().createNode(<SPAN class="code-quote">&quot;AtomBinding.composite&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;test&quot;</SPAN>, contribution));
+
+                <SPAN class="code-comment">// as an alternative to using the helper you can of course specify the location of the
+</SPAN>                <SPAN class="code-comment">// contribution directly, <SPAN class="code-keyword">for</SPAN> example,
+</SPAN>                <SPAN class="code-comment">//
+</SPAN>                <SPAN class="code-comment">// node = NodeFactory.newInstance().createNode(<SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;test&quot;</SPAN>,
+</SPAN>                <SPAN class="code-comment">//                                             <SPAN class="code-quote">&quot;my/directory/structure/atom-contribution.zip&quot;</SPAN>));
+</SPAN>                <SPAN class="code-comment">//
+</SPAN>                <SPAN class="code-comment">// Note also that no composite is named here. It is assumed that the contribution
+</SPAN>                <SPAN class="code-comment">// specifies a deployable composite in the sca-contribution.xml file
+</SPAN>
+                <SPAN class="code-comment">// start the node to make SCA services available
+</SPAN>    		node.start();
+    	    } <SPAN class="code-keyword">catch</SPAN> (Exception e) {
+    		e.printStackTrace();
+    	    }
+	}
+
+	@AfterClass
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void tearDown() <SPAN class="code-keyword">throws</SPAN> Exception {
+	    node.stop();
+    	    node.destroy();
+	}
+
+        ...
+}
+</PRE>
+</DIV></DIV>
+
+<P><B>NOTE</B> You will need to add the node-impl as test dependency to your modules</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        &lt;dependency&gt;
+            &lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt;
+            &lt;artifactId&gt;tuscany-node-impl&lt;/artifactId&gt;
+            &lt;version&gt;2.0-SNAPSHOT&lt;/version&gt;
+            &lt;scope&gt;test&lt;/scope&gt;
+        &lt;/dependency&gt;
+</PRE>
+</DIV></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Converting Tuscany 1.x Extensions';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/create-signing-key.html b/site/trunk/site-publish/documentation-2x/create-signing-key.html
new file mode 100644
index 0000000000..bdbbb23108
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/create-signing-key.html
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Create Signing Key : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Create Signing Key">Create Signing Key</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Create Signing Key">Create Signing Key</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Create Signing Key</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791356">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791356">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791356">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791356">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791356">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791356">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=Menus&linkCreation=true&fromPageId=21791356" class="createlink">Menus</A></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="CreateSigningKey-Createacodesigningkey"></A>Create a code signing key</H3>
+
+<P>Install <A href="http://www.gnupg.org/" class="external-link" rel="nofollow">GNU GPG</A></P>
+
+<P>Create a gpg config file eg c:\gpg\conf\gpg.conf with the following contents:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+utf8-strings
+keyserver x-hkp:<SPAN class="code-comment">//pgp.surfnet.nl/
+</SPAN><SPAN class="code-keyword">default</SPAN>-cert-check-level 3
+keyserver-options auto-key-retrieve include-subkeys
+no-mangle-dos-filenames
+no-secmem-warning
+</PRE>
+</DIV></DIV>
+
+<P>Set the GNUPGHOME environment var to point to that: set GNUPGHOME=\gpg\conf</P>
+
+<P>gpg &#45;-gen-key</P>
+
+<P>accept all defaults, use your apache email and a comment like &quot;Code Signing Key&quot;, eg:</P>
+
+<P>Real name: Ant Elder<BR>
+Email address: antelder@apache.org<BR>
+Comment: Code Signing Key</P>
+
+<P>Use long hard to guess passphrase with numbers and miss spellings etc</P>
+
+<P>now should be able to show that key with: gpg &#45;-list-keys</P>
+
+<P>C:\&gt;gpg &#45;-list-keys<BR>
+/gpgtest/conf\pubring.gpg<BR>
+&#45;-----------------------&#45;<BR>
+pub   1024D/481240F5 2007-06-28<BR>
+uid                  Ant Elder (Code Signing Key) &lt;antelder@apache.org&gt;<BR>
+sub   2048g/F6F122B8 2007-06-28</P>
+
+<P>Upload that to a key server using the keyid, eg gpg &#45;-send-key 481240F5</P>
+
+<P>Now if you go to <A href="http://pgp.surfnet.nl/" class="external-link" rel="nofollow">http://pgp.surfnet.nl/</A> you should be able to search for you name and find the uploaded key</P>
+
+
+<P>Add this key to the KEYS file in the Tuscany SVN: <A href="https://svn.apache.org/repos/asf/incubator/tuscany/KEYS" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/KEYS</A><BR>
+eg, check out the KEYS file then update with:</P>
+
+<P>(gpg &#45;-list-sigs  antelder@apache.org &amp;&amp; gpg &#45;-armor &#45;-export antelder@apache.org) &gt;&gt; KEYS</P>
+
+
+
+
+
+
+</TD></TR></TBODY></TABLE>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Create Signing Key';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Enablement for Tuscany.ppt b/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Enablement for Tuscany.ppt
new file mode 100644
index 0000000000..6a5f78362a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Enablement for Tuscany.ppt
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Remote Services with Tuscany SCA.ppt b/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Remote Services with Tuscany SCA.ppt
new file mode 100644
index 0000000000..5714aaa4a3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/OSGi Remote Services with Tuscany SCA.ppt
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany 2.x Extensibility and SPIs.ppt b/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany 2.x Extensibility and SPIs.ppt
new file mode 100644
index 0000000000..1a162041bf
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany 2.x Extensibility and SPIs.ppt
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany SCA Domain Node.odp b/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany SCA Domain Node.odp
new file mode 100644
index 0000000000..60ab97bd3f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/Tuscany SCA Domain Node.odp
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/development-guides.html b/site/trunk/site-publish/documentation-2x/development-guides.html
new file mode 100644
index 0000000000..0a4efceaa7
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/development-guides.html
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Development Guides : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Development Guides">Development Guides</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Development Guides">Development Guides</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Development Guides</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109130">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109130">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java Runtime Overview</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">Runtime Overview</A> This guide explains various pieces of the Java SCA Runtime, the module structure, and the internals of the runtime.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java Development Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-java-development-guide.html" title="SCA Java Development Guide">Development Guide</A> This guide explains how to checkout the Java SCA 2.x source code, build it and how to contribute code back to the project.</P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>OSGi Aware Programming in Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A> This guide shows the Tuscany developer how to write code and extension code that would comply to some of the OSGi modularity concepts</P>
+
+<P><A href="osgi-enablement-for-tuscany-runtime.html" title="OSGi Enablement for Tuscany Runtime">OSGi Enablement for Tuscany Runtime</A> This guide shows the Tuscany developer how to OSGi enable the Tuscany runtime.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Other...</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="running-tuscany-sca-2x-with-equinox-and-felix.html" title="Running Tuscany SCA 2.x with Equinox and Felix">Running Tuscany SCA 2.x with Equinox and Felix</A> This guide shows the Tuscany developer how to start a Tuscany application on the Equinox or Felix OSGi runtime.</P>
+
+<P><A href="converting-tuscany-1x-extensions.html" title="Converting Tuscany 1.x Extensions">Converting Tuscany 1.x Extensions</A> This guide shows the Tuscany developer how to convert 1.x extensions to 2.x</P>
+
+<P><A href="converting-tuscany-1x-applications.html" title="Converting Tuscany 1.x Applications">Converting Tuscany 1.x Applications</A> This guide shows the Tuscany application developer how to convert 1.x applications to 2.x</P>
+
+<P><A href="logging-tracing-and-timing.html" title="Logging, Tracing and Timing">Logging, Tracing and Timing</A> in Tuscany 2.X</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Presentations</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<UL>
+	<LI><A href="development-guides.data/OSGi%20Enablement%20for%20Tuscany.ppt">OSGi Enablement for Tuscany</A></LI>
+	<LI><A href="development-guides.data/Tuscany%202.x%20Extensibility%20and%20SPIs.ppt">Tuscany 2.x Extensibility and SPIs</A></LI>
+	<LI><A href="development-guides.data/Tuscany%20SCA%20Domain%20Node.odp">Tuscany 2.x Domain and Node</A></LI>
+	<LI><A href="development-guides.data/OSGi%20Remote%20Services%20with%20Tuscany%20SCA.ppt">OSGi Remote Services with Tuscany SCA</A></LI>
+</UL>
+</DIV></DIV>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-development-guide.html" title="SCA Java Development Guide">SCA Java Development Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="osgi-enablement-for-tuscany-runtime.html" title="OSGi Enablement for Tuscany Runtime">OSGi Enablement for Tuscany Runtime</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="converting-tuscany-1x-extensions.html" title="Converting Tuscany 1.x Extensions">Converting Tuscany 1.x Extensions</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="running-tuscany-sca-2x-with-equinox-and-felix.html" title="Running Tuscany SCA 2.x with Equinox and Felix">Running Tuscany SCA 2.x with Equinox and Felix</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-deployment.html" title="SCA Java Deployment">SCA Java Deployment</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="running-oasis-spec-tests-in-a-osgi-environment.html" title="Running OASIS Spec Tests in a OSGi environment">Running OASIS Spec Tests in a OSGi environment</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="logging-tracing-and-timing.html" title="Logging, Tracing and Timing">Logging, Tracing and Timing</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="converting-tuscany-1x-applications.html" title="Converting Tuscany 1.x Applications">Converting Tuscany 1.x Applications</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Development Guides';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/extension-reference.html b/site/trunk/site-publish/documentation-2x/extension-reference.html
new file mode 100644
index 0000000000..8912704558
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/extension-reference.html
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Extension Reference : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    <BODY onload="init()">
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+	    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANYxDOCx2x&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+	    </TD>
+	    <TD>
+            <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+
+            <TD width="100%">
+                &nbsp;
+            </TD>
+
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964351">
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+        </TR>
+    </TABLE>
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Extension Reference">Extension Reference</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A>|<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H3><A name="ExtensionReference-TuscanyExtensions"></A>Tuscany Extensions</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> OASIS Spec </TH>
+<TH class="confluenceTh"> Status </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationjava.html" title="SCA Java implementation.java">implementation.java</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> Pass </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for SCA components implemented with Java classes </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationspring.html" title="SCA Java implementation.spring">implementation.spring</A> </TD>
+<TD class="confluenceTd"> 2.0-M3 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Support for Spring Framework </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationbpel.html" title="SCA Java implementation.bpel">implementation.bpel</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for components implemented in BPEL </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationosgi.html" title="SCA Java implementation.osgi">implementation.osgi</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for osgi </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Widget%20Implementation.widget&linkCreation=true&fromPageId=5964351" class="createlink">implementation.widget</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Work in progress </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationweb.html" title="SCA Java implementation.web">implementation.web</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Support JEE web apps as implementation types </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingws.html" title="SCA Java binding.ws">binding.ws</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> SOAP/HTTP web services </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingrmi.html" title="SCA Java binding.rmi">binding.rmi</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The Java RMI protocol </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingjms.html" title="SCA Java binding.jms">binding.jms</A> </TD>
+<TD class="confluenceTd"> 2.0-M4<BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Asynchronous JMS messaging </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingejb.html" title="SCA Java binding.ejb">binding.ejb</A> </TD>
+<TD class="confluenceTd"> 2.0-M4<BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> EJB Binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindinghttp.html" title="SCA Java binding.http">binding.http</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Supports binding of methods over standard Hyper Text Transfer Protocol (HTTP), allowing you to create, retrieve, update, delete items. Also supports conditional creates, retrieves, updates, and deletes using the ETag and LastModified caching protocol described in HTTP. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.jsonp&linkCreation=true&fromPageId=5964351" class="createlink">binding.jsonp</A> </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> The JSON protocol over HTTP </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">binding.jsonrpc</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The JSON-RPC protocol </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingatom.html" title="SCA Java binding.atom">binding.atom</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> supports Atom-publishing protocol, allowing you to create, retrieve, update, delete Atom entries </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-axiom </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for AXIOM data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-jaxb </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for JAXB data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-json </TD>
+<TD class="confluenceTd"> 2.0-M4<BR clear="all"> </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for JSON data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Interfaces described with java interfaces </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-interfacewsdl.html" title="SCA Java interface.wsdl">interface.wsdl</A> </TD>
+<TD class="confluenceTd">2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Interfaces described with WSDL definitions </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-jetty </TD>
+<TD class="confluenceTd"> 2.0-M2<BR clear="all"> </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Jetty web container </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-definitionsxml.html" title="SCA Java definitions.xml">definitions.xml</A> </TD>
+<TD class="confluenceTd"> 2.0-M4<BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Work in Progress </TD>
+<TD class="confluenceTd"> Defined intents, policy sets and binding defaults </TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+    <DIV class="footer">
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/get-hold-of-rat.html b/site/trunk/site-publish/documentation-2x/get-hold-of-rat.html
new file mode 100644
index 0000000000..9901ba89f1
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/get-hold-of-rat.html
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Get hold of RAT : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Get hold of RAT">Get hold of RAT</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Get hold of RAT">Get hold of RAT</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Get hold of RAT</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791375">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791375">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791375">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791375">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791375">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791375">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>Download the latest release from&nbsp;<A href="http://incubator.apache.org/rat" class="external-link" rel="nofollow">http://incubator.apache.org/rat/</A>&nbsp;(It's moved back to Apache incubation now).</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Get hold of RAT';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/getting-started.html b/site/trunk/site-publish/documentation-2x/getting-started.html
new file mode 100644
index 0000000000..8c91fb666b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/getting-started.html
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Getting Started : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started">Getting Started</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started">Getting Started</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Getting Started</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109152">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109152">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109152">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In Progress</TD></TR></TABLE></DIV>
+
+<P>(start with notes and then turn it into more eloquent text)</P>
+
+<P>Tuscany runs SCA contributions.<BR>
+An SCA contribution is something like a zip, jar, or folder.<BR>
+To run SCA contributions you start a Tuscany runtime and tell it about the contributions.<BR>
+(need something about domains)</P>
+
+<P>As a very quick example, go to samples/helloworld and do mvn tuscany:run will to the helloworld contribution in a Tuscany runtime </P>
+
+<P>Ways to create a Tuscany runtime:<BR>
+-mvn tuscany:run<BR>
+-ant run <BR>
+-tuscany.bat/tuscany.sh <BR>
+-Nodefactory.newInstance<BR>
+-webapp embedded<BR>
+-webapp shallow integration<BR>
+-tomcat deep integration</P>
+
+<P>A Tuscany runtime may be standalone or distributed. A standalone runtime knows only about the contributions in that one runtime instance, a distributed runtime also knows about contributions in runtimes which may be in other JVMs and/or machines. By default the runtime created using NodeFactory.newInstance or webapp embedded will run in standalone mode, all the others by default start in distributed mode.</P>
+
+<P>You can configure the Tuscany runtime by passing in configuration properties when creating the runtime. When creating the runtime programatically you can use a Java Properties object, otherwise you can use a config uri string. The uri string has the following formats:<BR>
+properties:&lt;url to a properties file&gt;<BR>
+uri:&lt;defaultDomainName&gt;?propertyName=value&amp;propertyName=value&amp;...</P>
+
+
+
+
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="samples.html" title="Samples">Samples</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Getting Started';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/glossary.html b/site/trunk/site-publish/documentation-2x/glossary.html
new file mode 100644
index 0000000000..20f19001c8
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/glossary.html
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Glossary : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Glossary">Glossary</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Glossary">Glossary</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Glossary</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21790793">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21790793">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21790793">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21790793">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21790793">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21790793">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Term </TH>
+<TH class="confluenceTh"> description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A name="Glossary-contribution"></A> contribution </TD>
+<TD class="confluenceTd"> an SCA term for a deployable package of artifacts that contribute to an application&nbsp;(see also <A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A>) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A name="Glossary-launcher"></A> launcher </TD>
+<TD class="confluenceTd"> A tuscany term for a program used to start Tuscany in situations where the environment doesn't provide a main() program. For example, a launcher is not required for a webapp, since the container provides the main() </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Glossary';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/index.html b/site/trunk/site-publish/documentation-2x/index.html
new file mode 100644
index 0000000000..a0cd7f2a15
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/index.html
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Index : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Index">Index</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Index">Index</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Index</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108808">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108808">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=108808">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=108808">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=108808">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=108808">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Getting Started with Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="getting-started.html" title="Getting Started">Getting Started</A> These guides help you to get setup in Tuscany, develop and run a simple application using comand line or Eclipse.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Introduction</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A> Provides a quick introduction to SCA and links to the SCA Specifications.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany Samples</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="samples.html" title="Samples">SCA Samples</A> A description of the Tuscany SCA sample contributions</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java Extensions Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A> Provides a guide for all the SCA Java and Tuscany extensions.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="development-guides.html" title="Development Guides">Development Guides</A> These guides help you learn more about Tuscany architecture and how to get involved in the development of Tuscany. We look forward to your help.</P>
+</DIV></DIV>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="overview.html" title="Overview">Overview</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="development-guides.html" title="Development Guides">Development Guides</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="getting-started.html" title="Getting Started">Getting Started</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="glossary.html" title="Glossary">Glossary</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="making-releases.html" title="Making Releases">Making Releases</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Index';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/logging-tracing-and-timing.html b/site/trunk/site-publish/documentation-2x/logging-tracing-and-timing.html
new file mode 100644
index 0000000000..2f555cf79e
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/logging-tracing-and-timing.html
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Logging, Tracing and Timing : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Logging, Tracing and Timing">Logging, Tracing and Timing</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Logging, Tracing and Timing">Logging, Tracing and Timing</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Logging, Tracing and Timing</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20645145">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20645145">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20645145">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20645145">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20645145">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20645145">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="Logging%2CTracingandTiming-TuscanyLogging%2CTracing%2CTimingInformationinTuscany2.X"></A>Tuscany Logging, Tracing, Timing Information in Tuscany 2.X</H1>
+
+<P>This page describes the logging, tracing, and timing features of Tuscany. These features can be used to debug problems with the Tuscany runtime, understand code flow, and provide timing metrics for competitive analysis or performance claims.</P>
+
+<H2><A name="Logging%2CTracingandTiming-JavaLoggingversusAspectOrientedProgramming%28AOP%29Approach"></A>Java Logging versus Aspect Oriented Programming (AOP) Approach</H2>
+
+<P>There are two types of logging embeded in the Tuscany runtime: explicit and implicit. The explicit logging is implemented by the Java 2 SE core logging facilities such as java.util.logging.Logger. This is the logging that many Java programmers are familiar with, and the logging requires calls to the Logger programming interface. Throughout the Tuscany code base you see calls to this facility such as this call in Tuscany org.apache.tuscany.sca.node.launcher.NodeLauncher.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java Logging in Tuscany</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">        logger.info(<SPAN class="code-quote">&quot;Apache Tuscany SCA Node is starting...&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>Calls to this facility by default go to the standard output of the program. This is the typical result that one sees in the console:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java Logging Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">INFO: Apache Tuscany SCA Node is starting...
+</PRE>
+</DIV></DIV>
+<P>The Java SE core logging works well as a general purpose logger and gives a general idea of the important phases in the Tuscany runtime. However, one drawback is that this logging system only publishes predetermined messages created by the developers. If you wish to change the logging points, you must change the Tuscany source code, build, and run again with your private code base.</P>
+
+<P>Another logging and tracing facility is available in Tuscany that gives the user a bit of flexibility in what gets logged and requires no source code modifications to run. This is an Aspect Oriented Programming (AOP) approach that runs via a Java agent at runtime. Just like a debugger can start and stop and inspect a Tuscany Java program, so too can an AOP agent inspect and report on a Tuscany Java program. Tuscany employs the AspectJ implementation, and its runtime agent is contained in the aspectjweaver.jar file. The AOP agent is specified from a command line option or runtime options:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java AOP Agent</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">java -javaagent:<SPAN class="code-quote">&quot;&lt;path to aspectjweaver.jar&gt;&quot;</SPAN> calculator.CalculatorClient
+</PRE>
+</DIV></DIV>
+<P>The AOP logging and tracing agent can be run with any Tuscany program. No additional calls or log statements need be added to the Tuscany code. The results of running a timing for example, look like this:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany AOP Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">Running org.apache.tuscany.sca.aspectj.TracingTestCase
+Timing Around timedSection jp=call(void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>))
+Oct 21, 2008 9:26:36 AM org.apache.tuscany.sca.aspectj.TracingTestCase info_aroundBody0
+Timing Around timedSection Roundtrip is 32ms <SPAN class="code-keyword">for</SPAN> jp.getSignature=void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Full documentation on AspectJ is available at the <A href="http://www.eclipse.org/aspectj/doc/released" class="external-link" rel="nofollow">AspectJ web site</A>. Tuscany provides example usage in the module tracing-aspectj in the build tree and the released code.</P>
+
+<H2><A name="Logging%2CTracingandTiming-BriefApectOrientedProgrammingIntroduction"></A>Brief Apect Oriented Programming Introduction</H2>
+
+<P>In order to understand the aspect oriented approach to logging in Tuscany, one must understand a few basic concepts.</P>
+
+<P>A <EM>join point</EM> is well defined point in the program flow. An example join point is the entry to a Java method. Another is after an exception is thrown. These join points contain useful information when running a program such as the argument list, the call stack, and the signature of the point that is executing.</P>
+
+<P>A <EM>point cut</EM> is a subset of all the program join points. For instance, a point cut might be only the join points from exceptions thrown by the Tuscany runtime. Or only the set of calls to a Tuscany API org.apache.tuscany.sca.node.launcher.NodeLauncher.</P>
+
+<P><EM>Advice</EM> is the code that is run when a point cut is reached. For instance, your advice might want to print out all the arguments when entering a given method. Or your advice might show the call stack of an exception and print the original cause of the exception.</P>
+
+<P>Finally, an <EM>aspect</EM> is a module that bundles up a particular set of point cuts and advice. Here is an example aspect that is marked with Java 5 annotations. The name of the aspect is <EM>LoggingAspect</EM>, there is a point cut defined at Tuscany calls to org.apache.tuscany.sca.&#42; classes (but not inside of Aspect classes), and when the point cut is run, the advice for this point cut prints out the join point signature.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Example Aspect</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">@Aspect
+<SPAN class="code-keyword">public</SPAN> class LoggingAspect {
+    @Pointcut(<SPAN class="code-quote">&quot;call(* org.apache.tuscany.sca..*(..)) &amp;&amp; (!within(org.apache.tuscany.sca.aspectj.*Aspect))&quot;</SPAN>)
+    <SPAN class="code-keyword">public</SPAN> void anyMethodCall() {
+    }
+
+    @Before(<SPAN class="code-quote">&quot;anyMethodCall()&quot;</SPAN>)
+    <SPAN class="code-keyword">public</SPAN> void before(JoinPoint jp) {
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Logging Before anyMethodCall jp.getSignature=&quot;</SPAN> + jp.getSignature());
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>Full explanation of these concepts are in the AspectJ documents. The purpose here is to provide enough information to allow a user to run or modify the Tuscany aspects to one's liking.</P>
+
+<H2><A name="Logging%2CTracingandTiming-LoggingandTracinginTuscany"></A>Logging and Tracing in Tuscany</H2>
+
+<P>Following the approach of AspectJ, Tuscany provides two concrete aspects for logging and tracing. org.apache.tuscany.sca.aspectj.LoggingAspect provides logging for methods, constructors, and static initializers in Tuscany. org.apache.tuscany.sca.aspectj.SimpleTracingAspect provide tracing into user methods, constructors, and static initializers. Both provide detailed information when an Exception or Throwable is thrown by the Tuscany runtime or user SCA program.</P>
+
+<P>Both LoggingAspect and SimpleTracingAspect are run by naming the AspectJ runtime agent aspectjweaver.jar at launch. This is shown in the command line example above, and an example is provided in launcher.bat in the tracing-aspectj module, and a further example is provded by running the command &quot;ant runtraced&quot; on the calculator sample in a binary distribution.</P>
+
+<P>The runtime configuration file aop.xml has references to these aspects. Uncomment one or both of these in aop.xml to run with this logging enabled.  Following is an example logging run with the verbose weaver option specified. Note the verbose output of class names, build times, etc. The logging statements too are quite verbose stating the name of the join point, the point cut, and various signatures and arguments.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Example Logging in Tuscany</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">[INFO] Configured Artifact: org.aspectj:aspectjweaver:1.6.1:jar
+[INFO] Copying aspectjweaver-1.6.1.jar to E:\t\java\sca\modules\tracing-aspectj\target\dependency\aspectjweaver-1.6.1.jar
+[AppClassLoader@92e78c] info AspectJ Weaver Version 1.6.1 built on Thursday Jul 3, 2008 at 18:35:41 GMT
+[AppClassLoader@92e78c] info register classloader sun.misc.Launcher$AppClassLoader@92e78c
+[AppClassLoader@92e78c] info using configuration /E:/t/java/sca/modules/tracing-aspectj/target/classes/META-INF/aop.xml
+[AppClassLoader@92e78c] info register aspect org.apache.tuscany.sca.aspectj.LoggingAspect
+[AppClassLoader@92e78c] info define aspect org.apache.tuscany.sca.aspectj.UserTimingAspect
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Logging Before anyMethodCall jp.getSignature=SCANodeFactory org.apache.tuscany.sca.node.SCANodeFactory.newInstance()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ServiceDiscovery()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ServiceDiscovery.1(ServiceDiscovery, <SPAN class="code-object">Class</SPAN>)
+Logging Before anyConstructor jp.getArgs=[org.apache.tuscany.sca.extensibility.ServiceDiscovery@ceb6dd,
+   class org.apache.tuscany.sca.node.SCANodeFactory]
+Logging Before anyMethodCall jp.getSignature=ServiceDiscoverer org.apache.tuscany.sca.extensibility.ServiceDiscovery.getServiceDiscoverer()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ContextClassLoaderServiceDiscoverer()
+Logging AfterReturning anyMethodCall jp=call(ServiceDiscoverer org.apache.tuscany.sca.extensibility.ServiceDiscovery.getServiceDiscoverer()),
+   result=org.apache.tuscany.sca.extensibility.ContextClassLoaderServiceDiscoverer@17574b9
+Logging Before anyMethodCall jp.getSignature=Set org.apache.tuscany.sca.extensibility.ServiceDiscoverer.discover(<SPAN class="code-object">String</SPAN>, <SPAN class="code-object">boolean</SPAN>)
+Logging Before anyMethodCall jp.getArgs=[org.apache.tuscany.sca.node.SCANodeFactory, <SPAN class="code-keyword">true</SPAN>]
+</PRE>
+</DIV></DIV>
+<P>These aspects provide static point cuts and advice. That is, the various methods, constructors, and exception points are constrained by the source code of the aspects. You can change these items via editing LoggingAspect or SimpleTracingAspect and rerunning the application.</P>
+
+<H2><A name="Logging%2CTracingandTiming-Timing"></A>Timing</H2>
+
+<P>Timing of various calls is also available via the AOP logging and tracing facility in Tuscany. The apsect UserTimingAspect is provided to time certain point cuts. As shown above, this AOP timing feature can be used for timing metrics for competitive analysis of performance gauges. The output of the timing is shown here, as a Logger.info method is called and timed.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany AOP Timing Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">Running org.apache.tuscany.sca.aspectj.TracingTestCase
+Timing Around timedSection jp=call(void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>))
+Oct 21, 2008 9:26:36 AM org.apache.tuscany.sca.aspectj.TracingTestCase info_aroundBody0
+Timing Around timedSection Roundtrip is 32ms <SPAN class="code-keyword">for</SPAN> jp.getSignature=void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Unlike LoggingAspect and SimpleTracingAspect, the pointcut for UserTimingAspect is settable at runtime via the aop.xml runtime configuration file. Look for the UserTimingAspect name, and note the expression in the pointcut element. You may change the name of expression to any valid AspectJ pointcut expression. Here calls to any Logger.info methods, regardless of arguments or return types are logged. For instance you may change this to &quot;call( * calculator.CalculatorServiceImpl.multiply(..))&quot; to time calls in your SCA application.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Dynamic PointCut for UserTimingAspect</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">        &lt;concrete-aspect name=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.UserTimingAspect&quot;</SPAN>
+           <SPAN class="code-keyword">extends</SPAN>=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.TimingAspect&quot;</SPAN>
+           precedence=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.UserTimingAspect, *&quot;</SPAN>&gt;
+           &lt;pointcut name=<SPAN class="code-quote">&quot;timedCall&quot;</SPAN>
+              expression=<SPAN class="code-quote">&quot;call(* java.util.logging.Logger.info(..))&quot;</SPAN>/&gt;
+        &lt;/concrete-aspect&gt;
+</PRE>
+</DIV></DIV>
+
+<H2><A name="Logging%2CTracingandTiming-LoggingandTracinginAlternateContainers"></A>Logging and Tracing in Alternate Containers</H2>
+
+<P>So far this article discussed logging and tracing for Tuscany applications. Often Tuscany applications are run standalone in a Java 2 SE environment. You can also turn on logging and tracing in various application servers that support Tuscany SCA applications.</P>
+
+<H3><A name="Logging%2CTracingandTiming-ApacheTomcatExample"></A>Apache Tomcat Example</H3>
+
+<P>Show Apache Tomcat J2EE application server plus Tuscany bundled SCA application.</P>
+
+<H3><A name="Logging%2CTracingandTiming-WebSphereExample"></A>WebSphere Example</H3>
+
+<P>Show WebSphere 7.0.0.1 plus SOA Feature Pack based on Tuscany output.</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Logging, Tracing and Timing';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/making-releases.html b/site/trunk/site-publish/documentation-2x/making-releases.html
new file mode 100644
index 0000000000..7afa58581f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/making-releases.html
@@ -0,0 +1,718 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Making Releases : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Making Releases">Making Releases</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Making Releases">Making Releases</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Making Releases</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791342">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791342">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791342">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791342">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791342">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791342">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=Menus&linkCreation=true&fromPageId=21791342" class="createlink">Menus</A></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="MakingReleases-GettingReady"></A>Getting Ready</H3>
+
+<P><A href="setting-up-ssh.html" title="Setting up ssh">Setting up ssh</A></P>
+
+<P><A href="create-signing-key.html" title="Create Signing Key">Create Signing Key</A></P>
+
+<P><A href="get-hold-of-rat.html" title="Get hold of RAT">Get hold of RAT</A></P>
+
+<H3><A name="MakingReleases-UsefulResources"></A>Useful Resources</H3>
+
+<P><A href="http://incubator.apache.org/guides/releasemanagement.html#best-practice" class="external-link" rel="nofollow">Incubator release best practice </A><BR>
+<A href="http://incubator.apache.org/incubation/Incubation_Policy.html" class="external-link" rel="nofollow">Incubator Policy </A><BR>
+<A href="http://www.apache.org/dev/" class="external-link" rel="nofollow">ASF Developer Guide </A><BR>
+<A href="http://www.apache.org/dev/release.html" class="external-link" rel="nofollow">ASF Release FAQ </A><BR>
+<A href="http://www.apache.org/dev/release.html#license" class="external-link" rel="nofollow">ASF Release Licensing FAQ </A><BR>
+<A href="http://www.apache.org/dev/release-signing.html" class="external-link" rel="nofollow">ASF Release Signing </A><BR>
+<A href="http://www.apache.org/dev/new-committers-guide.html#pgp" class="external-link" rel="nofollow">ASF Comitters Guide </A><BR>
+<A href="http://people.apache.org/~henkp/" class="external-link" rel="nofollow">Henk's ASF Key Guide </A><BR>
+<A href="http://pgp.surfnet.nl/" class="external-link" rel="nofollow">Surfnet Key Server </A><BR>
+<A href="http://pgp.mit.edu/" class="external-link" rel="nofollow">MIT Key Server </A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/java/etc/release-sca.sh" class="external-link" rel="nofollow">Raymond's release script</A></P>
+
+<H3><A name="MakingReleases-ReleaseReviewerCheckList"></A>Release Reviewer Check List</H3>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all RELEASE-NOTES and READMEs etc have the right release number and date<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the RAT output doesn't report missing or non-ASF licenses other than for files that can't have ASF licenses.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all files (that need it) have the ASF copyright and it's the right date<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of source distro<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of binary distro<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of all maven modules that will be distributed (these are the tricky ones as they get copied when people add new modules)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that LICENSE files have a copy of all third party licenses for the files in directories below them (jar name and version to which license relates must be clearly marked. Use the list from the distribution lib dir)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that NOTICE files have a copy of all of the copyright statements for the files in directories below them. You have to go through all dependency jars/files that have been copied in and check<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the signatures are in the right format<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the signing key is in the KEYS file and in an external repo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that there are no SNAPSHOT dependencies still in the distribution<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that there is no junk left in the distributions (.log, .tmp, .bak etc)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the distribution match the tag as far as possible. (Our NOTICE files have the module name dropped in automatically so don't match and we don't ship svg files)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the manifests in the jars that we produce have enough information (name of product and version. Scripts below should do this).<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the project depends on the smallest number of versions of each third party jar<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all samples compile and run from the command line and where appropriate operate correctly in Tomcat/WebSphere/Jetty/Geronimo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all demos compile and run from the command line and where appropriate operate correctly in Tomcat/WebSphere/Jetty/Geronimo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check to make sure Javadocs are generated for APIs and SPIs.</P>
+
+<H3><A name="MakingReleases-ReleaseManagerReleaseProcess"></A>Release Manager Release Process</H3>
+
+<P>This page borrows many of the commands from <A href="http://svn.apache.org/repos/asf/tuscany/java/etc/release-sca.sh" class="external-link" rel="nofollow">Raymond's release script</A> but with a bit more explanation and a few extra useful commands. The commands here were taken from when release 1.1 RC3a was under preparation. Note that this document has been updated from experience gained with the SDO 1.1.1 release, which was the first release made after exiting incubation; as such, whilst the release names used in this document refer to an &quot;incubating&quot; version,  the svn repository and the maven repository have been updated to the non incubating versions. It's also fair to say that it's unlikely that you will want to run all of these commands in sequence as you generally end up repeating sections as release preparation progresses.</P>
+
+<H4><A name="MakingReleases-Callforreleases"></A>Call for releases</H4>
+
+<P>(Note that the maven tuscany plugin will most likely need to be released in parallel with the Tuscany release)</P>
+
+<P>At some point someone in the community will call for a release based on the features and fixes that have been under development in the trunk. Typically the first stage in the release process is to decide on who is going to be the release manager, i.e. who is going to ensure that all the steps are taken to ensure a good release. This will typical involve someone volunteering and a vote on the dev list. The next thing is the create a branch where the code can be stabilized and testing can start on the release artifacts. It's useful to try and ensure that the code is complete as possible and that all the samples run before the branch is created. This removes the need for a lot of double fixing between the branch and the trunk.</P>
+
+<P>The commands in this document make use of the following environment variables, and are written in a form suitable for execution in linux or a cygwin shell on windows.  If you set up these variables you should be able to just cut and paste the commands as given throughout this document.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+export RELEASE=2.0-M5
+export RC=RC3
+
+export CURRENT_TRUNK_LEVEL=2.0-SNAPSHOT
+export NEXT_TRUNK_LEVEL=2.0-SNAPSHOT
+
+export RATJAR=~/apache-rat-0.7-SNAPSHOT.jar
+export SCPCOMMAND=scp
+export PAOUSER=kelvingoodson
+export PASSPHRASE=your_pao_authentication_pass_phrase
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Createthebranch"></A>Create the branch</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn copy https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/ https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/branches/sca-java-$RELEASE  -m <SPAN class="code-quote">&quot;Branch <SPAN class="code-keyword">for</SPAN> $RELEASE&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Once the branch is created, if the current and next trunk version differ, &nbsp;the version number in trunk can be updated. If the release is a milestone release the trunk version will not change.</P>
+
+<H4><A name="MakingReleases-Fixupthebranchwork"></A>Fix up the branch work</H4>
+
+<P>First checkout the branch so that you can work on it. These commands assume that a local directory called &quot;branches&quot; is present.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd branches
+svn co https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/branches/sca-java-$RELEASE ./$RELEASE</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Remove all the files that are not going to be part of the release, test all the samples and check all of the LICENSE and NOTICE files.</P>
+
+<P>Check dependencies are as you would expect them to be. In particular check that we aren't depending on many different versions of third part jars. If we are this has the side effect of messing up the generated build files. If module A depends on x.jar v1.2 and module B depends on x.jar v1.3 then when a build file that is generated for a sample that only depends on module A the stated x.jar dependency will be v1.2. Of course the distribution build will make sure that only v1.3 is actually shipped and so the ant build will fail.  (TODO - need better automation)</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca
+mvn \-o \-Pdependencies \-Dmaven.test.skip=<SPAN class="code-keyword">true</SPAN>
+find . \-name dependency.txt \-exec cat '{}' &gt;&gt; deptotal.txt \;
+</PRE>
+</DIV></DIV>
+<P>or</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca
+mvn dependency:tree
+</PRE>
+</DIV></DIV>
+<P>Use you favorite spreadsheet tool to open deptotal.txt and order on the first column to see across the project what dependencies we have on what libraries/versions.</P>
+
+<P>Once the branch is at the stage where a release candidate can be created for testing prepare to make a tag.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>&quot;Tip&quot;</B><BR>When making changes to a branch or tag that are also relevant to the trunk,  it's much easier to apply the changes to the trunk at the time,  rather than wait and risk losing the changes.  Svn provides a simple one line way to do this with the &quot;svn merge&quot; command.  In the root directory of a checked out version of the trunk,  if you run a command like the following ...
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn merge \-r 674473:674474 https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/branches/sca-java-2.0-M5 2.0-M5-RC2</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Note how the version numbers in the n:m differ by one, so that you get just the difference in repository state from immediately before the change in question, to the state in question, merged into the file system in the target location (final argument)</P>
+
+
+<P>then that will apply the same edits as were made in the 674474 commit in the tag; merging them into your checked out version of the current trunk.  The earlier you do this,  the less likely that svn will present you with conflicts to resolve.</P></TD></TR></TABLE></DIV>
+
+<H4><A name="MakingReleases-CreateTag%24RELEASE%24RC"></A>Create Tag $RELEASE-$RC</H4>
+
+<P>These commands assume that a local directory called &quot;tags&quot; is present.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags
+svn co https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/branches/sca-java-$RELEASE $RELEASE-$RC</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Notice that all we are doing here is just checking out the branch again. This allows any last minute fixes to be taken from the branch in subversion and allows the version numbers in the tag to be corrected without affecting the branch, assuming that more than one tag will be required to complete the release process.</P>
+
+<H4><A name="MakingReleases-Fixthereleasedates"></A>Fix the release dates</H4>
+
+<P>In various files under distribution/src/main/release the month of release is quoted. Fix this to be the expected release month.</P>
+
+<H4><A name="MakingReleases-Checkthenoticedates"></A>Check the notice dates</H4>
+
+<P>It's not clear what the policy for dates in notice files is currently. We have gone for the following...</P>
+
+<P>Copyright (c) 2005 - 2010 The Apache Software Foundation</P>
+
+<P>As the project moves forward we need to check that the last date matches the current year. If you need to change all the notice files here's a script</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> i in `/usr/bin/find . \-name <SPAN class="code-quote">&quot;NOTICE&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> sed <SPAN class="code-quote">&quot;s/Copyright (c) 2005 - 2008/Copyright (c) 2005 - 2009/g&quot;</SPAN> $i &gt;/tmp/tmp.notice; cp /tmp/tmp.notice $i; done
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-ChangetheversionID"></A>Change the version ID</H4>
+
+<P>The &quot;-SNAPSHOT&quot; is removed from the end of the version string. This ensures that the only thing building with the release version number on your PC is the tag being tested.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/2.0-M5-RC2
+<SPAN class="code-keyword">for</SPAN> i in `/usr/bin/find . \-name <SPAN class="code-quote">&quot;*.xml&quot;</SPAN> \-o \-name <SPAN class="code-quote">&quot;*.java&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> grep $RELEASE-SNAPSHOT $i&gt;/dev/<SPAN class="code-keyword">null</SPAN>; then sed <SPAN class="code-quote">&quot;s/$RELEASE-SNAPSHOT/$RELEASE/g&quot;</SPAN> $i &gt;/tmp/tmp.txt; cp /tmp/tmp.txt $i; echo $i; fi; done
+</PRE>
+</DIV></DIV>
+
+
+
+<H4><A name="MakingReleases-Buildfromtoplevel"></A>Build from top level</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC
+mvn -o clean install
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Builddistribution"></A>Build distribution</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC/distribution/all
+mvn -Psource
+mvn
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Copythedistributiontosomewhereandtryit"></A>Copy the distribution to somewhere and try it</H4>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC/distribution/all/target
+cp apache-tuscany-sca-all-$RELEASE.zip &lt;someplace&gt;
+cp apache-tuscany-sca-all-$RELEASE-src.zip &lt;someotherplace&gt;
+</PRE>
+</DIV></DIV>
+<P>Try all the samples/demos</P>
+
+<P>The war samples are currently to be tested with</P>
+
+<UL class="alternate" type="square">
+	<LI>Tomcat 5.5.20 and Tomcat 6.0.14</LI>
+	<LI>Jetty 6.1.3</LI>
+	<LI>Geronimo 2.0.2 Tomcat6 jee5</LI>
+	<LI>WebSphere 6.1 fix pack 9&#43;</LI>
+</UL>
+
+
+<P>Clean you local repo of SCA modules and compile the source distro and run some samples. As you will have deleted the maven-tuscany-plugin artifact, you'll need to do a 3 part manual maven build, building in the modules directory, then the maven directory, and finally the samples directory.</P>
+
+<P>Check for copyrights in the code to ensure that are what you are expecting</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grep \-iR \--exclude=LICENSE \--exclude=NOTICE Copyright * \| awk '{<SPAN class="code-keyword">if</SPAN> (\!match($0, <SPAN class="code-quote">&quot;.+ASF.+&quot;</SPAN>)) {print $0}}'
+</PRE>
+</DIV></DIV>
+<P>check all the NOTICE files</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> i in `find . \-name NOTICE`; <SPAN class="code-keyword">do</SPAN> echo XXXXXXXXXXXXXXXXXXXXXXXXXXXX; echo $i; cat $i; done &gt; ../tmp
+</PRE>
+</DIV></DIV>
+<P>Check for any SNAPSHOTS left in by mistake</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grep \-r \--include=*.xml SNAPSHOT *
+</PRE>
+</DIV></DIV>
+<P>Check the LICENSE file against what is provided in the distributions. There is no automation for this bit.</P>
+
+
+<P>Check that all jars in the distribution\lib is mentioned on the binary LICENSE</P>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in `find . -name <SPAN class="code-quote">&quot;*.jar&quot;</SPAN> \-printf <SPAN class="code-quote">&quot;%f\n&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> grep \-q $fn ../LICENSE; then <SPAN class="code-quote">&quot;-&quot;</SPAN>; <SPAN class="code-keyword">else</SPAN> <SPAN class="code-quote">&quot;$fn NOT present&quot;</SPAN>; fi; done;
+</PRE>
+</DIV></DIV>
+<P>And check that all jars that are mentioned are present</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in `awk '/.jar/ {<SPAN class="code-keyword">if</SPAN> (match($0,<SPAN class="code-quote">&quot;[a-zA-Z0-9._\-|a-zA-Z0-9._-]+[.]jar&quot;</SPAN>)) {print substr($0, RSTART,RLENGTH) } }' ../LICENSE`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> ls * \| grep -q $fn; then echo <SPAN class="code-quote">&quot;-&quot;</SPAN>;<SPAN class="code-keyword">else</SPAN> echo <SPAN class="code-quote">&quot;&gt;&gt;&gt; $fn NOT present&quot;</SPAN>; fi; done
+</PRE>
+</DIV></DIV>
+<P>Check for junk included by accident</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+find . \-name log \-print
+find . \-name work \-print
+find . \-name lck \-print
+find . \-name activemq-data \-print
+find . \-name temp \-print
+find . \-name tmp \-print
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-GeneratetheRATreports"></A>Generate the RAT reports</H4>
+
+<P>Unpack a binary and source distribution archive and create rat reports for each.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java \-jar $RATJAR srcExtractionDir &gt; rat-$RELEASE-$RC-src.txt
+java \-jar $RATJAR binExtractionDir &gt; rat-$RELEASE-$RC-bin.txt
+</PRE>
+</DIV></DIV>
+<P>Copy the reports up onto the staging repo. You should of course check the report at this stage.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$SCPCOMMAND rat-$RELEASE-$RC.txt $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+</PRE>
+</DIV></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>&quot;Tip&quot;</B><BR>If you need to regenerate the RAT report after you have started on the steps that follow run &quot;mvn clean&quot; first to avoid complains about the files under target folders</TD></TR></TABLE></DIV>
+
+<P>Once you are happy with the release artifacts you can sign them and make them available from review.</P>
+
+<H4><A name="MakingReleases-Signtheartifacts"></A>Sign the artifacts</H4>
+
+<P>Linux</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC/distribution/target
+<SPAN class="code-keyword">for</SPAN> i in *.zip *.gz; <SPAN class="code-keyword">do</SPAN> gpg --output $i.asc --detach-sig --armor $i; done
+<SPAN class="code-keyword">for</SPAN> i in *.zip *.gz; <SPAN class="code-keyword">do</SPAN> openssl md5 -hex $i \| sed 's/MD5((**[\^)|]*))= ([0-9a-f|0-9a-f]\*)/\2 \*\1/' &gt; $i.md5; done
+</PRE>
+</DIV></DIV>
+
+<P>Windows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> %A in (*.zip) <SPAN class="code-keyword">do</SPAN> gpg \--output %A.asc \--detach-sig \--armor %A
+<SPAN class="code-keyword">for</SPAN> %A in (*.gz) <SPAN class="code-keyword">do</SPAN> gpg \--output %A.asc \--detach-sig \--armor %A
+<SPAN class="code-keyword">for</SPAN> %A in (*.zip) <SPAN class="code-keyword">do</SPAN> gpg \--print-md md5 %A &gt; %A.md5
+<SPAN class="code-keyword">for</SPAN> %A in (*.gz) <SPAN class="code-keyword">do</SPAN> gpg \--print-md md5 %A &gt; %A.md5
+</PRE>
+</DIV></DIV>
+<P>The commands above should produce artifacts of an appropriate format, as follows.</P>
+
+<P>md5 should look  like</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+8fb7cb398063ed0dffa414168468fffc \*apache-tuscany-sca-1.1-incubating.zip
+</PRE>
+</DIV></DIV>
+<P>asc should look like</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+\---\--BEGIN PGP SIGNATURE-\---\-
+Version: GnuPG v1.4.5 (Cygwin)
+
+iD8DBQBHnLGGE8fTrnkHPxIRAqPmAJ4tOR6W663FKCXHPi1GlLBWDyZwJgCeMqbb
+68DOq0YsU/O7kJsBHuZXhJw=
+=elh0
+\---\--END PGP SIGNATURE-\---\-
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Puttheartifactsupinyourhomedirectoryonpeople.apache.org"></A>Put the artifacts up in your home directory on people.apache.org</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC/distribution/target
+$SCPCOMMAND *.asc $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+$SCPCOMMAND *.md5 $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+$SCPCOMMAND *.zip $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+$SCPCOMMAND *.gz $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+</PRE>
+</DIV></DIV>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC/distribution/src/main/release
+pscp RELEASE_NOTES $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+pscp CHANGES $PAOUSER@people.apache.org:public_html/sca-java/$RELEASE/$RC/
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Checkpermissionsonthefiles"></A>Check permissions on the files</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+chmod 644 \*.zip
+chmod 644 \*.gz
+chmod 644 \*.txt
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Deploythemavenartifactslocally"></A>Deploy the maven artifacts locally</H4>
+
+<P>As a potentially simpler alternative to deploying directly to p.a.o you can do the following (I have to use this approach as I <BR>
+can't get mvn to authenticate with p.a.o properly during deployment)</P>
+
+<P>Build the maven release artifact to a local directory (in this case target/deploy at the top level):</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC
+mvn -Prelease -DaltDeploymentRepository=id::<SPAN class="code-keyword">default</SPAN>::file:target/deploy
+</PRE>
+</DIV></DIV>
+
+<P>Copy the artifacts up to p.a.o:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd cd tags/$RELEASE-$RC/target/deploy
+scp -r org slaws@people.apache.org:./public_html/tuscany/2.0-beta1-RC2/maven
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Deploythemavenartifactsdirectlytop.a.o"></A>Deploy the maven artifacts directly to p.a.o</H4>
+
+<P>Note below that the reference to &quot;me.people&quot; in the &quot;id&quot; part of the &#45;DaltDeploymentRepository argument to the maven deploy plugin is simply an identifier relating to a stanza in your local maven repo's settings.xml file. Note that also if you use ssh authentication by referencing a file containing your private key from the settings.xml file, then be sure to use a file in open ssh format. &nbsp;People who have followed the apache <A href="http://www.apache.org/dev/user-ssh-windows.html" class="external-link" rel="nofollow">instructions for creating ssh keys on Windows</A> with putty will probably not have created open ssh format files. You can however convert your .ppk file to the open ssh format by loading it into puttygen and using the conversion menu.</P>
+
+<P>Create a maven directory in your target directory on people.apache.org</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/$RELEASE-$RC
+mvn -N -DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/$PAOUSER/public_html/sca-java/$RELEASE/$RC/maven verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=$PASSPHRASE
+</SPAN>
+
+cd modules
+
+mvn clean
+mvn \-DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/$PAOUSER/public_html/sca-java/$RELEASE/$RC/maven verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=$PASSPHRASE
+</SPAN>
+cd shades (note, I thought it was only shades/base that needed doing, but the maven plugin failed on shades artifacts, so I deployed from shades)
+mvn clean
+mvn \-DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/$PAOUSER/public_html/sca-java/$RELEASE/$RC/maven verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=$PASSPHRASE
+</SPAN>
+
+cd maven/maven-tuscany-plugin
+
+mvn clean
+mvn \-DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/$PAOUSER/public_html/sca-java/$RELEASE/$RC/maven verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=$PASSPHRASE
+</SPAN>
+cd features
+
+mvn clean
+mvn \-DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/$PAOUSER/sca-java/$RELEASE/$RC/maven verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=$PASSPHRASE
+</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Deploysourcejars"></A>Deploy source jars</H4>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd modules&nbsp;
+mvn -Psource -DaltDeploymentRepository=me.people::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/kelvingoodson/public_html/sca-java/2.0-M5/RC3/maven -Dgpg.passphrase=$PASSPHRASE deploy
+</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Checkpermissionsofmavenartifacts"></A>Check permissions of maven artifacts</H4>
+
+<P>If you've copied the maven artifacts up to p.a.o manually you may need to fix the permissions of the directories</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+find . -type d -exec chmod 755 {} \;
+</PRE>
+</DIV></DIV>
+
+<P>and files </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+find . -type f -exec chmod 644 {} \;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-CheckthattheMavenartifactswork"></A>Check that the Maven artifacts work</H4>
+
+<P>Point you maven build at your p.a.o dir as a temporary mirror, for example, add mirror element to the settings.xml file (usually found at .m2/settings)</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;mirrors&gt;
+&lt;mirror&gt;
+&lt;id&gt;ant.staging&lt;/id&gt;
+&lt;url&gt;http:<SPAN class="code-comment">//people.apache.org/~&lt;PAOUSER&gt;/sca-java/&lt;release&gt;/&lt;RC&gt;/maven&lt;/url&gt;
+</SPAN>&lt;mirrorOf&gt;*&lt;/mirrorOf&gt;
+&lt;/mirror&gt;
+&lt;/mirrors&gt;
+</PRE>
+</DIV></DIV>
+<P>Clean you local SCA artifacts and use maven to compile samples and see if they run.</P>
+
+<H4><A name="MakingReleases-Checkinthetag"></A>Check in the tag</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags
+svn copy $RELEASE-$RC https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/tags/$RELEASE-$RC -m <SPAN class="code-quote">&quot;Tag <SPAN class="code-keyword">for</SPAN> $RELEASE $RC&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Startvoting"></A>Start voting</H4>
+
+<P>The PPMC will vote first. This may give rise to a new release candidate being required. If so you need to go back and start at the &quot;Create Tag&quot; step but using the next RC number.</P>
+
+<P>Once the PPMC vote is complete the vote is moved across to the IPMC. Once all the votes are complete the artifacts that have been voted on can be release.</P>
+
+
+<H4><A name="MakingReleases-Onceallthevotingiscomplete"></A>Once all the voting is complete</H4>
+
+<P>Copy the artifacts from you directory on people.apache.org to;</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/www/www.apache.org/dist/tuscany/java/sca/$RELEASE
+</PRE>
+</DIV></DIV>
+
+<P>Also check that the KEYS file is up to date.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/www/www.apache.org/dist/tuscany
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Copythestagingrepototheliverepo"></A>Copy the staging repo to the live repo</H4>
+
+<P><B>Option 1</B> (untested for 2.0-M5)</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn stage:copy -Dsource=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//people.apache.org/~slaws/tuscany/1.1-RC3a/maven&quot;</SPAN> -Dtarget=<SPAN class="code-quote">&quot;scp://&lt;userid@&gt;people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository&quot;</SPAN> -Dversion=1.1</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You'll need the maven stage plugin to do this. Since maven-stage-plugin is not published, the release manager should checkout the source for the  plugin and build it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Or <B>option 2</B> (used for 2.0-M5), instead of using the Maven stage plugin just manually copy the artifacts there:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd public_html/sca-java/$RELEASE/$RC/org/apache/tuscany/
+cp -p -v -R  sca/  /x1/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/sca
+cp -p -v -R  maven/  /x1/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/maven
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Checkthepermissionsintherepo"></A>Check the permissions in the repo</H4>
+
+<P>There is a script in the SNAPSHOT report that sets the permissions correctly; take a look at the contents of the script and adjust for your purposes</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+more /www/people.apache.org/repo/m2-snapshot-repository/fix-permissions.sh
+</PRE>
+</DIV></DIV>
+
+<P>For example:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd /x1/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/
+find . ! -perm 775 -type d -user ${USER} -exec chmod 775 {} \; -print
+find . ! -perm 664 -iname maven-metadata.xml* -user ${USER} -exec chmod 664 {} \; -print
+find . -group slaws -exec chgrp committers {} \; -print
+</PRE>
+</DIV></DIV>
+
+<H4><A name="MakingReleases-Copythereleasecandidatetagtothefinaltagname."></A>Copy the release candidate tag to the final tag name.</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn copy https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/tags/$RELEASE-$RC/ https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/tags/$RELEASE -m <SPAN class="code-quote">&quot;Copy $RC tag as <SPAN class="code-keyword">final</SPAN> release tag&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<H4><A name="MakingReleases-Updatethewebsite"></A>Update the website</H4>
+
+<P>Edit the wiki that defines the website content <A href="../TUSCANY/sca-java-2x-releases.html" class="external-link" rel="nofollow">https://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+2.x+Releases</A></P>
+
+<H4><A name="MakingReleases-Waitfortheartifactandwebsitechangestobeupdated"></A>Wait for the artifact and website changes to be updated</H4>
+
+<P>The website will be updated from the wiki within a few hours. Once updated, check that the new download pages work correctly.  In particular follow the download links for artifacts right through to a selection of mirror download sites to be sure that the distributions have been mirrored.</P>
+
+<H4><A name="MakingReleases-BeattheDrum%21"></A>Beat the Drum!</H4>
+
+<P>send an announcement, using your apache.org email address, to the apache announce list, and to the tuscany dev and user lists. Blog the announcement on the Tuscany blog and any other publicity that seems appropriate.</P>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="setting-up-ssh.html" title="Setting up ssh">Setting up ssh</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="create-signing-key.html" title="Create Signing Key">Create Signing Key</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="get-hold-of-rat.html" title="Get hold of RAT">Get hold of RAT</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Making Releases';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG
new file mode 100644
index 0000000000..3f6509baca
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG
diff --git a/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg
new file mode 100644
index 0000000000..a5180fa0dd
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg
new file mode 100644
index 0000000000..29853f9e1e
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg
diff --git a/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg
new file mode 100644
index 0000000000..3dd9af44be
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.html b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.html
new file mode 100644
index 0000000000..27910b1759
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-aware-programming-in-tuscany.html
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>OSGi Aware Programming in Tuscany : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">OSGi Aware Programming in Tuscany</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109135">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109135">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109135">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109135">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109135">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109135">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H2><A name="OSGiAwareProgramminginTuscany-MotivationforOSGi"></A>Motivation for OSGi</H2>
+
+<P>   The Apache Tuscany project has become a large project, with various extensions and component types that brings to the SCA Runtime different levels of dependencies. With its growth, Tuscany also started to have it's SPIs violated by some of these extensions, and some of the boundaries between sub-systems are broken, as there wasn't any enforcement of these boundaries.</P>
+
+<P>   The OSGi model provides a very powerful and flexible framework to develop applications in a modular fashion with a high degree of control over classloading inter-dependencies over modules. An OSGi module (a.k.a bundle) have a manifest file (META-INF\manifest.mf) that contains module information such as &quot;name&quot;, &quot;version&quot; and also a list of what packages are being exported, and what packages are being imported from the given bundle, providing ways to easily enforce module boundaries.</P>
+
+<P>   In summary:</P>
+<UL>
+	<LI>Better class loading mechanism for our modules</LI>
+	<LI>Create clean boundaries between sub-systems</LI>
+</UL>
+
+
+<H2><A name="OSGiAwareProgramminginTuscany-TuscanyandOSGi3rdpartydependencies"></A>Tuscany and OSGi - 3rd party dependencies</H2>
+
+<P>   Currently we are wrapping the 3rd party dependencies as OSGi bundles, but leaving it unpacked (a.k.a folder structure). This allow use to use the same dependency jars in a OSGi environment as well as in a non-OSGI environment and generating no side effect on our distribution footprint.</P>
+
+<P>   <SPAN class="image-wrap" style=""><IMG src="osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG" style="border: 0px solid black"></SPAN></P>
+
+
+<H2><A name="OSGiAwareProgramminginTuscany-TuscanyandOSGiGranularity"></A>Tuscany and OSGi - Granularity</H2>
+
+<P>   The granularity used to define modules should be very familiar to all tuscany developers, </P>
+
+<P>   Tuscany Modules      --&gt; OSGi Bundles<BR>
+   3rd Party Libraries  --&gt; OSGi Bundles (using unpacked wrap style bundle)</P>
+
+<H2><A name="OSGiAwareProgramminginTuscany-ProperlydefiningnewTuscanymodulesasanOSGibundle"></A>Properly defining new Tuscany modules as an OSGi bundle</H2>
+
+<P> When adding new modules to the Tuscany project, the developer will need to create the OSGi Manifest to properly describe the new module as an OSGi bundle. These artifacts can be automatically generated using the Felix maven-bundle-plugin and should be available from svn repository once it's stable.</P>
+
+<H4><A name="OSGiAwareProgramminginTuscany-GeneratingOSGimanifestwithFelixmavenbundleplugin"></A>Generating OSGi manifest with Felix maven-bundle-plugin</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>&quot;configuring maven to generate the OSGi manifest&quot;</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;plugin&gt;
+    &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;
+    &lt;artifactId&gt;maven-bundle-plugin&lt;/artifactId&gt;
+    &lt;configuration&gt;
+        &lt;instructions&gt;
+            &lt;!-- Bundle versioned from Tuscany version --&gt;
+            &lt;Bundle-Version&gt;${tuscany.version}&lt;/Bundle-Version&gt;
+            &lt;!-- Bundle Symbolic name --&gt;
+            &lt;Bundle-SymbolicName&gt;org.apache.tuscany.sca.api&lt;/Bundle-SymbolicName&gt;
+            &lt;!-- Bundle description from pom description --&gt;
+            &lt;Bundle-Description&gt;${pom.description}&lt;/Bundle-Description&gt;
+            &lt;!-- Export org.osoa.sca and all sub-packages --&gt;
+            &lt;Export-Package&gt;org.osoa.sca*&lt;/Export-Package&gt;
+            &lt;!-- No Import-Package so calculate imports from code dependencies --&gt;
+        &lt;/instructions&gt;
+    &lt;/configuration&gt;
+&lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Below is a manifest that was generated for one of the Tuscany modules using the felix maven-bundle-plugin.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>&quot;OSGi Manifest (META-INF\manifest.mf)&quot;</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Manifest-Version: 1.0
+Export-Package: org.apache.tuscany.sca.assembly;uses:=&quot;javax.xml.xpath
+ ,org.apache.tuscany.sca.assembly.impl,org.apache.tuscany.sca.policy,o
+ rg.apache.tuscany.sca.interfacedef,javax.xml.namespace<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;
+ ,org.apache.tuscany.sca.assembly.impl;uses:=&quot;javax.xml.xpath,org.apac
+ he.tuscany.sca.assembly,org.apache.tuscany.sca.policy,org.apache.tusc
+ any.sca.interfacedef,javax.xml.namespace<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;,org.apache.tu
+ scany.sca.assembly.builder;uses:=&quot;org.apache.tuscany.sca.assembly,org
+ .apache.tuscany.sca.definitions,org.apache.tuscany.sca.core,org.apach
+ e.tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.apache.
+ tuscany.sca.extensibility<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;
+Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=
+ <SPAN class="code-quote">&quot;1.4&quot;</SPAN>
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Assembly Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397097203
+Bundle-ManifestVersion: 2
+Bundle-License: http:<SPAN class="code-comment">//www.apache.org/licenses/LICENSE-2.0.txt
+</SPAN>Bundle-Description: Apache Tuscany SCA Assembly Model
+Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.transf
+ orm,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.xpath,o
+ rg.apache.tuscany.sca.assembly;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.a
+ ssembly.builder;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.assembly.impl;ve
+ rsion=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.core;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tusc
+ any.sca.definitions;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.extensibilit
+ y;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.interfacedef;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org
+ .apache.tuscany.sca.monitor;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.poli
+ cy;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.policy.util;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org
+ .w3c.dom,org.xml.sax,junit.framework;resolution:=optional,org.apache.
+ tuscany.sca.interfacedef.impl;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>;resolution:=optional,org.
+ junit;resolution:=optional
+Bundle-SymbolicName: org.apache.tuscany.sca.assembly
+Bundle-DocURL: http:<SPAN class="code-comment">//www.apache.org/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="OSGiAwareProgramminginTuscany-TweakingtheOSGimanifest"></A>Tweaking the OSGi manifest</H2>
+
+<P>   Eclipse PDE provides good tooling for editing and maintaining OSGi manifest files. There are various scenarios we might need to tweak the OSGi manifest manualy :</P>
+
+<UL>
+	<LI>Updating imported/exported packages</LI>
+	<LI>Marking test dependencies optional
+	<UL>
+		<LI>Avoid issues when tests have references to external packages</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>   <SPAN class="image-wrap" style=""><IMG src="osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="OSGiAwareProgramminginTuscany-PDEintegrationoftuscanymodules"></A>PDE integration of tuscany modules</H2>
+<P>1) We generate the .classpath from maven dependencies.</P>
+
+<P>2) For maven compile/provided dependencies, the modules explicit references <BR>
+these dependencies via packages. We define corresponding Import-Package <BR>
+header in the MANIFEST.MF for OSGi, and these get resolved to other bundles <BR>
+that export the matching packages. This magic comes from the <BR>
+&quot;org.eclipse.pde.core.requiredPlugins&quot; classpath container which is <BR>
+contributed by the Eclipse PDE. The classpath container resolves the OSGi <BR>
+dependencies such as Import-Package or Required-Bundle and automatically add <BR>
+the required bundles to the classpath as we see in Eclipse project under the <BR>
+&quot;Plugin Dependencies&quot;.</P>
+
+<P>3) The exported packages come from three types of sources:</P>
+<UL>
+	<LI>System packages (exported by the System Bundle, i.e., org.eclipse.osgi).<BR>
+Different JDK levels have different list of system packages, for example, <BR>
+javax.xml.stream is not in J2SE-1.5 but in JSEJava-1.6. You can find the <BR>
+complete list by looking the .profile files within osgi-&lt;version&gt;.jar.</LI>
+	<LI>Tuscany modules in the Eclipse workspace. The classpath entry will be<BR>
+listed as a project under &quot;Plugin Dependencies&quot;</LI>
+	<LI>3rd-party jars (already as OSGi bundles contributed by the target<BR>
+platform). The classpath entry will be listed as a jar under &quot;Plugin <BR>
+Dependencies&quot;</LI>
+</UL>
+
+
+<P>4) For maven runtime dependencies, there is no corresponding Import-Package <BR>
+and the dependencies are used in runtime. Ideally in OSGi, they could be a <BR>
+Required-Bundle or a bundle available at runtime. To run the project in JSE <BR>
+inside Eclipse, we generate an explicit classpath entry.</P>
+
+<P>5) For maven test dependencies, there are two types: one is for test <BR>
+compilation and the other for test runtime. For the first type, we use <BR>
+optional Import-Package to pull in the dependencies if the same project has <BR>
+the compile dependency for the same artifact. Otherwise, we generate an <BR>
+explicit classpath entry for JSE testing.</P>
+
+<P>6) For test cases which require extra dependencies in addition to the <BR>
+compile/provided/runtime dependencies for the main code, they probably <BR>
+should not be unit tests. We need to consider how to move them into the <BR>
+itest bucket.</P>
+
+
+
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : OSGi Aware Programming in Tuscany';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/OSGi Enablement for Tuscany.ppt b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/OSGi Enablement for Tuscany.ppt
new file mode 100644
index 0000000000..bee880e978
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/OSGi Enablement for Tuscany.ppt
diff --git a/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/tuscany-osgi.pdf b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/tuscany-osgi.pdf
new file mode 100644
index 0000000000..ee6105b7a1
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.data/tuscany-osgi.pdf
diff --git a/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.html b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.html
new file mode 100644
index 0000000000..38a82c3242
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/osgi-enablement-for-tuscany-runtime.html
@@ -0,0 +1,381 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>OSGi Enablement for Tuscany Runtime : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="OSGi Enablement for Tuscany Runtime">OSGi Enablement for Tuscany Runtime</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="OSGi Enablement for Tuscany Runtime">OSGi Enablement for Tuscany Runtime</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">OSGi Enablement for Tuscany Runtime</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109741">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109741">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109741">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109741">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109741">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109741">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="OSGiEnablementforTuscanyRuntime-OSGiEnablementforTuscanyRuntime"></A>OSGi Enablement for Tuscany Runtime</H1>
+
+<P><A href="osgi-enablement-for-tuscany-runtime.data/OSGi%20Enablement%20for%20Tuscany.ppt">OSGi Enablement for Tuscany.ppt</A></P>
+
+<H2><A name="OSGiEnablementforTuscanyRuntime-MovtivationstoenableOSGiforTuscany%3A"></A>Movtivations to enable OSGi for Tuscany:</H2>
+
+<UL>
+	<LI>Provide modularity for Tuscany to formalize the SPI contracts and enforce the package dependencies across modules</LI>
+	<LI>Enable Tuscany to work with OSGi environment such as JEE application servers, Eclipse RCP or Spring DM (see <A href="http://www.infoq.com/news/2008/11/osgi-in-the-enterprise" class="external-link" rel="nofollow">http://www.infoq.com/news/2008/11/osgi-in-the-enterprise</A> )</LI>
+	<LI>Provide versioning and isolation so that Tuscany extensions can depend on different versions of the same library</LI>
+	<LI>Provide dynamic lifecycle for extensions, install/uninstall/start/stop a module</LI>
+</UL>
+
+
+<H2><A name="OSGiEnablementforTuscanyRuntime-Objectives"></A>Objectives</H2>
+
+<UL>
+	<LI>Tuscany runtime will be able to run in both non-OSGi and OSGi environment</LI>
+	<LI>A consistent OSGi story across development, build, runtime and testing</LI>
+</UL>
+
+
+<H2><A name="OSGiEnablementforTuscanyRuntime-StepstomakeTuscanyworkwithOSGi%28Basicenablement%29"></A>Steps to make Tuscany work with OSGi (Basic enablement)</H2>
+
+<UL>
+	<LI>Add OSGi MANIFEST.MF for each module to make it an OSGi bundle
+	<UL>
+		<LI>The generated MANIFEST.MF from maven-bundle-plugin is a good starting point. The result may not be accurate and it doesn't help to reduce the coupling</LI>
+		<LI>It should be developers' reponsibility to maintain it for the optimal dependencies</LI>
+	</UL>
+	</LI>
+	<LI>Convert each non-OSGi 3rd-party jar into an OSGi bundle
+	<UL>
+		<LI>Exception: Aggregate a group of 3rd-party jars if they have split packages</LI>
+	</UL>
+	</LI>
+	<LI>Add an OSGi-based service discoverer to discover tuscany extension points and extensions from the installed bundles
+	<UL>
+		<LI>Use the same JDK service provider pattern (META-INF/services) as JSE</LI>
+		<LI>The discoverer is configured based on the running environment (JSE or OSGi)</LI>
+	</UL>
+	</LI>
+	<LI>Change how JDK factories such as XMLInputFactory, XPathFactory, and DocumentBuilderFactory, are discovered and instantiated
+	<UL>
+		<LI>XMLInputFactory.newInstance() used the JSE service provider pattern which doesn't work with OSGi</LI>
+		<LI>We need to use Tuscany's service discovery mechanism to discover and instantiate the factories</LI>
+	</UL>
+	</LI>
+	<LI>Adjust the code that assumes there is a flat thread context classloader that can access all the classes in the Tuscany runtime
+	<UL>
+		<LI>With OSGi, there is a network of classloaders (one classloader per module) and the class visibility is constrained by the OSGi headers such as Import-Package and Export-Package</LI>
+		<LI>The classloader for the current class is a good starting point for Class.forName() with OSGi</LI>
+	</UL>
+	</LI>
+	<LI>Provide a SCA node launcher to start an OSGi runtime and run SCA application with the OSGi-enabled Tuscany runtime</LI>
+	<LI>Produce distributions that are compatible with the OSGi bundle structure in an efficient way (in one-two minutes)</LI>
+	<LI>Bring samples and itests to use the Tuscany SCA OSGi node launcher or run with the Eclipse Equinox profile</LI>
+</UL>
+
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>To learn from the excerises we went through, please see the slides: <A href="osgi-enablement-for-tuscany-runtime.data/tuscany-osgi.pdf">tuscany-osgi.pdf</A></TD></TR></TABLE></DIV>
+
+<H2><A name="OSGiEnablementforTuscanyRuntime-UseOSGitohelpTuscanymaintainandenforcegoodmodularitywithcleanSPIsfollowingtheOSGibestpractices"></A>Use OSGi to help Tuscany maintain and enforce good modularity with clean SPIs following the OSGi best practices</H2>
+
+<UL>
+	<LI>Identify the absolutely necessary SPI packages that need to be exported
+	<UL>
+		<LI>Don't try to export everything</LI>
+		<LI>For model modules, try to only export the package that contains the interfaces</LI>
+		<LI>Try not to export any package from the xxx-runtime moudles</LI>
+		<LI>Any classes that can be accessed via the ExtensionPointRegistry using interfaces should not be exported</LI>
+	</UL>
+	</LI>
+	<LI>Only import other packages when it's needed
+	<UL>
+		<LI>For example, we used to have a lot of modules pull in assembly for just a constant for the SCA namespace</LI>
+		<LI>Avoid DynamicImport-Package=&#42;</LI>
+	</UL>
+	</LI>
+	<LI>Do not export &quot;private&quot; packages as a workaround or hack which can fail the &quot;clean SPI&quot;. Refactor things into SPIs if necessary
+	<UL>
+		<LI>For example, tuscany-core has quite a few packages that are exported. We need to define a SPI layer if these exports are required.</LI>
+		<LI>implementation-java: extract out the annotation processing so that they can be reused for introspecting other java-based implementation technologies such as Spring or EJB</LI>
+		<LI>implementation-java-runtime: extract out the IoC</LI>
+		<LI>add common modules such as common-java and common-xml to host java or XML related utilities</LI>
+	</UL>
+	</LI>
+	<LI>Split modules into model/runtime to promote modularity</LI>
+	<LI>Fix some of the unit testcases that pull in too many dependencies and they should be itests</LI>
+</UL>
+
+
+<P>To help developers to develop Tuscany modules as OSGi bundles and receive errors if OSGI constraints are violated, we integrated with a set of tools (help for improvement is welcome):</P>
+<UL>
+	<LI>A maven plugin to generate .classpath and .project files and target definition file to produce Eclipse PDE plugin projects for Tuscany modules so that we can leverage the nice OSGi development tooling
+	<UL>
+		<LI>Compile dependencies are now pulled in by the PDE requiredPlugins classpath container</LI>
+		<LI>Runtime dependencies are now generated as an explict classpath entry</LI>
+		<LI>Test dependencies can be optional Import-Package or an explicit classpath entry</LI>
+	</UL>
+	</LI>
+	<LI>A maven compiler to use Eclipse JDT and OSGi bundle resolver
+	<UL>
+		<LI>The JDT compiler is much faster that javac</LI>
+		<LI>The OSGi resolution reports unsatisfied OSGi constraints</LI>
+	</UL>
+	</LI>
+	<LI>A maven plugin to generate OSGi-compatible distribution structure which hosts 3rd-party jars that can be used a bundle for OSGi as well as a plain jar for JSE classpath
+	<UL>
+		<LI>Copy OSGi bundles as jars</LI>
+		<LI>Create a folder structure to hold the MANIFEST.MF which keep the 3rd-party jar as-is</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>For more details, please see: <A href="osgi-aware-programming-in-tuscany.html" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>?</TD></TR></TABLE></DIV>
+
+<H2><A name="OSGiEnablementforTuscanyRuntime-DevelopingTuscanymodulesasOSGibundles"></A>Developing Tuscany modules as OSGi bundles</H2>
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-DesignofanOSGibundle"></A>Design of an OSGi bundle</H3>
+
+<UL>
+	<LI>Modularity/Granularity
+	<UL>
+		<LI>Not just a simple packaging scheme such as all jars are consolidated into one big bundle, export/import everything</LI>
+	</UL>
+	</LI>
+	<LI>Maven is designed to manage build dependency
+	<UL>
+		<LI>Visibility at module level (too high)</LI>
+		<LI>Transitive dependency</LI>
+		<LI>Classloading is flat</LI>
+		<LI>No runtime control</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-CreatinganOSGibundle"></A>Creating an OSGi bundle</H3>
+
+<UL>
+	<LI>Converting Tuscany modules into OSGi bundles
+	<UL>
+		<LI>META-INF/MANIFEST.MF</LI>
+	</UL>
+	</LI>
+	<LI>Converting 3rd-party jars into OSGi bundles
+	<UL>
+		<LI>Plain Jars</LI>
+		<LI>Patching existing bundles</LI>
+	</UL>
+	</LI>
+	<LI>Distribution Structure</LI>
+</UL>
+
+
+<UL>
+	<LI>Eclipse PDE integration
+	<UL>
+		<LI>Target platform</LI>
+		<LI>Classpath setting</LI>
+		<LI>PDE tools
+		<UL>
+			<LI>
+			<UL>
+				<LI>Build path</LI>
+				<LI>PDE dependency view</LI>
+				<LI>MANIFEST.MF editor</LI>
+				<LI>Equinox run/debug profile</LI>
+			</UL>
+			</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-MavenpluginstohelpOSGidevelopment"></A>Maven plugins to help OSGi development</H3>
+
+<UL>
+	<LI>Maven Eclipse Compiler
+	<UL>
+		<LI>Use Eclipse JDT as the compiler</LI>
+		<LI>Validate the MANIFEST.MF</LI>
+	</UL>
+	</LI>
+	<LI>Tuscany Maven Bundle Plugin
+	<UL>
+		<LI>Generating modules</LI>
+		<LI>Generating PDE target</LI>
+		<LI>Generating Equinox Configuration</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-Runtimeconcerns"></A>Runtime concerns</H3>
+
+<UL>
+	<LI>Equinox OSGi launcher</LI>
+	<LI>META-INF/services Service Provider discovery</LI>
+	<LI>Avoid XMLInputFactory.newInstance(), DocumentBuilderFactory.newInstance()...</LI>
+	<LI>Classloading (TCCL is evil)
+	<UL>
+		<LI>Equinox ContextFinder</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-TestTuscanycodewithOSGi"></A>Test Tuscany code with OSGi</H3>
+
+<UL>
+	<LI>How to run maven surefire plugin with OSGi?</LI>
+	<LI>Eclipse run as JUnit plugin test</LI>
+</UL>
+
+
+<H3><A name="OSGiEnablementforTuscanyRuntime-TroubleshoottheOSGiconstraintviolations"></A>Troubleshoot the OSGi constraint violations</H3>
+
+<UL>
+	<LI>OSGi console
+	<UL>
+		<LI>&#45;Dosgi.console=&lt;port #&gt;</LI>
+	</UL>
+	</LI>
+	<LI>Eclipse PDE state view</LI>
+	<LI>Traps
+	<UL>
+		<LI>Split Packages</LI>
+		<LI>System packages</LI>
+		<LI>Version mismatch</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<P><A href="osgi-enablement-for-tuscany-runtime.data/OSGi%20Enablement%20for%20Tuscany.ppt">OSGi Enablement for Tuscany.ppt</A></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : OSGi Enablement for Tuscany Runtime';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg b/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg
new file mode 100644
index 0000000000..a0b9c3c248
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg.jpeg b/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg.jpeg
new file mode 100644
index 0000000000..899edcb286
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/overview.data/guide_icon.jpeg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/overview.html b/site/trunk/site-publish/documentation-2x/overview.html
new file mode 100644
index 0000000000..e03b35d176
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/overview.html
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Overview : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Overview">Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Overview">Overview</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109103">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109103">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109103">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Getting Started with Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="getting-started.html" title="Getting Started">Getting Started</A> These guides help you to get setup in Tuscany, develop and run a simple application using comand line or Eclipse.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Introduction</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A> Provides a quick introduction to SCA and links to the SCA Specifications.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany Samples</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="samples.html" title="Samples">SCA Samples</A> A description of the Tuscany SCA sample contributions</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java Extensions Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A> Provides a guide for all the SCA Java and Tuscany extensions.</P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><A href="development-guides.html" title="Development Guides">Development Guides</A> These guides help you learn more about Tuscany architecture and how to get involved in the development of Tuscany. We look forward to your help.</P>
+</DIV></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Overview';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/resources/space.css b/site/trunk/site-publish/documentation-2x/resources/space.css
new file mode 100644
index 0000000000..9ca27bc4a3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/resources/space.css
@@ -0,0 +1,5269 @@
+
+/* Confluence master stylesheet */
+body {
+    margin: 0;
+    padding: 0;
+    background-color: #f0f0f0;
+}
+body.content-preview {
+    background: #fff;
+    border: none;
+}
+
+body, p, td, table, tr, .bodytext, .stepfield {
+    font-size: 10pt;
+    line-height: 1.3;
+    color: #000;
+    font-weight: normal;
+}
+
+#page {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+#PageContent {
+    text-align: left;
+    background-color: #fff;
+    padding: 0 0 20px 0;
+    margin: 0;
+}
+
+.print-only {
+    display: none;
+}
+
+.monospaceInput {
+    font: 12px Monaco, Consolas, "Courier New", monospace;
+}
+
+pre {
+    padding: 0;
+    margin: 10px 0;
+    text-align: left;
+    overflow: auto;
+}
+
+.helpheading {
+    font-weight: bold;
+    background-color: #d0d9bd;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    padding: 4px;
+    margin: 0;
+    margin-top: 10px;
+}
+.helpcontent {
+    padding: 4px 4px 20px 4px;
+    background-color: #f5f7f1;
+}
+
+.help-section-div .helpheading {
+    margin: 0;
+}
+.help-section-div {
+    margin-bottom: 2em;
+}
+
+#print-friendly-help-toggle {
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    text-indent: -999em;
+    width: 16px;
+    height: 16px;
+    background-image: url("../../../images/icons/print_16.gif");
+    background-repeat: no-repeat;
+    outline: none;
+}
+
+#commentsHide {
+    color: #666;
+    font-weight: normal;
+}
+
+#showingComments {
+    border: none;
+    font-size: 10pt;
+}
+
+.pageSection {
+    margin-top: 10px;
+    clear: both;
+}
+
+
+.pageSectionHeader {
+    margin-bottom: 5px;
+    padding: 2px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.pageSectionHeader.summary {
+    border-bottom: none;
+}
+
+.pageSectionBody {
+    margin-top: 4px;
+}
+
+a.grey:link { color: #666; }
+a.grey:visited { color: #666; }
+a.grey:active { color: #666; }
+a.grey:hover { color: #666; }
+
+.more-comments {
+    font-size: 10pt;
+    color: #dde2e6;
+}
+
+.commentBox  {
+    padding: 0;
+    margin: 10px 0;
+    overflow: auto;
+}
+
+.commentBox table.comment {
+    border: 0;
+    border-bottom: #f0f0f0 1px solid;
+    border-top: #f0f0f0 1px solid;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.commentBox .commentinfo {
+    background-color: #f0f0f0;
+    vertical-align: top;
+    padding: 12px;
+}
+
+.commentBox .commentinfo .smalltext {
+    line-height: 11pt;
+}
+
+.commentBox .commentphoto {
+    background-color: #f0f0f0;
+    text-align: right;
+    vertical-align:top;
+    padding: 12px;
+}
+
+.commentBox .commentphoto img {
+    border: none;
+}
+
+.commentBox .commentname a:hover {
+    text-decoration: underline;
+}
+
+.commentdate {
+    margin-top: 3px;
+}
+
+.commentBox .commentdate, .commentdate a {
+    color: #000;
+    text-decoration: none;
+    font-size: 9pt;
+}
+
+.commentdate a:hover {
+    text-decoration: underline
+}
+
+.commentBox .smalltext {
+    line-height: 10pt;
+}
+
+.commentBox .smalltext a {
+    text-decoration: none;
+}
+
+.commentBox .smalltext a:hover {
+    text-decoration: underline;
+}
+
+.commentBox td.commentdetails {
+    vertical-align: top;
+    padding: 0 10px;
+}
+
+.commentBox td.commentActions {
+    padding: 0 10px 10px 10px;
+    vertical-align: bottom;
+}
+
+.commentThread {
+    clear: both; /* clear both in case there are floats or aligned images in the content that sits above the comment thread */
+}
+
+#replying .commentdetails {
+    padding: 15px 0 15px 25px
+}
+
+#replying .commentinfo {
+    background-color: #a0a0a0;
+    color: #f0f0f0;
+}
+
+#replying .commentdate, #replying .commentdate a {
+    color: #f0f0f0;
+}
+
+#replying .commentname a {
+    color: #f0f0f0;
+}
+
+#replying .commentphoto {
+    background-color: #a0a0a0;
+}
+
+#replying table.comment {
+    border-bottom-color: #a0a0a0;
+    border-top-color: #a0a0a0;
+}
+
+#addition .commentdetails {
+    padding: 15px 30px 10px 30px;
+}
+
+#addition .commentinfo {
+    background-color: #a0a0a0;
+    color: #f0f0f0;
+}
+
+#addition .commentname a {
+    color: #f0f0f0;
+}
+
+#addition .commentdate, #addition .commentdate a {
+    color: #f0f0f0;
+}
+
+#addition .commentphoto {
+    background-color: #a0a0a0;
+}
+
+#addition table.comment {
+    border-bottom-color: #a0a0a0;
+    border-top-color: #a0a0a0;
+}
+
+#focusedComment .commentBox td.commentdetails, #focusedComment td.commentActions {
+    background: #ffffd7;
+}
+
+.anonymousAlert, .lockAlert {
+    background-color: #f0f0f0;
+    border: 1px dashed red;
+    font-size: 11px;
+    padding: 10px 5px;
+    margin: 4px;
+    line-height: 13px;
+}
+
+.lockAlert {
+    width: 50%;
+}
+
+.navmenu {
+    border: 1px solid #f0f0f0;
+    margin: 0;
+}
+
+.menuheading {
+    font-weight: bold;
+    padding: 5px 4px 5px 10px;
+    color: #222;
+    background-color: #f0f0f0;
+}
+
+.navmenu.collapsible-menu .menuheading {
+    background: #f0f0f0 url(../../../images/icons/grey_arrow_down.gif) no-repeat 98% 50%;
+}
+.navmenu.collapsible-menu .menuheading.closed {
+    background-image: url(../../../images/icons/grey_arrow_right.gif);
+}
+
+.menuitems {
+    padding: 4px 4px 20px 4px;
+}
+
+ul.navmenu {
+    padding-left: 0;
+    margin-top: 0;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+ul.navmenu li.menu-section {
+    list-style: none;
+}
+
+.menu-section-list {
+    margin: 0;
+    padding: 5px 0 10px 0;
+}
+
+.menu-section-list li {
+    list-style: none;
+    margin: 0;
+    line-height: 1.3;
+}
+
+.menu-section-list li a:hover {
+    background-color: #f0f0f0;
+}
+
+.menu-section-list li.active a,
+.menu-section-list li.active a:hover {
+    color: #fff;
+    font-weight: bold;
+    background-color: #444; /* set to neutral colour */
+}
+
+.menu-section-list li a {
+    text-decoration: none;
+    color: #666;
+    display: block;
+    padding: 0.2em 10px;
+    cursor: pointer;
+}
+
+.menu-section-list li a img {
+    padding-right: 2px;
+}
+
+.rightpanel {
+    background: #f0f0f0;
+    -moz-border-radius: 3px; /* Firefox */
+    -webkit-border-radius: 3px; /* Safari */
+    border-radius: 3px; /* CSS3 (Opera?) */
+    padding: .9em;
+}
+
+h3.underlined,
+#helpheading,
+.sidebar-heading {
+    padding: 0;
+    margin: 10px 0;
+    text-align: left;
+    color: #333;
+    border-bottom: 1px solid #ccc;
+}
+
+#helpheading,
+#helpcontent h3.underlined,
+.sidebar-heading {
+    font-size: 13px;
+    margin: -.1em;
+    padding: .1em .1em .2em .1em;
+}
+
+#helpcontent h3.helpheading-spacing{
+    margin-top: 20px;
+}
+
+#helpcontent {
+    margin-top: .9em;
+}
+
+#helpcontent p {
+    margin-bottom: 0;
+    margin-top: .9em;
+}
+
+#helpcontent ul {
+    padding-left: 1.3em;
+}
+
+#helpcontent dl {
+    margin-top: 0;
+}
+
+#helpcontent dl dd {
+    margin: 0;
+    color: #333;
+    font-size: 90%;
+    margin-bottom: .2em;
+}
+
+#helpcontent dl dd code,
+#helpcontent dl dd pre {
+    color: #666;
+    margin: 0;
+    padding: 0;
+}
+
+#helpcontent dl dd.text-formatting code {
+    display: inline-block;
+    width: 6em;
+}
+
+#helpcontent dl dt {
+    margin-top: 1em;
+}
+#helpcontent dl dt.first {
+    margin-top: 0;
+}
+
+.helptab-unselected {
+    font-weight: bold;
+    padding: 5px;
+    background-color: #f5f7f1;
+}
+.helptab-selected {
+    font-weight: bold;
+    background-color: #d0d9bd;
+    padding: 5px;
+}
+.helptabs {
+    margin: 0;
+    background-color: #f5f7f1;
+    padding: 5px;
+}
+
+#profileSummary h3 {
+    font-weight: bold;
+    font-size: 10pt;
+    margin: 12px 0 4px;
+    padding: 0;
+}
+#profileSummary ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+.pageheader {
+    padding: 5px 5px 5px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.pagetitle {
+    font-size: 18pt;
+    line-height: normal;
+    font-weight: bold;
+}
+
+.newpagetitle {
+    color: #ccc !important;
+}
+
+.steptitle {
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 7px;
+}
+
+.substeptitle {
+    font-size: 12px;
+    font-weight: bold;
+    margin: 2px 4px 4px 4px;
+    padding: 2px 4px 1px 4px;
+}
+
+.has-blog-sidebar #title-text a {
+    word-wrap: break-word;
+    display: inline-block;
+    max-width: 75%;
+}
+
+.stepdesc {
+    font-size: 10pt;
+    line-height: 13pt;
+    font-weight: normal;
+    color: #666;
+    margin-top: 7px;
+    margin-bottom: 7px;
+}
+
+.steplabel {
+    font-weight: bold;
+    margin-right: 4px;
+    color: black;
+    float: left;
+    width: 15%;
+    text-align: right;
+}
+
+.stepfield {
+    background: #f0f0f0;
+    padding: 5px;
+}
+
+.submitButtons{
+    margin-top:5px;
+    text-align:right;
+}
+
+.formtitle {
+    font-size: 12px;
+    font-weight: bold;
+}
+
+.sectionbottom {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.topRow {
+    border-top-width: 2px;
+    border-top-style: solid;
+}
+
+/* CONF-20585:
+ * non-dashboard headings will keep their current style
+ * text styling is duplicated in the div because not all divs contain headings
+ */
+.tabletitle {
+    font-size: 10pt;
+    font-weight: bold;
+    padding: 3px 0 2px 0;
+    margin: 8px 4px 2px 0;
+    border-bottom-width: 2px;
+    border-bottom-style: solid;
+}
+.tabletitle h2,
+.wiki-content .tabletitle h2 {
+    font-size: 10pt;
+    font-weight: bold;
+    padding: 0;
+    margin: 0;
+}
+form[name=inlinecommentform] .tabletitle {
+    border: 0;
+}
+
+/* CONF-20585:
+ * .tabletitle on the dashboard is purely a container
+ * dashboard headings are styled like .welcome-message-heading
+ */
+.dashboard .tabletitle {
+    margin: 0;
+    padding: 0;
+    border: none;
+}
+.dashboard .tabletitle h2 {
+    font-size: 14pt;
+    color: #3C78B5;
+    font-weight: normal;
+    font: Arial FreeSans Helvetica sans-serif;
+    padding: 3px 0 2px 0;
+    margin: 1em 0 0 0;
+    border-bottom: 1px solid #ccc
+}
+
+.tabletitleops {
+    float: right;
+}
+.tabletitleops, .tabletitleops a, .tabletitleops img {
+    vertical-align: middle;
+}
+.tabletitleops img {
+    border: none;
+}
+
+.fullWidth {
+    width: 100%;
+}
+
+.pagesubheading {
+    color: #666;
+    font-size: 10px;
+    padding: 0 0 5px 0;
+}
+
+hr {
+    color: #ccc;
+    height: 1px;
+}
+
+h1 a:link, h1 a:visited, h1 a:active {
+    text-decoration: none;
+}
+
+.logocell {
+    padding: 10px;
+}
+
+input {
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 10pt;
+    color: #000;
+}
+input[type='password'] {
+    -webkit-appearance: caps-lock-indicator;
+}
+
+textarea, textarea.editor {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    color: #333;
+}
+
+.spacenametitle-printable {
+    font: 20px Impact, Arial, Helvetica;
+    font-weight: 100;
+    line-height: 25px;
+    margin: 0;
+}
+
+.spacenametitle-printable a,
+.spacenametitle-printable a:visited {
+    text-decoration: none;
+}
+
+.blogDate {
+    font-weight: bold;
+    text-decoration: none;
+    color: black;
+}
+
+.blogSurtitle {
+    background: #f0f0f0;
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.blog-post-listing {
+    margin-bottom: 66px;
+}
+
+.blog-post-listing .logo-heading-block {
+    padding-left: 61px;
+}
+
+.blog-post-listing a.blogHeading{
+    margin: 0.05em 0;
+    padding: 0;
+}
+
+.blog-post-listing .blogHeading{
+    display: inline-block;
+    word-wrap: break-word;
+    margin: 0.1em 0;
+}
+.blog-post-listing .logoBlock{
+    display: inline-block;
+    float: left;
+    margin-left: -61px;
+    vertical-align: top;
+}
+
+.blog-post-listing .page-metadata{
+    margin: 0.1em 0 0.1em 0.1em;
+}
+
+.blog-post-listing .page-metadata.not-personal{
+   font-size: 1em;
+}
+
+.blog-post-listing .wiki-content {
+    clear: both;
+}
+
+a.blogHeading {
+    font-size: 20pt;
+    line-height: normal;
+    font-weight: bold;
+    text-decoration: none;
+    word-wrap: break-word;
+}
+
+.blogHeading a:hover {
+   text-decoration: underline;
+}
+
+.blog-pagination{
+    padding-bottom: 1em;
+}
+
+.endsection {
+    color: #666;
+    clear: both;
+    padding: 1em 0 0.5em;
+    font-size: 1em;
+}
+.endsectionleftnav {
+    text-align: right;
+    color: #666;
+    clear: both;
+    padding-top: 10px;
+}
+
+.endsection img{
+    border: 0;
+    vertical-align: middle;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    line-height: normal;
+    font-weight: bold;
+    padding: 2px;
+}
+
+h1 {
+    font-size: 24px;
+    margin: 36px 0 4px 0;
+}
+
+h2 {
+    font-size: 18px;
+    margin: 27px 0 4px 0;
+}
+
+h3 {
+    font-size: 14px;
+    margin: 21px 0 4px 0;
+}
+
+h4 {
+    font-size: 12px;
+    margin: 18px 0 4px 0;
+}
+
+h5 {
+    font-size: 10px;
+    margin: 14px 0 4px 0;
+}
+
+h6 {
+    font-size: 8px;
+    margin: 14px 0 4px 0;
+}
+
+.smallfont {
+    font-size: 10px;
+}
+.descfont {
+    color: #666;
+    font-size: 10px;
+}
+.smallerfont {
+    font-size: 9px;
+}
+.smalltext {
+    color: #666;
+    font-size: 12px;
+}
+.smalltext a {
+    color: #666;
+}
+.greyText
+{
+    color: #666;
+}
+.smalltext-blue {
+    font-size: 8pt;
+    color: #69c;
+}
+.surtitle {
+    margin-left: 1px;
+    margin-bottom: 5px;
+    font-size: 14px;
+    color: #666;
+}
+
+/* css hack found here:  http://www.fo3nix.pwp.blueyonder.co.uk/tutorials/css/hacks/ */
+.navItemOver {
+    font-size: 10px;
+    font-weight: bold;
+    voice-family: "\'}\'";
+    voice-family: inherit;
+    cursor: pointer;
+}
+
+.navItem {
+    font-size: 10px;
+    font-weight: bold;
+    color: #fff;
+}
+
+.navItemOver a,
+.navItemOver a:visited,
+.navItemOver a:hover,
+.navItem a,
+.navItem a:hover,
+.navItem a:visited {
+    text-decoration: none;
+}
+
+div.padded {
+    padding: 4px;
+}
+
+div.thickPadded {
+    padding: 10px;
+}
+
+h3.macrolibrariestitle {
+    margin: 0;
+}
+
+div.centered {
+    text-align: center;
+    margin: 10px;
+}
+
+div.centered table {
+    margin: 0 auto;
+    text-align: left;
+}
+
+.tableview table {
+    margin: 0;
+}
+
+.tableview tr.alternateRow {
+    background: #f0f0f0;
+}
+
+.tableview th {
+    text-align: left;
+    font-size: 12px;
+    padding: 5px 15px 2px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+.tableview td {
+    text-align: left;
+    border-color: #eee;
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    margin: 0;
+    padding: 5px 15px 3px 0;
+}
+
+.grid {
+    margin: 2px 0 5px 0;
+    border-collapse: collapse;
+}
+.grid th  {
+    border: 1px solid #ccc;
+    padding: 2px 4px 2px 4px;
+    background: #f0f0f0;
+    text-align: center;
+}
+.grid td  {
+    border: 1px solid #ccc;
+    padding: 3px 4px 3px 4px;
+}
+.gridHover {
+    background-color: #f9f9f9;
+}
+
+td.infocell {
+    background-color: #f0f0f0;
+}
+.error {
+    background-color: #fcc;
+}
+
+.errorBox {
+    background-color: #fcc;
+    border: 1px solid #c00;
+    padding: 5px;
+    margin: 5px;
+}
+
+.errorMessage, .errorMessage p {
+    color: #c00;
+}
+
+.success {
+    background-color: #dfd;
+}
+
+.successBox {
+    background-color: #dfd;
+    border: 1px solid #090;
+    padding: 5px;
+    margin-top:5px;
+    margin-bottom:5px;
+}
+
+blockquote {
+    font-style: italic;
+    font-size: 10pt;
+    border-left-width: 1px;
+    border-left-style: solid;
+    padding: 0 20px;
+    margin: 10px 20px;
+}
+
+blockquote p {
+    font-size: 10pt;
+}
+
+blockquote em {
+    font-style: normal;
+}
+
+div.small {
+    font-size: 9px;
+}
+
+h1.pagename {
+    margin-top: 0;
+}
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote {
+    text-align: center;
+    font-size: 11px;
+    color: red;
+}
+
+/* How the preview content should be shown */
+.previewcontent {
+    background: #e0e0e0;
+}
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent {
+    background: #e0e0e0;
+}
+
+.createlink,
+a.createlink,
+a.createlink:link,
+a.createlink:visited,
+a.createlink:active,
+a.createlink:hover {
+    color: maroon;
+}
+.templateparameter {
+    font-size: 9px;
+    color: #00008b;
+}
+
+#page-diffs, #conflict-diffs{
+    min-height: 54px;
+}
+
+#page-diffs {
+    margin-bottom: 2em;
+}
+#page-diffs .diff {
+    margin-top: 0;
+}
+#page-diffs .diff div {
+    word-wrap: break-word;
+}
+
+.key-diffs {
+    border: 1px solid #CCCCCC;
+    float: right;
+    padding: 0.5em;
+}
+.key-diffs .diff {
+    margin: 0;
+    padding: 0;
+}
+
+.diff {
+    font: 12px Monaco, Consolas, "Courier New", monospace;
+    padding: 0 0 0 1.5em;
+    margin-top: 1em;
+}
+.diff td {
+    font-size: 0.9em;
+    padding-bottom: 0.3em;
+}
+.diff-added-lines, .diff-added-words, .diff-added-chars {
+    background: #dfd;
+}
+.diff-deleted-lines, .diff-deleted-words, .diff-deleted-chars {
+    color: #999;
+    background: #fdd;
+    text-decoration: line-through;
+}
+.differror {
+    background: #A52A2A;
+}
+
+div.diff-snip-link img.twixie,
+div.diff-snip-text img.twixie {
+    margin: 0 4px -6px -20px; /* Twixie is 16 pixels wide, sum of left and right margins should be -16px */
+}
+
+div.diff-snip-link,
+div.diff-snip-text {
+    margin: 0.85em 0;
+}
+
+.greybackground {
+    background: #f0f0f0
+}
+
+.greybox {
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.borderedGreyBox {
+    background-color: #F0F0F0;
+    padding: 0.9em;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    margin-bottom: 17px;
+
+}
+
+.space-labels div.borderedGreyBox{
+    float: right;
+    width: 189px;
+}
+
+
+
+.borderedLabelHeading{
+    border-bottom: 1px solid #CCCCCC;
+    color: #333333;
+    font-size: 13px;
+    font-weight: bold;
+    margin-bottom: 0.7em;
+}
+
+.greyboxfilled {
+    border: 1px solid #ddd;
+    background: #f0f0f0;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.lightGreyBox {
+    background: #fafafa;
+}
+
+.navBackgroundBox {
+    padding: 5px;
+    font-size: 22px;
+    font-weight: bold;
+    color: white;
+    text-decoration: none;
+}
+
+.previewBoxTop {
+    background-color: #f0f0f0;
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+    padding: 5px;
+    margin: 5px 0px 0px 0px;
+    text-align: center;
+}
+.previewContent {
+    background-color: #fff;
+    border-width: 0px 1px 0px 1px;
+    border-style: solid;
+    padding: 10px;
+    margin: 0px;
+}
+.previewBoxBottom {
+    background-color: #f0f0f0;
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    padding: 5px;
+    margin: 0px 0px 5px 0px;
+    text-align: center;
+}
+
+.functionbox {
+    background-color: #f0f0f0;
+    border: 1px solid;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.functionbox-greyborder {
+    background-color: #f0f0f0;
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.rowNormal {
+    background-color: #fff;
+ }
+
+.rowAlternate {
+    background-color: #f7f7f7;
+}
+
+/* used in the list attachments table */
+.rowAlternateNoBottomColor {
+    background-color: #f7f7f7;
+}
+
+.rowAlternateNoBottomColor td,
+.rowAlternateNoBottomNoColor td {
+    border-bottom: 0;
+}
+
+.rowHighlight {
+    background-color: #f0f0f0;
+}
+
+td.greenBar,
+td.greenbar,
+td.graybar,
+td.redbar,
+td.darkredbar {
+    font-size: 1em;
+    border: 1px solid #9c9c9c;
+    padding: 0;
+}
+
+td.greenBar,
+td.greenbar {
+    background: #00df00;
+}
+td.graybar {
+    background: #808080;
+}
+td.redbar {
+    background: #df0000;
+}
+td.darkredbar {
+    background: #af0000;
+}
+
+tr.testpassed {
+    font-size: 2px;
+    background: #dfd;
+    padding: 0;
+}
+tr.testfailed {
+    font-size: 2px;
+    background: #fdd;
+    padding: 0;
+}
+
+.toolbar  {
+    margin: 0;
+    border-collapse: collapse;
+}
+
+.toolbar td  {
+    border: 1px solid #ccc;
+    padding: 2px;
+    color: #ccc;
+}
+
+td.noformatting {
+    border-width: 0;
+    border-style: none;
+    text-align: center;
+    padding: 0;
+}
+
+/*
+ * Divs displaying the license information, if necessary.
+ */
+.license {
+    border-top: 1px solid #bbb;
+    text-align: center;
+    font-size: 10pt;
+    background-color: #ffffe0;
+}
+
+.license-eval, .license-none {
+    background-color: #fcc;
+}
+
+.license-eval b, .license-none b {
+    color: #900;
+}
+
+/*
+ * The shadow at the bottom of the page between the main content and the
+ * "powered by" section.
+ */
+.bottomshadow {
+    height: 12px;
+    background-image: url("../../../images/border/border_bottom.gif");
+    background-repeat: repeat-x;
+}
+
+/*
+ * Styling of the operations box
+ */
+.navmenu .operations li, .navmenu .operations ul {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.navmenu .operations ul {
+    margin-bottom: 9px;
+}
+
+.navmenu .label {
+    font-weight: inherit;
+}
+
+/*
+ * Styling of ops as a toolbar
+ */
+.toolbar div {
+    display: none;
+}
+
+.toolbar .label {
+    display: none;
+}
+
+.toolbar .operations {
+    display: block;
+}
+
+.toolbar .operations ul {
+    display: inline;
+    list-style: none;
+    margin-left: 10px;
+    padding-left: 0;
+}
+
+.toolbar .operations li {
+    list-style: none;
+    display: inline;
+}
+
+.bold {
+    font-weight: bold;
+}
+
+
+/* space action links */
+.tabnav .spaceActionLinks {
+    float: right;
+    margin: 0;
+    display: block;
+}
+
+.tabnav .spaceActionLinks a span {
+    text-decoration: underline;
+}
+.tabnav .spaceActionLinks a.current {
+    color: black;
+}
+.tabnav .spaceActionLinks a.current span {
+    text-decoration: none;
+}
+
+.tabnav .spaceActionLinks a.current:link {
+    color: black;
+}
+
+.tabnav .spaceActionLinks a.current:visited {
+    color: black;
+}
+
+/* non tabs */
+.tabnav .nontabs {
+    padding: 0;
+    margin: 5px 0 0 3px;
+    display: block;
+    float: left;
+}
+
+/* editor tab customizations of the tabnav */
+#markupTab, #wysiwygTab, #previewTab {
+    font-size: 9pt;
+    padding: 3px 5px 2px; /* tab padding */
+    margin: 8px 0 0 3px; /* margin-top is used to 'push' the tab down to fill in any gaps */
+    font-weight: normal;
+}
+
+/* alphabet list */
+#squaretab {
+    margin-left: 0;
+    padding-left: 0;
+    white-space: nowrap;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 8pt;
+    line-height: 11pt
+}
+
+#squaretab li {
+    display: inline;
+    list-style-type: none;
+}
+
+#squaretab a {
+    padding: 5px 7px 3px 7px;
+    border-width: 1px;
+    border-style: solid;
+}
+
+#squaretab a:link,
+#squaretab a:visited {
+    color: #fff;
+    text-decoration: none;
+}
+
+#squaretab a:hover {
+    text-decoration: none;
+}
+
+#current {
+    background: #fff;
+    color: #000;
+}
+
+.blogcalendar th,
+.blogcalendar td  {
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+}
+
+table.blogcalendar {
+    border-width: 1px;
+    border-style: solid;
+}
+
+.blogcalendar th.calendarhead,
+a.calendarhead {
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    letter-spacing: 0.3em;
+    text-transform: uppercase;
+}
+
+.blogcalendar th.calendarhead,
+.calendarhead,
+.calendarhead:link,
+.calendarhead:visited,
+.calendarhead:active,
+.calendarhead:hover {
+    color: #fff;
+}
+
+.blogcalendar th {
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    background-color: #f0f0f0;
+}
+
+.blogcalendar td {
+    font-size: x-small;
+    font-weight: normal;
+}
+
+.sidebar-section #bloglist{
+    margin-top: 5px;
+    display: inline;
+}
+
+
+#bloglist{
+    background-color: #f0f0f0;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    width: 22em;
+    padding-top: 0.1em;
+}
+
+.blogmonthnavigation{
+    border:1px solid #CCCCCC;
+    position:relative;
+    text-decoration:none;
+    display: inline-block;
+    width: 10em;
+    font-size: 0.85em;
+    text-align:center;
+    margin: 0 0.3em 1em 1.1em;
+    padding: 0.2em 0.4em;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+div.pagination .blogmonthnavigation{
+    margin: 0 0.5em 0 0;
+    width: 5em;
+    font-size: 1em;
+}
+
+#blog-sidebar .bloglistmultiple{
+    position: absolute;
+}
+
+.bloglistitems li .icon-container {
+    display:block;
+    float:none;
+    padding-left:1.75em;
+}
+
+.bloglistmultiple .bloglistheading h2{
+    padding-top: 0;
+}
+
+.bloglistitems{
+    list-style-type: none;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+.bloglistitems li{
+    padding-bottom: 7px;
+    word-wrap: break-word;
+}
+
+.bloglistitems li img{
+    padding-right: 0.5em;
+    vertical-align: middle;
+}
+
+
+.bloglistheading h2{
+    text-align: left;
+    margin: 1em;
+    color: #333333;
+}
+
+.bloglistheading h2 a{
+    text-decoration: none;
+    color: #333333;
+}
+
+.has-personal-sidebar .bloglistheading h2 a,
+.has-personal-sidebar .bloglistheading h2
+{
+    margin-left: -0.1em;
+    margin-right: -0.1em;
+    padding: 0.1em 0.1em 0.2em;
+}
+
+.has-personal-sidebar .bloglistitems
+{
+    margin-left: -0.9em;
+}
+
+.has-personal-sidebar .blogmonthnavigation
+{
+    margin-left: 0;
+    margin-right: 1em;
+
+}
+
+#bloglist .control {
+    position: absolute;
+    top: 8px;
+}
+#bloglist .control.prev {
+    left: 13px;
+}
+
+#bloglist .control.next {
+    right: 13px;
+}
+
+.searchGroup {
+    padding: 0 0 10px 0;
+    background: #f0f0f0;
+}
+
+.searchGroupHeading {
+    font-size: 10px;
+    font-weight: bold;
+    color: #fff;
+    padding: 2px 4px 1px 4px;
+}
+
+.searchItem {
+    padding: 1px 4px;
+}
+
+.searchItemSelected {
+    padding: 1px 4px;
+    font-weight: bold;
+    background: #ddd;
+}
+
+/* permissions page styles */
+.permissionHeading {
+    border-bottom: #bbb;
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    font-size: 16px;
+    text-align: left;
+}
+
+.permissionTab,
+.permissionSuperTab,
+.permissionCell {
+    border-width: 0 0 0 1px;
+    border-style: solid;
+}
+
+.permissionTab {
+    font-size: 10px;
+}
+
+.permissionCell {
+    border-left: #bbb;
+    white-space: nowrap;
+}
+
+/* side menu highlighting (e.g. space content screen) */
+.optionPadded {
+    padding: 2px;
+}
+
+.optionSelected, .optionPadded.selected {
+    background-color: #ffc;
+    padding: 2px;
+    border: 1px solid #ddd;
+    margin: -1px;
+}
+
+.optionSelected a, .optionPadded.selected a {
+    font-weight: bold;
+    text-decoration: none;
+    color: black;
+}
+
+/* styles for extended operations */
+.greyLinks a:link,
+.greyLinks a:visited,
+.greyLinks a:active,
+.greyLinks a:hover {
+    color: #666;
+    text-decoration: underline;
+}
+
+.greyLinks {
+    color: #666;
+    padding: 10px;
+}
+
+.operation-links {
+    color: #666;
+    margin-bottom: 10px;
+}
+.operation-links a:link,
+.operation-links a:visited,
+.operation-links a:active,
+.operation-links a:hover {
+    color: #666;
+    text-decoration: underline;
+}
+
+.separatorLinks a:link,
+.separatorLinks a:visited,
+.separatorLinks a:active {
+    color: white;
+}
+
+.greynavbar {
+    background-color: #f0f0f0;
+    border-top-width: 1px;
+    border-top-style: solid;
+}
+
+div.headerField {
+    float: left;
+    width: auto;
+    height: 100%;
+}
+
+.headerFloat {
+    margin-left: auto;
+    width: 50%;
+}
+
+.headerFloatLeft {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 10px;
+}
+
+#headerRow {
+    padding: 10px;
+}
+
+.greyFormBox {
+    border: 1px solid #ccc;
+    padding: 5px;
+}
+
+.openPageHighlight {
+    background-color: #ffc;
+    padding: 2px;
+    border: 1px solid #ddd;
+}
+
+.editPageInsertLinks, .editPageInsertLinks a {
+    color: #666;
+    font-weight: bold;
+    font-size: 10px;
+}
+
+/* Style for label heatmap. */
+.top10 a {
+    font-weight: bold;
+    font-size: 2em;
+    color: #036;
+}
+.top25 a {
+    font-weight: bold;
+    font-size: 1.6em;
+    color: #036;
+}
+.top50 a {
+    font-size: 1.4em;
+    color: #036;
+}
+.top100 a {
+    font-size: 1.2em;
+    color: #036;
+}
+
+.heatmap {
+    list-style: none;
+    width: 95%;
+    margin: 0 auto;
+}
+
+.heatmap a {
+    text-decoration: none;
+}
+
+.heatmap a:hover {
+    text-decoration: underline;
+}
+
+.heatmap li {
+    display: inline;
+}
+
+.minitab {
+    padding: 5px;
+    margin: 1px 0 0 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    text-decoration: none;
+    float: none;
+}
+
+.minitab a {
+    padding: 5px 5px;
+    margin-left: 3px;
+    margin-top: 1px;
+    border-top: 1px solid;
+    border-right: 1px solid;
+    border-left: 1px solid;
+}
+
+#makeRichTextDefault, #makeMarkupDefault {
+    border: 0;
+    font-weight: normal;
+    text-decoration: none;
+    display: block;
+    height: 2.5em;
+}
+
+.minitab .selected {
+    background: white;
+    border-bottom: 1px solid white;
+    color: #000;
+    text-decoration: none;
+}
+.minitab .unselected {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    color: #fff;
+    text-decoration: none;
+}
+
+.minitab a.unselected:link,
+.minitab a.unselected:visited {
+    color: white;
+}
+.minitab a.selected:link,
+.minitab a.selected:visited {
+    color: black;
+}
+
+.minitabFont {
+    font-size: 9pt;
+    line-height: 9pt;
+}
+
+.linkerror {
+    background-color: #fcc;
+}
+
+a.labelOperationLink:link,
+a.labelOperationLink:active,
+a.labelOperationLink:visited,
+a.labelOperationLink:hover {
+    text-decoration: underline;
+}
+
+a.newLabel:link,
+a.newLabel:active,
+a.newLabel:visited,
+a.newLabel:hover {
+    background-color: #dfd;
+}
+
+ul.square {
+    list-style-type: square;
+}
+
+/* Label auto complete styles needed until we use requireResource properly in labels-include.vm */
+div.auto_complete {
+    width: 350px;
+    background: #fff;
+}
+div.auto_complete ul {
+    border: 1px solid #888;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style-type: none;
+}
+div.auto_complete ul li {
+    margin: 0;
+    padding: 3px;
+}
+div.auto_complete ul li.selected {
+    background-color: #ffb;
+}
+div.auto_complete ul strong.highlight {
+    color: #800;
+    margin: 0;
+    padding: 0;
+}
+
+/******* Edit Page Styles *******/
+.toggleFormDiv{
+    border: 1px solid #a7a6aa;
+    background-color: white;
+    margin-top: 5px;
+}
+
+.toogleInfoDiv{
+    border: 1px solid #a7a6aa;
+    background-color: white;
+    display: none;
+    padding: 5px;
+    margin-top: 10px;
+}
+
+.inputSection{
+    margin-bottom: 20px;
+}
+
+#anonymous-warning {
+    padding: 15px 10px;
+}
+
+#editBox{
+   border: 1px solid #d3d3d3;
+   background-color: #f0f0f0;
+}
+
+.tab-navigation .current a {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff;
+}
+
+.replaced {
+    background-color: #3c6;
+}
+
+.topPadding {
+    margin-top: 20px;
+}
+
+/* new form style */
+.form-block {
+    padding: 6px;
+}
+.form-error-block {
+    background: #fcc;
+    border-top: #f0f0f0 1px solid;
+    border-bottom: #f0f0f0 1px solid;
+    margin-bottom: 6px;
+    padding: 0 12px;
+}
+.form-element-large {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.form-element-small {
+    font-size: 12px;
+    font-weight: bold;
+}
+
+.form-header {
+    background: #ffffe0;
+    border-top: #f0f0f0 1px solid;
+    border-bottom: #f0f0f0 1px solid;
+    margin-bottom: 6px;
+    padding: 12px;
+}
+.form-header p, .form-block p, .form-error-block p {
+    line-height: normal;
+    margin: 12px 0;
+}
+.form-example {
+    color: #888;
+    font-size: 11px;
+}
+.form-divider {
+    border-bottom: #ccc 1px solid;
+    margin-bottom: 6px;
+}
+.confluence-button,
+a.confluence-button,
+a.confluence-button:link,
+a.confluence-button:hover,
+a.confluence-button:visited {
+    text-decoration: none;
+    border: 1px solid #aaa;
+    color: #000;
+    padding: 5px 10px;
+    cursor: default;
+    background: #fff url(../../../images/decoration/buttons-bg-white.png) repeat-x 0 100%;
+    -moz-border-radius: 5px; /* Firefox */
+    -webkit-border-radius: 5px; /* Safari */
+}
+
+.confluence-button:active,
+a.confluence-button:active {
+    border-color: #69c;
+    background-color: #eee;
+    background-image: url(../../../images/decoration/buttons-bg.png);
+}
+
+.form-block .error {
+    padding: 6px;
+    margin-bottom: 6px;
+}
+
+form.edit-trust-app fieldset {
+    border: none;
+}
+form.edit-trust-app fieldset div {
+    border: none;
+    border-left: solid 11em #f0f0f0;
+    padding: 0;
+    float: left;
+}
+form.edit-trust-app fieldset label {
+    float: left;
+    width: 10em;
+    padding: 0;
+    margin: 5px 1em 0 -10.5em;
+    text-align: right;
+    clear: left;
+}
+form.edit-trust-app fieldset input,
+form.edit-trust-app fieldset textarea {
+     margin: 5px 0 0 0;
+     float: left;
+}
+form.edit-trust-app fieldset div.buttons {
+     border: none;
+     clear: left;
+     text-align: center;
+     float: none;
+}
+form.edit-trust-app fieldset div.buttons input {
+     float: none;
+}
+
+.status-red {
+    color: #800;
+    font-weight: bold;
+}
+.status-green {
+    color: #080;
+    font-weight: bold;
+}
+
+.person {
+    background-color: white;
+    width: 200px;
+    float: left;
+}
+.person td {
+    white-space: nowrap;
+}
+
+#blogcalendar span.fwdArrow {
+    float: right;
+    display: block;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-image: url(/images/icons/forwd_16.gif);
+}
+#blogcalendar span.fwdArrow span {
+    display: none;
+}
+#blogcalendar span.backArrow {
+    float: left;
+    display: block;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-image: url(/images/icons/back_16.gif);
+}
+#blogcalendar span.backArrow span {
+    display: none;
+}
+.pageInfoTable {
+    padding: 0;
+    margin: 0;
+    border: 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+.pageInfoTable td {
+    padding: 3px;
+}
+.pageInfoTable tr.alternateRow {
+    background: #f0f0f0;
+}
+.pageInfoLayoutTable {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.pageInfoLayoutTable td {
+    padding: 5px 16px 5px 0;
+}
+
+.pageInfoLayoutTable .tableview td {
+    padding-left: 0;
+}
+
+.pageInfoLayoutTable ul {
+    padding-left: 20px;
+    list-style-type: none;
+}
+
+.memoryusagebar {
+    width: 100%;
+}
+.memoryusagebar td {
+    border: none !important;
+    vertical-align: middle !important;
+}
+
+input.alignedCheckbox {
+    margin: 0;
+}
+
+div.spacer {
+    clear: both;
+}
+
+span.left {
+    float: left;
+    text-align: left;
+}
+
+span.right {
+    float: right;
+    text-align: right;
+}
+
+.nobr {
+    white-space: nowrap;
+}
+
+label.normal {
+    font-weight: normal;
+    color: black
+}
+
+div.leftFloatMargined {
+    float: left;
+    margin-right: 2px
+}
+
+#entitySearchResults {
+    border-collapse: collapse;
+    background-color: #fafafa;
+    text-align: left;
+    width: 100%;
+}
+
+#entitySearchResults td {
+    border-top: 1px solid #ccc;
+    padding: 3px;
+    background-color: white;
+    vertical-align: top;
+}
+
+#entitySearchResults th {
+    color: #666;
+    padding: 3px;
+    white-space:nowrap;
+}
+
+#entitySearchResults .firstColumn {
+    width: 2%;
+    text-align: right;
+}
+
+#entitySearchResults .secondColumn {
+    width: 1px;
+    text-align: right;
+}
+
+a.paddedGreyDisabled {
+    background-color: #f0f0f0;
+    padding: 4px;
+    text-decoration: none;
+    color: #666;
+}
+
+a.grey {
+    color: #666;
+}
+
+div.topBottomMargin {
+    margin: 10px 0 10px 0
+}
+
+div.bottomMargin {
+    margin-bottom: 10px
+}
+
+table.spaceList {
+    border-collapse: collapse;
+}
+
+tr.spaceList td {
+    padding: 5px 0 5px 5px;
+    border-bottom: 1px solid #eee;
+    vertical-align: top;
+}
+
+.spaceList .spaceDescription {
+    margin-top: 3px;
+    color: #666;
+}
+
+tr.spaceList .operations {
+    vertical-align: top;
+    padding-right: 5px;
+}
+
+.fontSizeBigger {
+    font-size: 11pt;
+    line-height: 14pt;
+}
+
+.fontSizeDefault {
+    line-height: 1.3em;
+}
+
+.fontSizeSmaller {
+    font-size: 10pt;
+    line-height: 13pt;
+}
+
+/* deprecated. TODO - check for use in themes and remove. */
+.fontSizeTiny {
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 8pt;
+    line-height: 11pt;
+}
+
+table.dashboard td.left {
+    padding-right: 16px;
+}
+
+/* dashboard action buttons */
+.dashboard .dashboard-action-button {
+    overflow: auto;
+    padding: 10px 0 20px 0;
+}
+.dashboard .dashboard-action-button span {
+    clear: both;
+    display: block;
+    margin: 0 0 10px 0;
+}
+.dashboard .dashboard-action-button span a,
+.dashboard .dashboard-action-button span a:focus,
+.dashboard .dashboard-action-button span a:hover {
+    color: #003366;
+    float: left;
+    padding: 0 10px 0 9px;
+    font-weight: bold;
+}
+/* pull the icons out so the link underline doesn't extend under them */
+.dashboard .dashboard-action-button span.icon {
+    float: left;
+    left: -5px;
+    position:relative;
+}
+/* end dashboard action buttons */
+
+#view-attachments .dashboard-action-spacing{
+    padding-top: 6px;
+    padding-bottom: 3px;
+}
+
+#view-attachments a.dashboard-action{
+    color: #000;
+}
+
+.dashboard .dashboard-action:hover, #view-attachments .dashboard-action:hover {
+    color: #4F85BC;
+    background-position: 100% 0;
+}
+
+.clearBoth {
+    clear: both;
+}
+
+#labelInputSpan {
+    margin-top: 1px;
+}
+
+form#quickSearch {
+    margin: 2px;
+    padding: 0;
+}
+
+form#quickSearch input {
+    font-size: 10pt;
+    vertical-align: middle;
+}
+
+table.fullWidthBorderless
+{
+    width: 100%;
+    border: 0;
+    border-collapse: collapse;
+}
+
+/* Hacks for YUI menustuff */
+
+#pageMenusMenuBar {
+   padding: 4px;
+}
+
+#notificationFormat {
+    padding: 0;
+    margin: -9px 15px;
+}
+
+#notificationFormat h4 {
+    font-weight: normal;
+}
+
+#notificationFormat h2 {
+    font-weight: normal;
+}
+
+#rssFormat {
+    padding: 0;
+    margin: 6px 15px;
+}
+
+.notificationGreySide {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 0 0 5px 0;
+    padding: 3px 17px;
+}
+
+.notificationDigest {
+    padding: 0 17px;
+}
+
+.darkBlue {
+    color: #036;
+}
+
+.grey {
+    color: #666;
+}
+
+table.attachments {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+table.attachments th {
+    white-space: nowrap;
+    width: 1%;
+}
+
+table.attachments td {
+    white-space: nowrap;
+    vertical-align: top;
+    width: 1%;
+}
+
+table.attachments td.comment, table.attachments th.comment, table.attachments td.attachedto, table.attachments th.attachedto {
+    white-space: normal;
+    width: auto;
+}
+
+#contentOptions {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#exportContentTree {
+    list-style-type: none;
+    margin: 5px 0;
+}
+
+#contentOptionAllNote {
+    color: #666;
+    font-weight: normal;
+}
+
+/* hidden: use when we want the content totally unavailable. */
+.hidden,
+li.hidden {
+    display: none !important;
+    visibility: hidden;
+}
+
+/* assistive: use when the hidden content should remain available to screen readers */
+.assistive, legend.assistive span {
+    position: absolute;
+    left: -20000px;
+    width: 4000px;
+    overflow: hidden;
+    top: 0;
+    height: 0;
+}
+
+/* Needed for IE to stop the menu being expanded to 4000px */
+.ajs-menu-bar .ajs-menu-item .assistive {
+    position: absolute;
+    left: -20000px;
+    width: 4000px;
+    display: block;
+    visibility: visible;
+}
+
+.ajs-menu-bar .ajs-menu-item .most-right-menu-item.assistive {
+    left: auto;
+    right: 20000px;
+}
+
+#main {
+    text-align: left;
+    background-color: #fff;
+}
+#header {
+    min-height: 1.8em;
+    line-height: 1.8;
+    margin: 0;
+    padding: 0;
+    position: relative;
+    z-index: 1;
+}
+.quick-search {
+    margin: 0;
+    padding: 0;
+}
+#quick-search fieldset {
+    float: right;
+}
+.quick-search fieldset {
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+.quick-search legend {
+    display: none;
+}
+input.blank-search,
+input.placeholded,
+.quick-search .placeholded {
+    color: #666;
+}
+#quick-search-query {
+    width: 13em;
+}
+/* default user navigation styles for themes using the old markup */
+#user-control-panel, #page-view-panel, #page-prefs-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#user-control-panel li,
+#page-view-panel li,
+#page-prefs-list li,
+.userNavBar li { /* deprecated styles provided for themes written prior to 2.8 */
+    list-style: none;
+    display: inline;
+    color: #666;
+    font-size: 0.95em;
+    padding: 0 0 0 0.3em;
+}
+#user-control-panel a {
+    color: #666;
+}
+#user-control-panel li.first {
+    border:medium none;
+}
+#user-control-panel li {
+    border-left: 1px solid #666;
+    padding-left: 0.5em;
+}
+#page-view-panel li {
+    float: right;
+}
+
+#breadcrumbs {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    overflow: auto;
+}
+
+#breadcrumbs li {
+    white-space: nowrap;
+    display: inline;
+    float: left;
+    margin: 0 .2em 0 0;
+    padding-left: 15px;
+    background: url(../../../images/decoration/white_breadcrumbs_indicator.png);
+    background-repeat: no-repeat;
+    background-position: 3px center;
+}
+
+#breadcrumbs li.first {
+    padding-left: 0;
+    background-image: none;
+}
+
+#breadcrumbs li a {
+    text-decoration: none;
+}
+
+#breadcrumbs li a:hover {
+    text-decoration: underline;
+}
+
+#breadcrumbs li span {
+    display: block;
+}
+
+#ellipsis strong {
+    cursor: pointer;
+    font-weight: normal;
+}
+
+#breadcrumbs li.hidden-crumb {
+    display: none;
+}
+
+a.twisty-open, a.twisty-closed {
+    background: no-repeat 50% 50%;
+    float: left;
+    margin-right: 0.5em;
+}
+a.twisty-open {
+    background-image: url(../../../images/icons/arrow_down.gif);
+}
+a.twisty-closed {
+    background-image: url(../../../images/icons/arrow_right.gif);
+}
+
+a.print {
+    background: url(../../../images/icons/print_16.gif) no-repeat 50% 50%;
+}
+a.feed {
+    background: url(../../../images/icons/feed-icon-16x16.png) no-repeat 50% 50%;
+}
+a.pdf {
+    background: url(../../../images/icons/attachments/pdf.gif) no-repeat 50% 50%;
+}
+a.help {
+    background: url(../../../images/icons/help_16.gif) no-repeat 50% 50%;
+}
+a.add-user {
+    background: url(../../../images/icons/classic/16/125.png) no-repeat 50% 50%;
+}
+
+a.remove-user {
+    background: url(../../../images/icons/classic/16/123.png) no-repeat 50% 50%;
+}
+
+a.groups {
+    background: url(../../../images/icons/classic/16/127.png) no-repeat 50% 50%;
+}
+
+a.cancel {
+    background: url(../../../images/icons/emoticons/error.gif) no-repeat 50% 50%;
+}
+
+a.search-icon {
+    background: url(../../../images/icons/srch_16.gif) no-repeat 50% 50%;
+}
+
+a img {
+    border: none;
+}
+
+a.texticon {
+    min-height: 16px;
+    text-align: left;
+    padding:0 10px 0 20px;
+    background-position: 0 50%;
+    outline:0 none;
+}
+
+
+/* // Links **/
+#com-atlassian-confluence h1 {
+    line-height: 2;
+    margin: 0 0 10px 0;
+    padding: 0;
+    width: 100%;
+}
+#com-atlassian-confluence h1 img {
+    float: left;
+    margin: 0 .3em 0 0;
+}
+br.clear {
+    clear: both;
+    height: 1px;
+    overflow: hidden;
+}
+#footer, #footer-warning {
+    background: #f0f0f0;
+    text-align: center;
+}
+#footer p.license, #footer p.license a {
+    background: #036;
+    color: #fff;
+    margin: 0;
+}
+#poweredby {
+    border-top: 1px solid #bbb;
+    color: #666;
+    margin: 0;
+    padding: .5em;
+    list-style: none;
+}
+#poweredby a, #footer-warning {
+    color: #666;
+    text-decoration: none;
+}
+#poweredby li {
+    display: inline;
+}
+#poweredby li.print-only {
+    display: none;
+}
+
+#poweredby a:hover.hover-footer-link{
+    text-decoration: underline;
+}
+
+#footer p.warning {
+    margin: 0 40px 10px 40px;
+    text-align: center;
+}
+
+#menu-bar, #navigation .space-browse-links {
+    float: right;
+}
+#navigation .space-browse-links ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#menu-bar {
+    margin: 0 .5em;
+}
+table {
+    clear: left;
+}
+.space-browse-links a:link,
+.space-browse-links a:active,
+.space-browse-links a:visited {
+    border: 1px solid #69c;
+    color: #000;
+    display: block;
+    font-weight: bold;
+    line-height: 2;
+    margin: 0.35em 0 -1px 0.5em;
+    padding: 0 0.5em 0 24px;
+    position: relative;
+    text-decoration: none;
+}
+.space-browse-links a:hover {
+    background-color: #036;
+    border: 1px solid #036;
+    color: #fff;
+}
+.space-browse-links a img {
+    float: left;
+    left: 4px;
+    margin: -8px 0 0;
+    position: absolute;
+    top: 50%;
+}
+#tree-div {
+    min-height:300px;
+}
+.mailLabel {
+    color: #666;
+    font-weight: bold;
+}
+
+.unparented {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.parented {
+    list-style-image: url(../../../images/icons/link_out_bot.gif);
+}
+
+.mailthread ul {
+    list-style-image: url(../../../images/icons/link_out_bot.gif);
+}
+.selectedMail {
+  background-color: #ffc;
+  padding: 2px;
+  border: 1px solid #ddd;
+}
+
+.excerpt {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.captcha {
+    padding: 10px;
+}
+
+.captcha-image {
+    width: 200px;
+    height: 100px;
+}
+
+#version-info {
+    margin-bottom: 10px;
+    padding:15px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+.version-info span.page-history-view{
+    display: block;
+    padding-bottom: 5px;
+    padding-top: 5px;
+    margin-left: 24px;
+}
+
+.version-info span.page-history-view, .version-info span.page-history-view a {
+    color: #666666;
+    font-size: 9pt;
+
+}
+
+.version-info a.version-navigation{
+    border:1px solid #EEEEEE;
+    padding:0.2em 0.4em;
+    position:relative;
+    text-decoration:none;
+    top:1px;
+    display: inline-block;
+    min-width: 75px;
+    text-align:center;
+}
+
+.version-info span.current-version-margin{
+    margin: 15px;
+}
+
+.version-info div.navigation-spacing{
+    margin-left: 24px;
+    padding-top: 2px;
+    font-size: 8pt;
+
+}
+
+.version-info strong.version-info-description{
+    margin-left: 4px;
+}
+
+.has-sidebar #version-info{
+    margin-right: 17em;
+}
+
+.has-blog-sidebar #version-info{
+    margin-right: 24em;
+}
+
+/* Fix menu focus when selecting with mouse in Firefox */
+li:active, a:active {
+  outline: none;
+}
+
+/* Confluence global/space message styles */
+#messageContainer {
+    background: #fff;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#messageContainer li {
+    padding: 5px;
+    display: none;
+}
+
+.message-close-button {
+    height: 16px;
+    width: 16px;
+    border: none;
+    float: right;
+    cursor: pointer;
+}
+
+.page-metadata ul {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+}
+
+.page-metadata ul li {
+    list-style: none;
+    float: left;
+    padding: 0 5px 0 0;
+    margin: 0;
+}
+
+.page-metadata ul a.page-metadata-icon {
+    text-decoration: none;
+}
+
+.page-metadata ul a.page-restrictions span,
+.page-metadata ul a.page-tinyurl span,
+.page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    float: left;
+    height: 16px;
+    width: 16px;
+    text-indent: -9999em;
+}
+
+.page-metadata ul a.page-restrictions span {
+    background: url(../../../images/icons/lock_16_grey.png) no-repeat;
+}
+
+.page-metadata ul a.page-tinyurl span {
+    background: url(../../../images/icons/permalink_light_16.png) no-repeat;
+}
+
+.page-metadata ul a.page-tinyurl:hover span {
+    background: url(../../../images/icons/permalink_dark_16.png) no-repeat;
+}
+
+.page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    background: url(../../../images/icons/attach_16.png) no-repeat;
+}
+
+.on-label, .yes-label {
+    color: #090;
+    font-weight: 800;
+}
+
+.off-label, .no-label {
+    color: #900;
+    font-weight: 800;
+}
+
+.progress-fill-color {
+    background: #00df00;
+}
+
+.progress-background-color {
+    background: #fff;
+}
+
+.vertical-center-aligning-container {
+    display: table;
+    height: 400px;
+    /* position : relative; */
+    overflow: hidden;
+}
+
+.vertical-center-div-outer {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.vertical-center-div-inner {
+    text-align: center;
+}
+
+.in-progress {
+    background-color: #ccc;
+}
+
+h2.subheading,
+#profile-main h2.subheading {
+    border-bottom: 1px solid #ddd;
+    color: #333;
+    font-weight: normal;
+    font-size: 1.1em;
+    margin: 0;
+}
+
+.subheading {
+    color: #222;
+}
+
+/*Columns*/
+div.section.one {
+    float: left;
+    width: 40%;
+}
+div.section.two {
+    float: left;
+    width: 60%;
+}
+div.section.two .section {
+    margin-left: 10px;
+}
+
+.subheading .rss-icon {
+    background: url(../../../images/icons/feed-icon-16x16.png);
+    float: right;
+    height: 16px;
+    text-decoration: none;
+    width: 16px;
+    line-height: 0;
+}
+
+.subheading .email-notification-icon {
+    background: url(../../../images/icons/watch_on_16.png);
+    float: right;
+    height: 16px;
+    text-decoration: none;
+    width: 16px;
+    line-height: 0;
+    margin-right: 5px;
+}
+/* End Confluence master stylesheet */
+
+/** Font Colours */
+em.bad,
+strong.bad {
+    font-style: normal;
+    color: #900;
+}
+em.good,
+strong.good {
+    font-style: normal;
+    color: #090;
+}
+em.disabled,
+strong.disabled {
+    font-style: normal;
+    color: #999;
+}
+/* **/
+
+.blogpost .wiki-content {
+    _height: 1%;
+}
+
+#version-comment.noteMacro {
+    padding: 5px;
+
+}
+
+#space-admin-body {
+    padding: 0 10px;
+}
+
+#ajax-error {
+    background-color: #fcc;
+    border: 1px solid #741311;
+}
+
+#ajax-error span.error{
+    display: block;
+    text-align: center;
+    color: #741311;
+    line-height: 2;
+}
+
+#ajax-error span.error a.close{
+    margin-left: 10px;
+    text-decoration: underline;
+}
+
+#poweredby {
+    background-image: url(../../../images/decoration/footer-shadow.gif);
+    background-repeat: repeat-x;
+}
+
+#footer-warning {
+    display: block;
+    background-color: #ffffce;
+    border-top: 1px solid #f0c000;
+    border-bottom: 1px solid #f0c000;
+    color: #000;
+    padding: 2px 5px;
+}
+
+.welcome-message-heading{
+    font-size: 14pt;
+    color: #3C78B5;
+    font-weight: normal;
+    font: Arial FreeSans Helvetica sans-serif;
+    padding: 3px 0 2px 0;
+    margin: 1em 4px 0 0;
+    border-bottom: 1px solid #ccc;
+}
+.wiki-content,
+.wiki-content p,
+.wiki-content table,
+.wiki-content tr,
+.wiki-content td,
+.wiki-content th,
+.wiki-content ol,
+.wiki-content ul,
+.wiki-content li {
+    font-size: 10pt;
+    line-height: 13pt;
+}
+
+.wiki-content p {
+    margin: 10px 0;
+    padding: 0;
+}
+
+.wiki-content li,
+.wiki-content ul p,
+.wiki-content ol p {
+    margin: 0;
+    padding: 0;
+}
+
+.wiki-content ul {
+    list-style-type: disc;
+}
+
+.wiki-content ol,
+.wiki-content ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: decimal;
+}
+
+.wiki-content ol ol,
+.wiki-content ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: lower-alpha;
+}
+
+.wiki-content ol ol ol,
+.wiki-content ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: lower-roman;
+}
+
+/*Needs the id selector because of the
+'#com-atlassian-confluence h1' entry in master.css*/
+#com-atlassian-confluence .wiki-content h1,
+.wiki-content h1,
+.wiki-content h2,
+.wiki-content h3,
+.wiki-content h4,
+.wiki-content h5,
+.wiki-content h6 {
+    font-weight: bold;
+    line-height: normal;
+    padding: 0;
+}
+
+
+#com-atlassian-confluence .wiki-content h1,
+.wiki-content h1
+{
+    font-size: 21pt;
+    margin-top: 38px;
+}
+
+.wiki-content h2 {
+    font-size: 18pt;
+    margin-top: 32px;
+}
+
+.wiki-content h3 {
+    font-size: 15pt;
+    margin-top: 28px;
+}
+
+.wiki-content h4 {
+    font-size: 13pt;
+    margin-top: 25px;
+}
+
+.wiki-content h5 {
+    font-size: 11pt;
+    margin-top: 22px;
+}
+
+.wiki-content h6 {
+    font-size: 10pt;
+    margin-top: 22px;
+}
+
+.wiki-content .confluenceTable, .grid {
+/*
+    margin-left: 0;
+    margin-right: 0;
+    margin-top: 10px;
+    margin-bottom: 10px;
+*/
+    padding: 0;
+    margin: 5px 0;
+}
+
+.wiki-content td.confluenceTd,
+.wiki-content th.confluenceTh {
+    padding: 5px 7px;
+}
+.wiki-content-preview {
+    padding: 5px;
+    border-left: 1px solid;
+    border-right: 1px solid;
+}
+
+.wiki-content .preformattedContent,
+.wiki-content .codeContent{
+    padding: 12px 10px;
+}
+
+.wiki-content .preformattedContent pre,
+.wiki-content .codeContent pre{
+    margin:0;
+    /** matches renderer-macros.css: .preformatted pre */
+    font-family:"Courier New",Courier,monospace;
+    line-height:1.3;
+}
+
+/* Styles for TinyMCE editor content */
+
+.mceContentBody {
+    border: none;
+    padding: 10px;
+    text-align: left;
+    background: #fff;
+}
+
+/* IE makes paragraphs in tables, so remove the default margin */
+.mceContentBody .confluenceTable p {
+    margin: 0;
+}
+
+/* Firefox puts resizing controls on tables. They don't line up with tables unless they have margin 1px.
+(0 breaks the border) */
+body.mceContentBody table.confluenceTable {
+    margin: 1px;
+}
+
+.mceContentBody .wysiwyg-macro-body-preformat {
+    border: #ccc solid 1px; /* stick to neutral colour, or move to colors-css.vm if required */
+    /* horizontal margin matches .panel */
+    margin: 5px 20px;
+}
+
+/* Styles for macros */
+.mceContentBody .wysiwyg-macro-inline {
+    display: inline;
+}
+.mceContentBody .user-new-line,
+.mceContentBody .wysiwyg-macro-body-newline {
+    display: none;
+    line-height: 0;
+}
+
+/* Styles for the RTE Autocomplete component */
+#autocomplete {
+    background-color: #eee;
+    border: solid 1px #ddd;
+}
+#autocomplete-trigger{
+    background-color: #ddd;
+    padding: 0 2px;
+}
+#autocomplete-search-text {
+    padding: 0 4px 0 2px;
+}
+#tab-navigation {
+    border-bottom: 1px solid;
+    margin: 0 -10px;
+    margin-bottom: 10px;
+    padding: 0 10px;
+}
+
+.tab-navigation {
+    list-style: none;
+    display: block;
+    margin: 0 0 -1px;
+    padding: 0;
+    overflow: hidden;
+}
+.tab-navigation .tab {
+    float: left;
+    display: inline;
+    font-weight: bold;
+    margin: 0 5px -1px 0;
+}
+.tab-navigation .tab a {
+    padding: .3em .4em;
+    text-decoration: none;
+    display: block;
+    -moz-border-radius-topleft: 3px;
+    -moz-border-radius-topright: 3px;
+    -webkit-border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+}
+.tab-navigation .notab {
+    margin: 1px 1px 0 1px;
+    padding: .3em;
+    float: left;
+}
+
+/* Make the following more specific, so they aren't overriden by themes. */
+ul.tab-navigation .current a {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff; /* IE */
+}
+ul.tab-navigation .current a:hover {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff; /* IE */
+}
+
+/*
+ * Drop down menu stylesheet
+ */
+
+/* Menu bar layout */
+.ajs-menu-bar {
+    float: right;
+    line-height: 1.5;
+    position: relative;
+}
+.ajs-menu-bar,
+.ajs-menu-bar .ajs-button,
+.ajs-menu-bar .ajs-button a,
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title span,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title span span,
+.ajs-menu-bar .ajs-drop-down a,
+.ajs-menu-bar .ajs-drop-down a span,
+.ajs-menu-bar .ajs-drop-down a span span {
+     /* all containers are block-level with no margin or padding by default */
+    display: block;
+    margin: 0;
+    padding: 0;
+}
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    padding-right: 1em; /* gap after menu label, must be wider than indicator image */
+}
+.ajs-menu-bar .ajs-menu-item,
+.ajs-menu-bar .ajs-button {
+    float: left;
+    list-style: none;
+    position: relative;
+}
+.ajs-menu-bar .ajs-menu-item a,
+.ajs-menu-bar .ajs-button a {
+    line-height: 1.5;
+    text-decoration: none;
+    white-space: nowrap;
+}
+.ajs-menu-bar .ajs-button {
+    float: left;
+    line-height: 2;
+    list-style: none;
+    position: static;
+}
+
+/* Drop-down indicator icon and on-hover colour changing */
+.ajs-menu-bar .ajs-menu-item .trigger span {
+    background-image: url(../../../images/decoration/menu_indicator.gif);
+    position: relative;
+}
+.ajs-menu-bar .ajs-menu-item.opened .trigger span {
+    background-image: url(../../../images/decoration/white_menu_indicator.gif);
+}
+
+.ajs-menu-bar .ajs-menu-item.opened .trigger span span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    background-image: none;
+}
+.ajs-menu-bar .ajs-button a:hover,
+.ajs-menu-bar .ajs-menu-item.opened .trigger span {
+    color: #fff; /* system colour - not derived from colour scheme */
+}
+
+/* Menu bar icons */
+.ajs-menu-bar .ajs-menu-item .trigger span {
+    background-position: 100% 50%;
+    background-repeat: no-repeat;
+}
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    background-position: 0 50%;
+    background-repeat: no-repeat;
+}
+
+/* Drop-down menu layout */
+.ajs-menu-bar .ajs-menu-item .ajs-drop-down a {
+    background: #fff no-repeat 4px 50%;
+    border: none;
+    display: block;
+    line-height: 1.6;
+    margin: 0;
+    padding: 0 0.5em 0 24px;
+    text-decoration: none;
+}
+.ajs-menu-bar .ajs-drop-down {
+    -moz-border-radius-bottomleft: 3px;
+    -moz-border-radius-bottomright: 3px;
+    -webkit-border-bottom-left-radius: 3px;
+    -webkit-border-bottom-right-radius: 3px;
+    background: #fff; /* system colour - not derived from colour scheme */
+    border: solid 1px #c1c1c1;
+    font-weight: normal;
+    min-width: 12em;
+    padding: 0;
+    position: absolute;
+    left: 0;
+    white-space: nowrap;
+    z-index: 1000;
+}
+
+/* CONFDEV-820 - Temporary fix */
+#header-menu-bar .ajs-drop-down {
+    min-width: 15em;
+}
+
+.ajs-menu-bar .ajs-drop-down.above {
+    -moz-border-radius: 0;
+    -moz-border-radius-topleft: 3px;
+    -moz-border-radius-topright: 3px;
+    -webkit-border-radius: 0;
+    -webkit-border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+    bottom: 2em;
+    margin-top: -2px;
+}
+.ajs-menu-bar .ajs-drop-down ul,
+.ajs-menu-bar ul.ajs-drop-down {
+    border-top: solid 1px #e1e1e1;
+    margin: 0;
+    padding: 5px 0;
+    position: relative;
+    list-style: none;
+}
+.ajs-menu-bar .ajs-drop-down ul.first,
+.ajs-menu-bar ul.ajs-drop-down.first {
+    border-top: none;
+}
+.ajs-menu-bar .ajs-drop-down li {
+    margin: 0;
+    padding: 0;
+}
+.ajs-menu-bar .ajs-menu-item div.ajs-drop-down a {
+    background-position: .5em 50%;
+    background-repeat: no-repeat;
+    border: none;
+    display: block;
+    line-height: 2;
+    margin: 0;
+    padding: 0 1em 0 28px;
+    position: relative;
+    text-decoration: none;
+    white-space: nowrap;
+}
+.ajs-menu-bar .ajs-drop-down a img {
+    float: left;
+    height: 16px;
+    margin: .3em 0 0 -20px;
+    width: 16px;
+}
+
+/* Drop-down menu icons */
+.ajs-menu-bar .ajs-drop-down a.add-comment {
+    background-image: url(../../../images/icons/comment_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.add-attachment {
+    background-image: url(../../../images/icons/attach_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.add-page {
+    background-image: url(../../../images/icons/docs_16.gif);
+}
+.ajs-menu-bar .ajs-drop-down a.add-news {
+    background-image: url(../../../images/icons/blogentry_16.gif);
+}
+.ajs-menu-bar .ajs-drop-down a.action-view-history {
+    background-image: url(../../../images/icons/clock_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-permissions {
+    background-image: url(../../../images/icons/lock_16_grey.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-view-attachments {
+    background-image: url(../../../images/icons/attach_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-favourite {
+    background-image: url(../../../images/icons/fav_off_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected { /* using IE style here to make IE7 not duplicate bg */
+    background-image: url(../../../images/icons/fav_on_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-watching-space {
+    background-image: url(../../../images/icons/watching_space_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-manage-watchers {
+    background-image: url(../../../images/icons/watch_manage_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-watching {
+    background-image: url(../../../images/icons/watch_off_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected { /* using IE style here to make IE7 not duplicate bg */
+    background-image: url(../../../images/icons/watch_on_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.waiting {
+    background-image: url(../../../images/icons/wait.gif);
+}
+
+.ajs-menu-bar .ajs-menu-item .section-secondary li a,
+.ajs-menu-bar .ajs-menu-item .section-modify li a {
+    padding-left: 8px;
+    font-size: .9em;
+}
+
+.ajs-menu-bar .ajs-menu-item .ajs-drop-down li.hidden {
+    display: none;
+}
+
+/* Customisations for header menu bar */
+#header-menu-bar {
+    margin-top: 0;
+    margin-right: 5px;
+}
+#header .ajs-menu-item a {
+    float: left;
+    line-height: 1.5;
+    margin: 0;
+    text-decoration: underline;
+}
+#header-menu-bar li.ajs-menu-item a {
+    line-height: 2;
+}
+#header-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    line-height: 1.5;
+}
+#header .ajs-menu-bar li.ajs-menu-item,
+#header .ajs-menu-bar li.ajs-button {
+    margin: 0;
+    padding: 0;
+}
+#header .ajs-menu-bar li.ajs-menu-item a {
+    padding-left: 0.5em;
+}
+#header .ajs-menu-item .trigger span {
+    background-image: url(../../../images/decoration/white_menu_indicator.gif); /* header menus always use a white indicator */
+}
+#header .ajs-menu-item .trigger span span {
+    background: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item a.trigger:focus {
+    outline: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item a.trigger {
+    float: left;
+    padding: 0 0.5em;
+    text-decoration: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down li,
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down a {
+    background-color: #fff; /* system colour - not derived from colour scheme */
+    background-image: none;
+}
+.ajs-menu-bar .ajs-menu-item.opened,
+.ajs-menu-bar .ajs-button a {
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+.ajs-menu-bar .ajs-menu-item.opened {
+    -moz-border-radius-bottomleft: 0;
+    -moz-border-radius-bottomright: 0;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+}
+
+/* Customisations for header menus */
+#header .ajs-menu-bar .ajs-drop-down {
+    -moz-border-radius-bottomleft: 3px;
+    -moz-border-radius-bottomright: 3px;
+    -webkit-border-bottom-left-radius: 3px;
+    -webkit-border-bottom-right-radius: 3px;
+    border-top: none;
+    margin-top: 0;
+    margin-left: -1px;
+    top: 2em;
+    z-index: 9;
+}
+#header .ajs-menu-bar .ajs-drop-down a {
+    float: none;
+    padding: 2px 2em;
+    text-decoration: none;
+}
+#header .ajs-menu-bar .ajs-menu-item .ajs-drop-down ul,
+#header .ajs-menu-bar .ajs-menu-item ul.ajs-drop-down {
+    border-top: 1px solid #cce;
+}
+#header .ajs-menu-bar .ajs-drop-down ul.first,
+#header .ajs-menu-bar ul.ajs-drop-down.first {
+    border: none;
+}
+
+/* Customisations for navigation menu bar */
+#navigation .ajs-menu-bar {
+    margin: 10px 0 0 1em;
+}
+#navigation .ajs-menu-bar .ajs-button span,
+#navigation .ajs-menu-bar .ajs-menu-item .ajs-menu-title span span {
+    padding-left: 25px; /* width of icon + gap before menu label */
+}
+/*#navigation .ajs-menu-bar li.ajs-menu-item,
+#navigation .ajs-menu-bar li.ajs-button {
+    margin-top: -10px;
+}
+*/
+#navigation .ajs-menu-bar li.ajs-menu-item .ajs-menu-title,
+#navigation .ajs-menu-bar li.ajs-button a {
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    color: #535353; /* system colour - not derived from colour scheme */
+    font-size: 1.1em;
+    line-height: 20px;
+    padding: .35em .5em;
+}
+#navigation .ajs-menu-bar li.ajs-menu-item .ajs-menu-title {
+    -moz-border-radius-bottomleft: 0;
+    -moz-border-radius-bottomright: 0;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+}
+#navigation .ajs-menu-bar .ajs-button a.edit span {
+    background-image: url(../../../images/icons/edit_20.png);
+}
+#navigation .ajs-menu-bar .ajs-button a.view span {
+    background-image: url(../../../images/icons/view_20.png);
+}
+#navigation .ajs-menu-bar li.ajs-menu-item a.add span span {
+    background-image: url(../../../images/icons/add_20.png);
+}
+#navigation .ajs-menu-bar li.ajs-menu-item a.action span span {
+    background-image: url(../../../images/icons/tools_20.png);
+}
+.ajs-menu-bar .ajs-menu-item .most-right-menu-item {
+    left: auto;
+    margin: 0;
+    right: 0;
+}
+#header .ajs-menu-item a.ajs-menu-title span { /* Not sure why these styles need to be duplicated for IE, but it works. */
+    background-image: url(../../../images/decoration/white_menu_indicator.gif); /* header menus always use a white indicator */
+    background-repeat: no-repeat;
+    background-position: 100% 60%; /* 60% lines up with middle of lowercase letters in IE */
+}
+.ajs-drop-down {
+    clear: both;
+    z-index: 500;
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down li {
+    border-bottom: solid 1px #fff;
+}
+.ajs-menu-bar .ajs-drop-down li {
+    display: block;
+    margin: 0;
+    padding: 0;
+    position: relative;
+}
+
+#navigation .ajs-menu-bar .ajs-drop-down a {
+    display: block;
+    padding: 0.33em 0.67em;
+    cursor: pointer;
+}
+#navigation .ajs-menu-bar div.ajs-drop-down a span {
+    padding: 0 0 0 21px;
+    height: 16px;
+    line-height: 16px;
+}
+.ajs-menu-bar div.ajs-drop-down a span {
+    cursor: pointer;
+    height: 16px;
+    line-height: 16px;
+    zoom: 1;
+}
+#navigation .ajs-menu-bar .section-secondary li a,
+#navigation .ajs-menu-bar .section-modify li a {
+    line-height: 2;
+    padding-left: 0;
+}
+#navigation .ajs-menu-bar .section-secondary li a span,
+#navigation .ajs-menu-bar .section-modify li a span {
+    padding-left: 8px;
+}
+.ajs-menu-bar .ajs-drop-down a img {
+    clear: left;
+    float: none;
+    margin: .3em 0 .3em -20px;
+    vertical-align: middle;
+}
+
+#navigation .ajs-menu-bar .ajs-button a,
+#navigation .ajs-menu-bar .ajs-button a span {
+    display: inline-block; /* makes the edit button have layout, but doesn't give it enormous width*/
+}
+
+.ajs-menu-bar .ajs-drop-down a.add-page,
+.ajs-menu-bar .ajs-drop-down a.add-news {
+    background: none;
+}
+.ajs-menu-bar .ajs-drop-down a.add-page span {
+    background: url(../../../images/icons/docs_16.gif) no-repeat 0 50%;
+}
+.ajs-menu-bar .ajs-drop-down a.add-news span {
+    background: url(../../../images/icons/blogentry_16.gif) no-repeat 0 50%;
+}
+
+* html .ajs-menu-bar .ajs-drop-down a.add-comment {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-comment span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/comment_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-attachment,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-attachments,
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-attachment span,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-attachments span,
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/attach_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-count {
+    display: inline-block;  /* IE6 */
+    text-indent: 9999em;
+}
+* html .page-metadata ul a.page-restrictions span,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-history,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-permissions,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-favourite,
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected,
+* html .ajs-menu-bar .ajs-drop-down a.action-manage-watchers,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching-space,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching,
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-view-history span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/clock_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .page-metadata ul a.page-restrictions span,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-permissions span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/lock_16_grey.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-favourite span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/fav_off_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/fav_on_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching-space span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watching_space_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-manage-watchers span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_manage_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_off_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_on_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.waiting {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.waiting span {
+    background-image: url(../../../images/icons/wait.gif);
+    background-repeat: no-repeat;
+    filter: inherit;
+}
+* html #navigation .ajs-menu-bar .ajs-button a.edit span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/edit_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar li.ajs-menu-item a.add span span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/add_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar li.ajs-menu-item a.action span span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/tools_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar .ajs-button a.view span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/view_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+table.confluenceTable {
+    margin: 5px;
+    border-collapse: collapse;
+}
+
+td.confluenceTd, table.confluenceTable td.confluenceTd {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    padding: 5px;
+    vertical-align: top;
+    min-width: 0.6em;
+}
+
+th.confluenceTh, table.confluenceTable th.confluenceTh {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    padding: 5px;
+    background-color: #f0f0f0;
+    text-align: left;
+    vertical-align: top;
+    min-width: 0.6em;
+}
+.panel {
+    color: black;
+    padding: 0;
+    margin: 10px 20px;
+    background: #f0f0f0;
+    border-width: 1px;
+    border-style: solid;
+    overflow: hidden;
+}
+
+.alertPanel {
+    border-color: #c00;
+}
+
+.infoPanel {
+    border-color: #69c;
+}
+
+.alertPanel, .infoPanel {
+    border-style: solid;
+    border-width: 1px;
+    padding: 8px;
+    margin: 10px;
+}
+
+.infopanel-heading {
+    font-weight: bold;
+	padding: 4px 0 2px 0;
+}
+
+/* basic panel (basicpanel.vmd) style */
+.basicPanelContainer {
+    border-width: 1px;
+    border-style: solid;
+    margin-top: 2px;
+    margin-bottom: 8px;
+    width: 100%;
+}
+
+.basicPanelTitle {
+    padding: 5px;
+    margin: 0;
+    background-color: #f0f0f0;
+    color: black;
+    font-weight: bold;
+}
+
+.basicPanelBody {
+    padding: 5px;
+    margin: 0;
+}
+
+.panelHeader {
+    padding: 0 12px;
+    line-height: 2; /* vertical alignment for title */
+    text-align: center;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.codeHeader, .panelHeader, .panelContent {
+    background: #f0f0f0;
+}
+
+.preformattedHeader, .codeContent, .preformattedContent {
+    background: #fff;
+}
+
+.panelContent {
+    color: #000;
+    margin: 0;
+    padding: 0 12px;
+    text-align: left;
+    font-size: .95em;
+}
+
+.panelContent,
+.panelContent p, .panelContent th,
+.panelContent td, .panelContent li {
+    text-align: left;
+}
+
+
+html body { /* HACK: Temporary fix for CONF-15412 */
+    overflow: visible;
+}
+
+/* IE7 fix for CONFDEV-1056 */
+body.dashboard {
+    *min-width: 1000px;
+}
+img {
+    -ms-interpolation-mode: bicubic;
+}
+#header {
+    height: 1%;
+}
+#breadcrumbs {
+    height: 1%; /* IE6 wrapping */
+    overflow: auto;
+    *overflow: visible; /* IE7 and below */
+}
+#breadcrumbs li {
+    white-space: nowrap;
+}
+* html #breadcrumbs li {
+    background-image: url(../../../images/decoration/white_breadcrumbs_indicator.gif); /* IE6 */
+}
+* html .page-metadata {
+    height: 1.2em; /* IE6 */
+}
+#breadcrumbs li {
+    background-position: 3px 10px;
+}
+form {
+    margin: 0;
+    padding: 0;
+}
+.tab-navigation .tab {
+    float: left;
+    display: inline;
+    font-weight: bold;
+    margin: 0 5px 0 0;
+    position: relative;
+}
+.tab-navigation .tab a {
+    display: inline-block; /* anchors were making tabs very wide in Clickr theme in IE */
+}
+a.icon {
+    height: 16px;
+}
+#tree-div {
+    min-height: 300px;
+    height: auto !important;
+    height: 300px;
+}
+h1 #content-title {
+    margin: 0;
+    display: block;
+    width: 90%; /* 93% and upwards breaks at least one of the IEs */
+}
+
+h1 span.title-text {
+    height: 1%;
+}
+#com-atlassian-confluence h1 {
+    width: auto;
+}
+
+#com-atlassian-confluence h1 img.logo {
+    *margin-bottom: 0;
+}
+
+* html #com-atlassian-confluence h1 img.custom {
+   /* sets max-height for IE - roughly equivalent to what real browsers do with 2.5em max-height */
+   height: expression( this.scrollHeight > 59 ? "60px" : "auto" );
+}
+
+#tab-navigation,
+.tab-navigation {
+    zoom: 1;
+}
+.has-sidebar #content .code {
+    _clear: both; 
+    _overflow: auto; 
+}
+.menu-section-list li a:visited,
+.menu-section-list li a:hover {
+    color: #666;
+}
+.menu-section-list li.active a:visited {
+    color: #fff;
+}
+
+/* Don't remove or dropdowns may break in IE6. CONF-17932 */
+* html #header-menu-bar .hidden {
+    width: 12em;
+}
+
+* .bloglistitems{
+    list-style-type: none;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    margin-left: 0;
+}
+
+* .blogmonthnavigation{
+    border:1px solid #CCCCCC;
+    position:relative;
+    text-decoration:none;
+    display: inline-block;
+    width: 10em;
+    font-size: 0.85em;
+    text-align:center;
+    margin: 0 -0.5em 1em 1em;
+    padding: 0.2em 0.4em;
+}
+
+#conflict-diffs, #page-diffs{
+    min-height: 55px;
+}
+
+#page-diffs .diff {
+    *margin-right: 1em;
+}
+
+/* TODO: remove temp fix after AUI upgrade
+   CONFDEV-918 temp fix, prevents IE7 crash. Don't remove until https://studio.atlassian.com/browse/AJS-509
+   is resolved and the fix version is implemented in Confluence. */
+#com-atlassian-confluence form.dashboard-actions {
+    *min-height: 0;
+}
+/* end CONFDEV-918 temp fix */
+
+/*
+    Styles for macros bundled in Renderer.
+*/
+
+.panelMacro {
+    margin: 10px 20px;
+    overflow: hidden; /* fix width next to floated content */
+}
+
+.panelMacro table {
+    text-align: left;
+    padding: 0 20px;
+    width: 100%;
+}
+
+.panelMacro td, .panelMacro p {
+    font-size: 1em;
+    padding: 14px 0;
+}
+
+.searchMacro {
+    font-size: 10pt;
+    margin: 10px 0;
+}
+
+.searchMacro .result {
+    margin-top: 3px;
+    padding: 0 5px 5px 5px;
+    border-bottom: 1px solid #ddd;
+}
+
+.searchMacro .resultSummary {
+    margin-bottom: 7px;
+}
+
+.rssMacro {
+    font-size: 10pt;
+}
+
+.rssMacro table {
+    margin: 10px 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.rssMacro table th,
+.rssMacro table td {
+    border: 1px solid #ccc;
+    padding: 4px;
+}
+
+.rssMacro table th {
+    background: #f0f0f0;
+}
+
+/* Code styles */
+.code {
+    border-width: 1px;
+    border-style: dashed;
+    overflow: auto;
+}
+
+.code, .preformatted {
+    background-color: #fff;
+}
+
+.code pre, .preformatted pre { /* needs 'pre' to override TinyMCE style */
+    font-family:"Courier New", Courier, monospace;
+    line-height: 1.3;
+}
+
+.code-keyword {
+  color: #000091;
+  background-color: inherit;
+}
+
+.code-object {
+  color: #910091;
+  background-color: inherit;
+}
+
+.code-quote {
+  color: #009100;
+  background-color: inherit;
+}
+
+.code-comment {
+  color: #808080;
+  background-color: inherit;
+}
+
+.code-xml .code-keyword {
+  color: inherit;
+  font-weight: bold;
+}
+
+.code-tag {
+  color: #000091;
+  background-color: inherit;
+}
+
+/* Recently Updated Styles */
+.recentlyUpdatedItem {
+	border-bottom: #f0f0f0 1px solid;
+	border-top: #f0f0f0 1px solid;
+	margin: 10px 0 0 0;
+	padding: 0;
+	border-spacing: 0;
+	width: 100%;
+    text-decoration: none;
+    border-collapse: collapse;
+}
+
+.recentlyUpdatedItem td {
+    padding: 10px;
+    border-bottom: #f0f0f0 1px solid;
+    vertical-align: top;
+}
+
+.recentlyUpdatedItem .authorAndDate {
+	background-color: #f0f0f0;
+	width: 25%;
+}
+
+.recentlyUpdatedItem .date {
+    margin-top: 4px;
+    font-size: 90%;
+    color: #666;
+}
+
+.recentlyUpdatedItem .profilePic {
+    float: right;
+    background-color: #f0f0f0;
+    margin: 0 2px;
+}
+
+.recentlyUpdatedItem .twixie {
+    padding: 10px 0 0 4px;
+}
+
+.recentlyUpdatedItem td.icon {
+    padding: 8px 0 0 1px;
+}
+
+.recentlyUpdatedItem .details {
+    padding-left: 7px;
+}
+
+.recentlyUpdatedItem .summary, .recentlyUpdatedItem .thumbnail {
+    margin-top: 3px;
+    color: #666;
+}
+
+.moreRecentlyUpdatedItems {
+    text-align: right;
+    margin-top: 10px;
+    font-size: 10pt;
+}
+
+a.content-type-page span, div.content-type-page, span.content-type-page {
+    background-image: url(../../../images/icons/docs_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-blogpost span, div.content-type-blogpost, span.content-type-blogpost {
+    background-image: url(../../../images/icons/blogentry_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-comment span, div.content-type-comment, span.content-type-comment {
+    background-image: url(../../../images/icons/comment_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-space span, div.content-type-space, span.content-type-space,
+a.content-type-spacedesc span, div.content-type-spacedesc, span.content-type-spacedesc {
+    background-image: url(../../../images/icons/web_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-personalspacedesc span, div.content-type-personalspacedesc, span.content-type-personalspacedesc {
+    background-image: url(../../../images/icons/personal_space_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-mail span, div.content-type-mail, span.content-type-mail {
+    background-image: url(../../../images/icons/mail_content_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment span, div.content-type-attachment, span.content-type-attachment {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-file span, div.content-type-file, span.content-type-file {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-pdf span, div.content-type-attachment-application-pdf, span.content-type-attachment-application-pdf {
+    background-image: url(../../../images/icons/attachments/pdf.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-image span, div.content-type-attachment-image, span.content-type-attachment-image {
+    background-image: url(../../../images/icons/attachments/image.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-xml span, div.content-type-attachment-text-xml, span.content-type-attachment-text-xml {
+    background-image: url(../../../images/icons/attachments/xml.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-html span, div.content-type-attachment-text-html, span.content-type-attachment-text-html {
+    background-image: url(../../../images/icons/attachments/html.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text span, div.content-type-attachment-text, span.content-type-attachment-text {
+    background-image: url(../../../images/icons/attachments/text.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-zip span, div.content-type-attachment-application-zip, span.content-type-attachment-application-zip {
+    background-image: url(../../../images/icons/attachments/zip.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-excel span, div.content-type-attachment-application-excel, span.content-type-attachment-application-excel {
+    background-image: url(../../../images/icons/attachments/excel.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-powerpoint span, div.content-type-attachment-application-powerpoint, span.content-type-attachment-application-powerpoint {
+    background-image: url(../../../images/icons/attachments/powerpoint.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-word span, div.content-type-attachment-application-word, span.content-type-attachment-application-word {
+    background-image: url(../../../images/icons/attachments/word.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-java span, div.content-type-attachment-java, span.content-type-attachment-java {
+    background-image: url(../../../images/icons/attachments/java.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-file span, div.content-type-attachment-file, span.content-type-attachment-file {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-status span, div.content-type-status, span.content-type-status {
+    background-image: url(../../../images/icons/quotes.png);
+    background-repeat: no-repeat;
+}
+
+div.content-type-userinfo, span.content-type-userinfo {
+    background-image: url(../../../images/icons/user_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-follow span, div.content-type-follow, span.content-type-follow {
+    background-image: url(../../../images/icons/fav_on_16.png);
+    background-repeat: no-repeat;
+}
+
+a.content-type-favourite span, div.content-type-favourite, span.content-type-favourite {
+    background-image: url(../../../images/icons/fav_on_16.png);
+    background-repeat: no-repeat;
+}
+
+body.login,
+body.login #main,
+body.login #full-height-container {
+    background: #fafafa;
+}
+
+* html body.login,
+* html body.login #full-height-container {
+    background: #f0f0f0;
+}
+
+#com-atlassian-confluence.login h1 {
+    width: 560px;
+    margin: 0 auto;
+}
+
+#login-container {
+    margin: 0 auto;
+    width: 500px;
+    padding: 20px 30px;
+    background: #fff;
+}
+
+body.login #header, body.login #websudo {
+    display: none;
+}
+
+/* Gets rid of the break above the footer */
+body.login .clear {
+    display: none;
+}
+
+body.login #main {
+    overflow: hidden;
+    padding: 10% 0 12%;
+}
+
+#login-container .form-error-block{
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+
+#login-container,
+#login-container form.aui {
+    color: #333;
+}
+
+#login-container,
+#login-container .captcha-image {
+    border: 1px solid #eee;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+#login-container div.login-form-container {
+    margin-bottom: 10px;
+    padding: 0 0 5px 20px;
+}
+
+#login-container .login-form-container fieldset {
+    padding-top: 15px;
+}
+
+#login-container .checkbox label {
+    left: 0;
+    margin-right: 0;
+    float: none;
+    display: inline;
+}
+
+/* Overide default label styling */
+#com-atlassian-confluence.login #login-container label {
+    color: #333;
+}
+
+#com-atlassian-confluence.login #login-container .error p {
+    background: #fff;
+    color: #c00;
+}
+
+#login-container .login-form-container .text,
+#login-container .login-form-container .password {
+    width: 95%;
+}
+
+#login-container .message {
+    padding: 0;
+    width: auto;
+}
+
+#login-container p {
+    margin: 0 0 1em;
+    color: #333;
+}
+
+#login-container p.last {
+    margin: 0;
+}
+
+#login-container p.success-message {
+    color: green;
+}
+
+body.signup #main{
+    padding: 5% 0 7%;
+}
+
+#login-container .captcha-image {
+    margin: 10px 0;
+    width: 200px;
+    height: 100px;
+    float: left;
+}
+
+#captcha-error span.errorMessage {
+    font-weight: normal;
+}
+
+#captcha-container .reload {
+    width: 16px;
+    height: 16px;
+    float: left;
+    position: relative;
+    top: 16px;
+    left: 10px;
+}
+
+#captcha-container label#captcha-reponse-label {
+    float: none;
+    left: 0;
+    margin: 0;
+    width: auto;
+}
+
+#captcha-container input {
+    width: 192px;
+}
+
+#coherence-copyright {
+    margin: 0;
+    text-align: center;
+    font-size: 0.8em;
+    padding-bottom: 3px;
+}
+
+#coherence-copyright a {
+    color: #666;
+}
+
+#login-container .userLogoLink {
+    float: left;
+    padding-right: 5px;
+}
+
+#login-container a#login-notyou {
+    padding-left: 5px;
+}
+
+#login-container div.warningPanel {
+    margin: 0 0 10px 0;
+}
+span.icon, a.icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    text-align: left;
+    text-indent: -9999em;
+}
+
+/* used in pagelist.vm */
+.tabletitleops .icon {
+    width: 12px;
+    height: 12px;
+}
+
+.icon-wait {
+    background: transparent url(../../images/icons/wait.gif) no-repeat scroll 0 0;
+}
+.icon-space {
+    background: transparent url(../../images/icons/web_16.gif) no-repeat scroll 0 0;
+}
+.icon-browse-space {
+    background: transparent url(../../images/icons/browse_space.gif) no-repeat scroll 0 0;
+}
+.icon-add-page {
+    background: transparent url(../../images/icons/add_page_16.gif) no-repeat scroll 0 0;
+}
+.icon-add-page-disabled {
+    background: transparent url(../../images/icons/add_page_faded_16.gif) no-repeat scroll 0 0;
+}
+.icon-add-fav {
+    background: transparent url(../../images/icons/star_grey.gif) no-repeat scroll 0 0;
+}
+.icon-remove-fav {
+    background: transparent url(../../images/icons/star_yellow.gif) no-repeat scroll 0 0;
+}
+.icon-home-page {
+    background: transparent url(../../images/icons/home_16.gif) no-repeat scroll 0 0;
+}
+.icon-recently-updated-page {
+    background: transparent url(../../images/icons/new_16.gif) no-repeat scroll 0 0;
+}
+.icon-page {
+    background: transparent url(../../images/icons/docs_16.gif) no-repeat scroll 0 0;
+}
+.icon-comment {
+    background: transparent url(../../images/icons/comment_16.gif) no-repeat scroll 0 0;
+}
+.icon-space {
+    background: transparent url(../../images/icons/web_16.gif) no-repeat scroll 0 0;
+}
+.icon-personal-space {
+    background: transparent url(../../images/icons/personal_space_16.gif) no-repeat scroll 0 0;
+}
+.icon-user {
+    background: transparent url(../../images/icons/user_16.gif) no-repeat scroll 0 0;
+}
+.icon-blog {
+    background: transparent url(../../images/icons/blogentry_16.gif) no-repeat scroll 0 0;
+}
+.icon-trackback {
+    background: transparent url(../../images/icons/document_exchange.gif) no-repeat scroll 0 0;
+}
+.icon-mail {
+    background: transparent url(../../images/icons/mail_content_16.gif) no-repeat scroll 0 0;
+}
+.icon-status {
+    background: transparent url(../../images/icons/quotes.png) no-repeat scroll 0 0;
+}
+.icon-show-more {
+    background: transparent url(../../images/icons/add_12.gif) no-repeat scroll 0 0;
+}
+.icon-show-less {
+    background: transparent url(../../images/icons/subtract_12.gif) no-repeat scroll 0 0;
+}
+.icon-file-pdf {
+    background: transparent url(../../images/icons/attachments/pdf.gif) no-repeat scroll 0 0;
+}
+.icon-file-image {
+    background: transparent url(../../images/icons/attachments/image.gif) no-repeat scroll 0 0;
+}
+.icon-file-xml {
+    background: transparent url(../../images/icons/attachments/xml.gif) no-repeat scroll 0 0;
+}
+.icon-file-html {
+    background: transparent url(../../images/icons/attachments/html.gif) no-repeat scroll 0 0;
+}
+.icon-file-java {
+    background: transparent url(../../images/icons/attachments/java.gif) no-repeat scroll 0 0;
+}
+.icon-file-text {
+    background: transparent url(../../images/icons/attachments/text.gif) no-repeat scroll 0 0;
+}
+.icon-file-zip {
+    background: transparent url(../../images/icons/attachments/zip.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel97-template {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint97-template {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word97-template {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel97 {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint97 {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word97 {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel-macro {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel-template {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-macro {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-slideshow {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-template {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-word-template {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-unknown {
+    background: transparent url(../../images/icons/attachments/file.gif) no-repeat scroll 0 0;
+}
+
+/*
+ * TODO: BN added in 3.3
+ * https://studio.atlassian.com/browse/PLUG-580: Until this issue is
+ * resolved we can't follow the sprite guideline.
+ */
+.icon-people-directory span.icon {
+    background: transparent url(../../images/icons/people_directory_16.png) no-repeat scroll 0 0;
+}
+
+.icon-rss-feed-small span.icon {
+    background: transparent url(../../images/icons/feed-icon-16x16-small.png) no-repeat scroll 0 0;
+}
+
+.icon-create-space span.icon {
+    background: transparent url(../../images/icons/add_space_16.gif) no-repeat scroll 0 0;
+}
+/* Information plugin styles */
+
+.noteMessage, .warningMessage, .infoMessage, .tipMessage {
+    border-style: solid;
+    border-width: 1px;
+    text-align: center;
+    padding: 5px;
+    overflow: hidden; /* fix width next to floated content */
+}
+
+.noteMessage {
+    border-color: #f0c000;
+    background: #ffffce;
+}
+
+.warningMessage {
+    border-color: #c00;
+    background: #fcc;
+}
+
+.infoMessage {
+    border-color: #69c;
+    background: #d8e4f1;
+}
+
+.tipMessage {
+    border-color: #090;
+    background-color: #dfd;
+}
+
+table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td {
+    border: none;
+}
+
+.informationMacroPadding {
+    padding: 5px 0 0 5px;
+}
+
+.noteMacro, .warningPanel {
+    background-color: #ffffce;
+}
+#addition .noteMacro {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0c000;
+    background-color: #ffffce;
+    text-align:left;
+    padding: 10px;
+    width: 100%;
+    margin: 5px 20px;
+}
+
+#addition .noteMacro td {
+    font-size: 10pt;
+    padding: 2px;
+    padding-right: 15px;
+}
+
+#addition .noteMacro p {
+    font-size: 10pt;
+}
+
+#addition .noteMacro b {
+    font-size: 10pt;
+}
+
+#addition table.noteMacro td {
+    border: none;
+}
+
+#replying .noteMacro {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0c000;
+    background-color: #ffffce;
+    text-align:left;
+    padding: 10px;
+    width: 100%;
+    margin: 5px 20px;
+}
+
+#replying .noteMacro td {
+    font-size: 10pt;
+    padding: 2px;
+    padding-right: 15px;
+}
+
+#replying .noteMacro p {
+    font-size: 10pt;
+}
+
+#replying .noteMacro b {
+    font-size: 10pt;
+}
+
+#replying table.noteMacro td {
+    border: none;
+}
+
+.tipMacro {
+    background-color: #dfd;
+}
+
+.warningMacro {
+    background-color: #fcc;
+}
+
+.infoMacro {
+    background-color: #d8e4f1;
+}
+
+.warningPanel {
+    border-style: solid;
+    border-width: 1px;
+    padding: 8px;
+    margin: 10px;
+}
+
+.warningPanel {
+    border-color: #f0c000;
+}
+
+
+
+
+/* Layout plugin styles */
+
+.sectionMacro,
+.sectionMacro p,
+.sectionMacro ul,
+.sectionMacro ol {
+    font-size: 10pt;
+}
+
+table.sectionMacro td {
+    border: none;
+}
+
+table.sectionMacroWithBorder td.columnMacro {
+    border-style: dashed;
+    border-width: 1px;
+    border-color: #ccc;
+}
+
+
+/*
+    Colors for Confluence (included for all themes by default).
+*/
+h1, h2, h3, h4, h5, h6,
+.wiki-content h1,
+.wiki-content h2,
+.wiki-content h3,
+.wiki-content h4,
+.wiki-content h5,
+.wiki-content h6,
+.pagetitle,
+.steptitle,
+.substeptitle,
+.formtitle,
+a.blogHeading,
+.more-comments a,
+th.confluenceTh,
+table.confluenceTable th.confluenceTh,
+table.admin th,
+.form-element-large,
+.form-element-small,
+#com-atlassian-confluence .mce_h1 span.mceText,
+#com-atlassian-confluence .mce_h2 span.mceText,
+#com-atlassian-confluence .mce_h3 span.mceText,
+#com-atlassian-confluence .mce_h4 span.mceText,
+#com-atlassian-confluence .mce_h5 span.mceText,
+#com-atlassian-confluence .mce_h6 span.mceText {
+    color: #003366;
+}
+
+.wiki-content h1,
+.wiki-content h2 {
+ 	border-bottom-color: #6699cc;
+}
+
+.wiki-content-preview {
+    border-left-color: #6699cc;
+    border-right-color: #6699cc;
+}
+
+.pageSectionHeader {
+    border-bottom-color: #6699cc;
+}
+
+.panel {
+    border-color: #6699cc;
+}
+
+.panelHeader,
+.menuheading,
+.pageheader,
+.sectionbottom {
+    border-bottom-color: #6699cc;
+}
+
+.topRow {
+    border-top-color: #6699cc;
+}
+
+.tabletitle, .pageSectionHeader, .section-header h2 {
+    color: #003366;
+}
+.tabletitle, .pageSectionHeader {
+	border-bottom-color: #6699cc;
+}
+
+a:link,
+a:visited,
+a:active,
+a:hover,
+#default-labels-header a.add {
+	color: #003366;
+}
+
+h1 a:hover {
+    border-bottom-color: #003366;
+}
+
+.spacenametitle-printable,
+.spacenametitle-printable a,
+.spacenametitle-printable a:visited {
+    color: #999999;
+}
+
+.navItemOver,
+.navItemOver a,
+.navItemOver a:visited,
+.navItemOver a:hover {
+    color: #ffffff;
+    background-color: #003366;
+}
+
+.navItem {
+    background-color: #6699cc;
+}
+
+.navItem a,
+.navItem a:hover,
+.navItem a:visited {
+    color: #ffffff;
+}
+
+.tableview th {
+    color: #003366;
+    border-bottom-color: #6699cc;
+}
+
+blockquote {
+    border-left-color: #6699cc;
+}
+
+.navBackgroundBox {
+    background: #6699cc;
+}
+
+.previewBoxTop,
+.previewContent,
+.previewBoxBottom,
+.functionbox {
+    border-color: #6699cc;
+}
+
+.smalltext-blue {
+    color: #6699cc;
+}
+
+.tabnav,
+.comment .tabnav,
+ul.tabnav {
+    border-bottom-color: #6699cc;
+}
+
+.tabnav .tabs a {
+    border-color: #6699cc;
+    background: #6699cc;
+}
+
+.tabnav .tabs a:link, .tabnav .tabs a:visited {
+    color: #ffffff;
+}
+.tabnav .tabs a:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+.tabnav .spaceActionLinks a:link,
+.tabnav .spaceActionLinks a:visited {
+    color: #003366;
+}
+
+.foldertab-box {
+	border-left-color: #6699cc;
+	border-right-color: #6699cc;
+	border-bottom-color: #6699cc;
+}
+
+#squaretab a {
+    border-color: #6699cc;
+}
+
+#squaretab a:link, #squaretab a:visited {
+    background-color: #6699cc;
+}
+
+#squaretab a:hover {
+    color: #ffffff;
+    background-color: #003366;
+    border-color: #003366;
+}
+
+table.blogcalendar {
+    border-color: #6699cc;
+}
+
+.blogcalendar th.calendarhead,
+a.calendarhead,
+a.calendarhead:link,
+a.calendarhead:visited,
+a.calendarhead:hover {
+    background-color: #6699cc;
+    color: #ffffff;
+}
+
+.searchGroupHeading {
+    background-color: #6699cc;
+    color: #ffffff;
+}
+
+.permissionTab {
+    background: #6699cc;
+    color: #ffffff;
+}
+
+.permissionSuperTab {
+    background: #003366;
+    color: #ffffff;
+}
+
+/* styles for links in the top bar */
+.topBarDiv a:link,
+.topBarDiv a:visited,
+.topBarDiv a:active,
+.topBarDiv a:hover,
+.topBarDiv {
+    color: #ffffff;
+}
+
+.topBar {
+    background-color: #003366;
+}
+
+.basicPanelContainer {
+    border-color: #6699cc;
+}
+
+.greynavbar {
+    border-top-color: #6699cc
+}
+
+div.license-personal {
+   background-color: #003366;
+   color: #ffffff;
+}
+
+div.license-personal a {
+   color: #ffffff;
+}
+
+.minitab {
+    border-bottom-color: #6699cc;
+}
+
+.minitab a {
+    border-top-color: #6699cc;
+    border-right-color: #6699cc;
+    border-left-color: #6699cc;
+}
+
+.minitab .unselected {
+    border-bottom-color: #6699cc;
+    background: #6699cc;
+}
+
+#header {
+    background-color: #003366;
+}
+#header a,
+#breadcrumbs,
+#header .ajs-menu-bar li.ajs-menu-item a.trigger {
+    color: #ffffff;
+}
+.breadcrumbs {
+ 	border-color: #6699cc;
+}
+
+#navigation, #tab-navigation {
+    border-bottom-color: #6699cc;
+}
+
+#com-atlassian-confluence .aui-dd-parent .aui-dropdown .dropdown-item a,
+.ajs-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    color: #535353;
+}
+#header .ajs-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    color: #003366;
+}
+
+#com-atlassian-confluence .aui-dd-parent a.perms-dropdown-trigger:hover,
+#com-atlassian-confluence .aui-dd-parent a.perms-dropdown-trigger:focus,
+#com-atlassian-confluence .aui-dd-parent .aui-dropdown .dropdown-item.active a,
+.menu-section-list li.active a,
+.menu-section-list li.active a:hover,
+#navigation .ajs-menu-bar .ajs-button a:hover,
+/* .ajs-menu-bar .ajs-menu-item.opened, */
+.ajs-menu-bar .ajs-menu-item li.active a,
+.aui-dd-parent .aui-dropdown li.active,
+.aui-dd-parent .aui-dropdown li:hover span,
+.aui-dd-parent .aui-dropdown a:focus span,
+.ajs-menu-bar .ajs-menu-item.opened .ajs-drop-down li.active a,
+#navigation .ajs-menu-bar li.ajs-button a.active,
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down li.active a,
+.ajs-content-hover .popup-follow a:hover {
+    color: #ffffff;
+    background-color: #6699cc;
+}
+#header .ajs-menu-bar li.ajs-menu-item.opened,
+#header .ajs-menu-bar li.ajs-menu-item.opened a.trigger {
+    background-color: #336699;
+    border-color: #336699;
+}
+.ajs-menu-bar .ajs-menu-item.opened a.trigger {
+    background-color: #6699cc;
+}
+
+#header .ajs-menu-bar .ajs-drop-down {
+    border-color: #003366;
+}
+#header .ajs-menu-bar .ajs-drop-down li.separator {
+    border-top-color: #003366;
+}
+
+.tab-navigation .tab a {
+    background-color: #6699cc;
+    border: 1px solid #6699cc;
+    color: #ffffff;
+}
+.tab-navigation .tab a:hover {
+    color: #ffffff;
+    background-color: #003366;
+    border-bottom-color: #003366;
+}
+
+
+
+/***** Pre 2.8 markup styles for backwards compatability ******/
+#foldertab {
+    border-bottom-color: #6699cc;
+}
+
+#foldertab li a {
+    border-color: #6699cc;
+    background: #6699cc;
+}
+
+#foldertab li a:link,
+#foldertab li a:visited {
+    color: #ffffff;
+}
+#foldertab li a:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+.logoSpaceLink,
+.logoSpaceLink a:link,
+.logoSpaceLink a:visited,
+.logoSpaceLink a:active {
+    color: #999999;
+}
+
+.logoSpaceLink a:hover {
+    color: #003366;
+}
+
+.selectedminitab {
+    border-color: #6699cc
+}
+
+.unselectedminitab {
+	border-color: #6699cc;
+	background: #6699cc;
+}
+
+.tabletitle, .heading-text-color {
+    color: #003366;
+}
+
+a.unselectedminitab:hover {
+	color: #ffffff;
+	background: #003366;
+	border-color: #003366;
+}
+
+ol.autocompleter li.focused {
+	background: #6699cc;
+	color: #ffffff;
+}
+
+/* End colour styles for Confluence */
+
+/*
+    This stylesheet defines styles that only apply to the Default theme. Styles common to all themes should go in
+    master.css
+*/
+html, body {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    font-family: Helvetica, Arial, sans-serif;
+    background-color:#fff;
+}
+
+#full-height-container {
+    min-height: 100%;
+    position: relative;
+    background-color: #fff;    
+}
+
+#header {
+    margin: 0;
+    padding: 0 10px;
+    min-height: 2em;
+    line-height: 2;
+}
+
+#websudo {
+    margin: 0;
+    padding: 0 10px;
+    min-height: 2em;
+    line-height: 2;
+}
+
+.email{
+    /* offset the negative margin set by the header for emails only */
+    margin: 10px;
+}
+
+#page-view-panel {
+    float: right;
+}
+
+#com-atlassian-confluence h1 img {
+    max-height: 2.5em; /* scale logo image with font size */
+    margin-bottom: 0.3em;
+}
+#com-atlassian-confluence h1 img.custom {
+    height: auto;
+}
+
+h1 span.title-text {
+    display: table; /* page title wrapping drops straight down */
+}
+h1 a:hover {
+    color: inherit; /* inherit the colour instead of hard-coding blue */
+}
+.editable-title {
+    margin: 0 10px 0 58px;
+}
+
+#main {
+    padding: 10px 10px 6em 10px;
+}
+.content-preview #main {
+    padding-bottom: 10px;
+}
+
+#content {
+    clear: left;
+}
+#content.space {
+    margin-top: 2.6em;
+}
+
+.quick-search-submit {
+    display: none;
+}
+
+#page-view-panel li, #page-prefs-list li {
+    color: #666;
+    float: left;
+    font-size: .9em;
+    margin: 0 0 0 .3em;
+    padding: 0 0 0 .3em;
+}
+
+#navigation {
+    display: inline;
+}
+
+.page-actions {
+    float: right;
+    border: solid 1px #ccc;
+    padding: 5px;
+    margin-left: 10px;
+}
+
+.remove-control {
+    display: none;
+}
+
+.page-metadata {
+    color: #666;
+    font-size: 0.9em;
+    margin: 10px 0;
+}
+.page-metadata a:link,
+.page-metadata a:active,
+.page-metadata a:hover,
+.page-metadata a:visited {
+    color: #666;
+    font-style: normal;
+}
+
+.section-header {
+    margin-bottom: 5px;
+    padding: 2px 0;    
+}
+
+/* All links are set to action.linkColor but section header links are grey */
+.section-header a:link,
+.section-header a:active,
+.section-header a:hover,
+.section-header a:visited {
+    color: #666;
+}
+
+h2.section-title {
+    font-size: 12pt;
+    font-weight: bold;
+    color: black;
+    margin-top: 20px;
+    padding: 0;
+    display: inline;
+}
+
+.section-title a:link,
+.section-title a:active,
+.section-title a:hover,
+.section-title a:visited {
+    color: black;
+}
+
+#sidebar,
+.sidebar {
+    clear: right;
+    float: right;
+    width: 16em;
+    margin-left: 10px;
+}
+
+#space-blog-search-query{
+    width: 21.5em;
+}
+
+#blog-sidebar{
+    width: 22em;
+    margin-top: 2em;
+}
+
+.has-sidebar #content.space,
+.has-sidebar #content.edit form.markup,
+.has-sidebar .wiki-content,
+.has-sidebar.active-wikimarkup .errorBox{
+    margin-right: 17em;
+}
+
+.has-blog-sidebar #content.space,
+.has-blog-sidebar #content.edit form.markup,
+.has-blog-sidebar .wiki-content
+{
+    margin-right: 24em;
+}
+
+.blog-post-listing .wiki-content,
+.has-blog-sidebar .blogpost-view .wiki-content .wiki-content{
+    margin-right: 0;
+}
+
+.has-sidebar .wiki-content .wiki-content,
+.has-blog-sidebar .wiki-content .wiki-content,
+.has-blog-sidebar .comment-content.wiki-content {
+    margin-right: 0;
+}
+
+.active-richtext #content.create-page,
+.active-preview #content.create-page {
+    margin-right: 0 !important;
+}
+
+.sidebar-content {
+    margin: 10px 0 0 1em;
+}
+.blogcalendar {
+    width: 16em;
+}
+.blogcalendar th a.calendarhead,
+.blogcalendar th.calendarhead {
+    font-size: 1em;
+}
+.blogcalendar td,
+.blogcalendar th {
+    font-size: .85em;
+}
+
+/* folder tab link styles */
+.tabnav .tabs a {
+    padding: 5px 5px 4px;
+    margin: 5px 3px 0 0;
+    border-width: 1px;
+    border-style: solid;
+    border-bottom: none;
+    text-decoration: none;
+    display: block;
+    float: left;
+}
+
+.tabnav .tabs a.current {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+.tabnav .tabs a.current:link, .tabnav .tabs a.current:visited {
+    color: black;
+}
+.tabnav .tabs a.current:hover {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+
+/* list page navigational tabs */
+.tabnav, .comment .tabnav {
+    padding: 0;
+    margin: 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    float: left;
+    display: inline;
+    list-style-position: outside;
+    width: 100%;
+    font-weight: bold;
+    font-size: 10pt;
+}
+
+.after-tabnav {
+    clear: both;
+}
+
+.tabnav li.tabs {
+    list-style: none;
+    margin: 0 0 -1px 10px;
+    float: left;
+    display: block;
+}
+
+
+/* dashboard customization */
+#spacesLabel {
+    padding: 4px 6px;
+    float: left;
+    margin-top: 5px;
+}
+
+#footer {
+    position:absolute;
+    bottom:0;
+    width:100%;
+}
+
+#poweredby,
+#poweredby a {
+    font-size: 11px;
+}
+
+/* We can't have a separate IE css file because the default theme
+   hard codes the location of the theme stylesheet */
+
+/* IE6: treated as min-height*/
+* html #full-height-container {
+    height: 100%;
+    background-color:#F0F0F0;
+}
+
+* html #main {
+    padding-bottom: 1em;
+    height: 88%; /* fake ie6 min height - not perfect but better than alternatives */
+}
+
+* html #footer {
+    position: relative;
+}
+
+/* no footer in popups. */
+body.popup-window #footer {
+    display: none;
+}
+
+* html .popup-window #full-height-container {
+    background-color:#fff;
+}
+
+
+
+
+
+
diff --git a/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg
new file mode 100644
index 0000000000..4550d0ab9a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg
diff --git a/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg.jpeg b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg.jpeg
new file mode 100644
index 0000000000..b8913ec0d3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.html b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.html
new file mode 100644
index 0000000000..5eef0eff33
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/running-oasis-spec-tests-in-a-osgi-environment.html
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Running OASIS Spec Tests in a OSGi environment : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Running OASIS Spec Tests in a OSGi environment">Running OASIS Spec Tests in a OSGi environment</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Running OASIS Spec Tests in a OSGi environment">Running OASIS Spec Tests in a OSGi environment</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Running OASIS Spec Tests in a OSGi environment</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=11469306">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=11469306">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=11469306">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=11469306">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=11469306">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=11469306">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>The OASIS SCA Spec Tests are designed to run in a OSGi environment and below are some configuration necessary to properly import/run/debug the tests in Eclipse PDE environment</P>
+
+<P><B>Generate Eclipse IDE project files</B></P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   mvn -Peclipse
+</PRE>
+</DIV></DIV> 
+
+<P>To facilitate debug, use the following commands:</P>
+
+<P>1) To generate sources for the Tuscany 2.x modules</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn source:jar under sca-java-2.x/trunk/modules
+</PRE>
+</DIV></DIV>
+<P>2)To download source files, please use the following command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Peclipse -DdownloadSources=<SPAN class="code-keyword">true</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P><B>Configure TUSCANY_HOME pointing to where Tuscany distribution is available</B></P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   export TUSCANY_HOME=&lt;tuscany checkout&gt;/distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT
+</PRE>
+</DIV></DIV>
+
+<P>Optionally, you could also configure this as an VM argument on the Eclipse run configuration</P>
+
+<P>-DTUSCANY_HOME=/Users/lresende/opensource/apache/tuscany/java-sca-2.x/distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="running-oasis-spec-tests-in-a-osgi-environment.data/eclipse_tuscany_home.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P><B>Configure contribution location</B></P>
+
+<P>There are various files containing the contribution location necessary to run the tests, these files are:</P>
+
+<P>sca-assembly/Test_Client/src/main/resources/oasis-sca-tests.properties<BR>
+sca-java-caa/Test_Client_JavaCAA/src/main/resources/oasis-sca-tests.properties<BR>
+sca-java-ci/Test_Client_JavaPOJO/src/main/resources/oasis-sca-tests.properties<BR>
+sca-policy/Test_Client/src/main/resources/oasis-sca-tests.properties</P>
+
+<P>although it's currently configured with a relative path, you might need to configure the location based on your system</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.oasis.sca.tests.assembly.contribution.location=../%1/target/%1.zip
+</PRE>
+</DIV></DIV>
+
+
+
+
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Running OASIS Spec Tests in a OSGi environment';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.data/sample-calculator-jaxws-client.jar b/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.data/sample-calculator-jaxws-client.jar
new file mode 100644
index 0000000000..f4b2c021b4
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.data/sample-calculator-jaxws-client.jar
diff --git a/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html b/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html
new file mode 100644
index 0000000000..d53263ed4b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Running Tuscany SCA 2.x with Equinox and Felix : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Running Tuscany SCA 2.x with Equinox and Felix">Running Tuscany SCA 2.x with Equinox and Felix</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Running Tuscany SCA 2.x with Equinox and Felix">Running Tuscany SCA 2.x with Equinox and Felix</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Running Tuscany SCA 2.x with Equinox and Felix</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5603962">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5603962">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5603962">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5603962">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5603962">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5603962">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H2><A name="RunningTuscanySCA2.xwithEquinoxandFelix-1.RunningTuscanywithEquinox"></A>1. Running Tuscany with Equinox</H2>
+
+<P>The Tuscany distribution is ready to be started as an Equinox runtime.</P>
+
+<P>You can simply go into the &quot;modules&quot; directory in the distribution and type the following command:</P>
+
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>java &#45;jar osgi-3.5.0-v20090520.jar &#45;clean &#45;console &#45;configuration ..\features\configuration</P>
+</DIV></DIV>
+
+<H2><A name="RunningTuscanySCA2.xwithEquinoxandFelix-2.RunningTuscanywithFelix"></A>2. Running Tuscany with Felix</H2>
+
+<H3><A name="RunningTuscanySCA2.xwithEquinoxandFelix-DownloadApacheFelixdistribution"></A>Download Apache Felix distribution</H3>
+<P>You can download the latest version of Felix distribution from <A href="http://felix.apache.org/site/downloads.cgi" class="external-link" rel="nofollow">http://felix.apache.org/site/downloads.cgi</A>. Unzip it into a directoy such as felix-2.0.1.</P>
+
+<P>The following bundles can be found in felix-2.0.1\bundle directory:</P>
+
+<UL>
+	<LI>org.apache.felix.bundlerepository-1.4.2.jar</LI>
+	<LI>org.apache.felix.shell-1.4.1.jar</LI>
+	<LI>org.apache.felix.shell.tui-1.4.1.jar</LI>
+</UL>
+
+
+<P>Please download additional bundles into felix-2.0.1\bundle directory:</P>
+<UL>
+	<LI><A href="http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.fileinstall/2.0.0/org.apache.felix.fileinstall-2.0.0.jar" class="external-link" rel="nofollow">org.apache.felix.fileinstall-2.0.0.jar</A></LI>
+	<LI><A href="http://repo1.maven.org/maven2/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar" class="external-link" rel="nofollow">org.osgi.compendium-1.4.0.jar</A></LI>
+	<LI><A href="http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" class="external-link" rel="nofollow">org.apache.felix.configadmin-1.2.4.jar</A></LI>
+</UL>
+
+
+<P>To run the web console, you need more bundles:</P>
+<UL>
+	<LI>org.apache.felix.http.api-2.0.2.jar</LI>
+	<LI>org.apache.felix.http.base-2.0.2.jar</LI>
+	<LI>org.apache.felix.http.bundle-2.0.2.jar</LI>
+	<LI>org.apache.felix.http.jetty-2.0.2.jar</LI>
+	<LI>org.apache.felix.metatype-1.0.4.jar</LI>
+	<LI>org.apache.felix.prefs-1.0.4.jar</LI>
+	<LI>org.apache.felix.scr-1.0.8.jar</LI>
+	<LI>org.apache.felix.eventadmin-1.0.0.jar</LI>
+	<LI>org.apache.felix.webconsole-2.0.0.jar</LI>
+</UL>
+
+
+<H3><A name="RunningTuscanySCA2.xwithEquinoxandFelix-AddTuscanybundles"></A>Add Tuscany bundles</H3>
+<P>Copy all bundles (jars and folders) under the modules directory of Tuscany distribution to felix-2.0.1\load.<BR>
+Remove the following Equinox jars from felix-2.0.1\load:</P>
+
+<UL>
+	<LI>osgi-3.5.0-v20090520.jar</LI>
+	<LI>services-3.2.0-v20090520-1800.jar</LI>
+	<LI>common-3.5.0-v20090520-1800.jar</LI>
+</UL>
+
+
+<P>Alternatively, Tuscany also provides aggregate jars which simplify the use of Tuscany by minimizing the number of jars required. For this exercise the single base jar includes everything necessary so that single jar can be used in the Felix bundle directory. The releases of this jar can be found in the Maven repository <A href="http://repo2.maven.org/maven2/org/apache/tuscany/sca/shades/tuscany-base-nodep/" class="external-link" rel="nofollow">here</A> or the latest development snaphosts <A href="https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/shades/tuscany-base-nodep/2.0-SNAPSHOT/" class="external-link" rel="nofollow">here</A>.</P>
+
+<H3><A name="RunningTuscanySCA2.xwithEquinoxandFelix-Startfelix"></A>Start felix</H3>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>java &#45;jar bin\felix.jar</P>
+</DIV></DIV>
+
+
+<H3><A name="RunningTuscanySCA2.xwithEquinoxandFelix-InstallOSGiremoteservicesamplebundles"></A>Install OSGi remote service sample bundles</H3>
+<P><SPAN class="image-wrap" style=""><IMG src="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/dosgi-dynamic-calculator/dosgi-calculator.png" style="border: 0px solid black"></SPAN></P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>-&gt; install <A href="file:///C:/Tuscany-2.x/java/sca/samples/dosgi-dynamic-calculator/target/sample-dosgi-dynamic-calculator.jar" class="external-link" rel="nofollow">file:///C:/Tuscany-2.x/java/sca/samples/dosgi-dynamic-calculator/target/sample-dosgi-dynamic-calculator.jar</A><BR>
+Bundle ID: 205<BR>
+-&gt; start 205<BR>
+-&gt; install <A href="file:///C:Tuscany-2.x/java/sca/samples/dosgi-dynamic-calculator-operations/target/sample-dosgi-dynamic-calculator-operations.jar" class="external-link" rel="nofollow">file:///C:\Tuscany-2.x/java/sca/samples/dosgi-dynamic-calculator-operations/target/sample-dosgi-dynamic-calculator-operations.jar</A><BR>
+Bundle ID: 206<BR>
+-&gt; start 206</P>
+</DIV></DIV>
+
+<P>Now, the distributed OSGi calculator is available as a Web service at <A href="http://rfengt61p:8086/CalculatorService" class="external-link" rel="nofollow">http://rfengt61p:8086/CalculatorService</A>. You can see the WSDL in a browser with URL: <A href="http://rfengt61p:8086/CalculatorService?wsdl" class="external-link" rel="nofollow">http://rfengt61p:8086/CalculatorService?wsdl</A>. </P>
+
+<P>You can now use a web service client such as Eclipse Web Service explorer to invoke the calculator.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>A JAX-WS client</B><BR>You can download a <A href="running-tuscany-sca-2x-with-equinox-and-felix.data/sample-calculator-jaxws-client.jar">JAX-WS client for the calculator sample</A> and run:<BR>
+java -jar sample-calculator-jaxws-client.jar <EM>expression</EM><BR>
+The expression can be like 1.0+2.0, 2.0/1.0, 3.5-2.0, or 1.0x2.0</TD></TR></TABLE></DIV>
+
+<P>For more information on Tuscany's implementation of OSGi remote services, see: <A href="development-guides.data/OSGi%20Remote%20Services%20with%20Tuscany%20SCA.ppt">OSGi Remote Services with Tuscany SCA.ppt</A></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Running Tuscany SCA 2.x with Equinox and Felix';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/samples-beta1.html b/site/trunk/site-publish/documentation-2x/samples-beta1.html
new file mode 100644
index 0000000000..be3eb13d4f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/samples-beta1.html
@@ -0,0 +1,1146 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Samples-Beta1 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="" title="Samples-Beta1">Samples-Beta1</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="" title="Samples-Beta1">Samples-Beta1</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+                        </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Samples-Beta1</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337713">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="Samples-Beta1-"></A><FONT color="#003366"><B>Tuscany Samples</B></FONT></H1>
+
+<P><FONT color="#000000">The Tuscany Samples are shipped with Tuscany binary and source releases. If you are using tuscany from a release distribution then make sure you are looking at the documentation that corresponds to the samples as they stood at the time of the release.</FONT></P>
+
+<P><A href="20-beta-samples-documentation.html" title="2.0-beta-Samples documentation">2.0-beta samples documentation</A></P>
+
+<P>If however you are working with a snapshot distribution, or using samples code from the trunk of our source repository, then you've come to the right place, as the documentation here reflects the current status of the samples in the trunk of our source tree.</P>
+
+<P><FONT color="#000000">In a distribution, the samples source code is found in either a binary or source code distribution in the samples directory, directly under the root directory. The following sections are laid out to match the structure of the samples directory and its subdirectories.</FONT><BR class="atl-forced-newline"></P>
+
+<DIV>
+<UL>
+    <LI><SPAN class="TOCOutline">1</SPAN> <A href="#Samples-Beta1-gettingstarted">getting-started</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">1.1</SPAN> <A href="#Samples-Beta1-contributionhelloworld">contribution-helloworld</A></LI>
+    <LI><SPAN class="TOCOutline">1.2</SPAN> <A href="#Samples-Beta1-helloworldwebapp">helloworld-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">2</SPAN> <A href="#Samples-Beta1-runningtuscany">running-tuscany</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">2.1</SPAN> <A href="#Samples-Beta1-commandline">command-line</A></LI>
+    <LI><SPAN class="TOCOutline">2.2</SPAN> <A href="#Samples-Beta1-embeddedjse">embedded-jse</A></LI>
+    <LI><SPAN class="TOCOutline">2.3</SPAN> <A href="#Samples-Beta1-embeddedosgi">embedded-osgi</A></LI>
+    <LI><SPAN class="TOCOutline">2.4</SPAN> <A href="#Samples-Beta1-maven">maven</A></LI>
+    <LI><SPAN class="TOCOutline">2.5</SPAN> <A href="#Samples-Beta1-osgi">osgi</A></LI>
+    <LI><SPAN class="TOCOutline">2.6</SPAN> <A href="#Samples-Beta1-shell">shell</A></LI>
+    <LI><SPAN class="TOCOutline">2.7</SPAN> <A href="#Samples-Beta1-webapp">webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3</SPAN> <A href="#Samples-Beta1-learningmore">learning-more</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.1</SPAN> <A href="#Samples-Beta1-async">async</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.1.1</SPAN> <A href="#Samples-Beta1-"> <SPAN style="color: #003366"><B>sample-contribution-implementation-java-calculator-async</B></SPAN></A></LI>
+    <LI><SPAN class="TOCOutline">3.1.2</SPAN> <A href="#Samples-Beta1-embeddedjseasyncsamplelauncher">embedded-jse-async-sample-launcher</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.2</SPAN> <A href="#Samples-Beta1-bindingcomet">binding-comet</A></LI>
+    <LI><SPAN class="TOCOutline">3.3</SPAN> <A href="#Samples-Beta1-bindingjsonrpc">binding-jsonrpc</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.3.1</SPAN> <A href="#Samples-Beta1-contributioncalculator">contribution-calculator</A></LI>
+    <LI><SPAN class="TOCOutline">3.3.2</SPAN> <A href="#Samples-Beta1-contributioncalculatorwebapp">contribution-calculator-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.4</SPAN> <A href="#Samples-Beta1-bindingrmi">binding-rmi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.4.1</SPAN> <A href="#Samples-Beta1-contributioncalculatorreference%2528forbindingrmi%2529">contribution-calculator-reference (for binding-rmi)</A></LI>
+    <LI><SPAN class="TOCOutline">3.4.2</SPAN> <A href="#Samples-Beta1-contributioncalculatorservice%2528forbindingrmi%2529">contribution-calculator-service (for binding-rmi)</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.5</SPAN> <A href="#Samples-Beta1-bindingsca">binding-sca</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.5.1</SPAN> <A href="#Samples-Beta1-contributioncalculator%2528forbindingSCA%2529">contribution-calculator (for binding SCA)</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.6</SPAN> <A href="#Samples-Beta1-bindingws">binding-ws</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.6.1</SPAN> <A href="#Samples-Beta1-contributioncalculator%2528forbindingws%2529">contribution-calculator (for binding-ws)</A></LI>
+    <LI><SPAN class="TOCOutline">3.6.2</SPAN> <A href="#Samples-Beta1-contributionhelloworldwssdo%2528forbindingws%2529">contribution-helloworld-ws-sdo (for binding-ws)</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.7</SPAN> <A href="#Samples-Beta1-distributedosgi">distributed-osgi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.7.1</SPAN> <A href="#Samples-Beta1-dosgidynamiccalculator">dosgi-dynamic-calculator</A></LI>
+    <LI><SPAN class="TOCOutline">3.7.2</SPAN> <A href="#Samples-Beta1-dosgidynamiccalculatoroperations">dosgi-dynamic-calculator-operations</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.8</SPAN> <A href="#Samples-Beta1-implementationbpel">implementation-bpel</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.8.1</SPAN> <A href="#Samples-Beta1-contributionhelloworldbpel">contribution-helloworld-bpel</A></LI>
+    <LI><SPAN class="TOCOutline">3.8.2</SPAN> <A href="#Samples-Beta1-helloworldbpelwebapp">helloworld-bpel-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.9</SPAN> <A href="#Samples-Beta1-implementationcomposite">implementation-composite</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.9.1</SPAN> <A href="#Samples-Beta1-helloworldrecursive">helloworld-recursive</A></LI>
+    <LI><SPAN class="TOCOutline">3.9.2</SPAN> <A href="#Samples-Beta1-helloworldrecursivews">helloworld-recursive-ws</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.10</SPAN> <A href="#Samples-Beta1-implementationextension">implementation-extension</A></LI>
+    <LI><SPAN class="TOCOutline">3.11</SPAN> <A href="#Samples-Beta1-implementationjava">implementation-java</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.11.1</SPAN> <A href="#Samples-Beta1-contributioncalculator">contribution-calculator</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.12</SPAN> <A href="#Samples-Beta1-implementation.osgi">implementation.osgi</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.12.1</SPAN> <A href="#Samples-Beta1-dosgicalculator">dosgi-calculator</A></LI>
+    <LI><SPAN class="TOCOutline">3.12.2</SPAN> <A href="#Samples-Beta1-dosgicalculatoroperations">dosgi-calculator-operations</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.13</SPAN> <A href="#Samples-Beta1-implementationscript">implementation-script</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.13.1</SPAN> <A href="#Samples-Beta1-contributioncalculator">contribution-calculator</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.14</SPAN> <A href="#Samples-Beta1-implementationspring">implementation-spring</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.14.1</SPAN> <A href="#Samples-Beta1-contributionhelloworldspring">contribution-helloworld-spring</A></LI>
+    <LI><SPAN class="TOCOutline">3.14.2</SPAN> <A href="#Samples-Beta1-helloworldspringwebapp">helloworld-spring-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.15</SPAN> <A href="#Samples-Beta1-implementationwebapp">implementation-webapp</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.15.1</SPAN> <A href="#Samples-Beta1-helloworldjaxrswebapp">helloworld-jaxrs-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.2</SPAN> <A href="#Samples-Beta1-helloworldjmswebapp">helloworld-jms-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.3</SPAN> <A href="#Samples-Beta1-helloworldjsclientwebapp">helloworld-js-client-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.4</SPAN> <A href="#Samples-Beta1-helloworldjsfwebapp">helloworld-jsf-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.5</SPAN> <A href="#Samples-Beta1-helloworldjspwebapp">helloworld-jsp-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.6</SPAN> <A href="#Samples-Beta1-helloworldservletwebapp">helloworld-servlet-webapp</A></LI>
+    <LI><SPAN class="TOCOutline">3.15.7</SPAN> <A href="#Samples-Beta1-helloworldstripeswebapp">helloworld-stripes-webapp</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.16</SPAN> <A href="#Samples-Beta1-loggingscribe">logging-scribe</A></LI>
+    <LI><SPAN class="TOCOutline">3.17</SPAN> <A href="#Samples-Beta1-mavenosgijunit">maven-osgi-junit</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.17.1</SPAN> <A href="#Samples-Beta1-calculatorosgi">calculator-osgi</A></LI>
+    <LI><SPAN class="TOCOutline">3.17.2</SPAN> <A href="#Samples-Beta1-calculatorrestosgi">calculator-rest-osgi</A></LI>
+</UL>
+    <LI><SPAN class="TOCOutline">3.18</SPAN> <A href="#Samples-Beta1-scaclient">sca-client</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">3.18.1</SPAN> <A href="#Samples-Beta1-calculatorscaclient">calculator-scaclient</A></LI>
+    <LI><SPAN class="TOCOutline">3.18.2</SPAN> <A href="#Samples-Beta1-helloworldscaclient">helloworld-scaclient</A></LI>
+</UL>
+</UL>
+    <LI><SPAN class="TOCOutline">4</SPAN> <A href="#Samples-Beta1-applications">applications</A></LI>
+<UL>
+    <LI><SPAN class="TOCOutline">4.1</SPAN> <A href="#Samples-Beta1-store">store</A></LI>
+    <LI><SPAN class="TOCOutline">4.2</SPAN> <A href="#Samples-Beta1-storewebapp">store-webapp</A></LI>
+</UL>
+</UL></DIV>
+
+<H2><A name="Samples-Beta1-gettingstarted"></A>getting-started</H2>
+
+<P>SCA defines a concept called a Contribution which is the way that SCA composite applications are packed for deployment. See <A href="sca-introduction.html" title="SCA Introduction">SCA Introduction</A> for more information on SCA concepts. </P>
+
+<P>The getting-started samples consist of simple SCA contributions that you can build and run as your first step to getting up and running with the Tuscany SCA Java runtime. </P>
+
+<P>You can build the sample contributions with either Maven or Ant and the running-tuscany director contains information about the various ways you can start Tuscany and run these contributions. </P>
+
+<H3><A name="Samples-Beta1-helloworldcontribution"></A>helloworld-contribution</H3>
+
+<P>This is the simplest contribution. This contribution describes a composite application with a single component implemented in Java. The component's Java implementation provides service &quot;business logic&quot; for saying hello to a person whose name is supplied as input to the service. </P>
+
+<H3><A name="Samples-Beta1-helloworldwebapp"></A>helloworld-webapp</H3>
+
+<P>This sample is not a contribution in it's own right but demonstrates how to run the helloworld-contribution inside a web application. </P>
+
+<H3><A name="Samples-Beta1-callbackapi"></A>callback-api</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on callbacks with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-scascopes"></A>sca-scopes</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on scopes with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-scaincludecontribution"></A>sca-include-contribution</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">This feels like a learning-more sample. I wouldn't focus on scopes with the first time user</FONT></TD></TR></TABLE></DIV>
+
+<H2><A name="Samples-Beta1-runningtuscany"></A>running-tuscany</H2>
+
+<P>Running something in Tuscany requires one or more contributions, and a method of launching the contributions to make them available as services. The sections below describes various means of launching contributions into an executing &nbsp;tuscany runtime.</P>
+
+
+<H3><A name="Samples-Beta1-commandline"></A>command-line</H3>
+
+<P>To execute a sample contribution from the command line on Windows, from a command prompt in the samples directory, run the command ...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+..\bin\tuscany.bat <SPAN class="code-quote">&quot;contribution-name&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+..\bin\tuscany.bat contribution-binding-sca-calculator
+</PRE>
+</DIV></DIV>
+
+<P>or on &#42;nix platforms, from a shell prompt in the samples directory, run the command ...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+../bin/tuscany.sh contribution-binding-sca-calculator
+</PRE>
+</DIV></DIV>
+
+<H3><A name="Samples-Beta1-embeddedjse"></A>embedded-jse</H3>
+
+<P>This directory contains sample java launchers for the<BR>
+tuscany sample contributions. To use the sample JSE launchers with ant execute the command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant run-&lt;contributionname&gt;
+</PRE>
+</DIV></DIV>
+
+<P>where run-&lt;contributionname&gt; is one of the targets in the build.xml file</P>
+
+<P>To use this sample launcher to run all of the contributions as junit test cases, execute the command &quot;mvn&quot; in the launcher directory.</P>
+
+
+<H3><A name="Samples-Beta1-embeddedosgi"></A>embedded-osgi</H3>
+
+<P>The launchers implemented in the src/main/java/launchers directory each launch a specific contribution into the OSGI runtime.<BR>
+To use this sample OSGI launcher with ant excute the command</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant run-&lt;contributionname&gt;
+</PRE>
+</DIV></DIV>
+<P>where run-&lt;contributionname&gt; is one of the targets in the build.xml file</P>
+
+<P>To use this sample launcher to run all of the contributions as junit test cases,<BR>
+execute the command </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">mvn</PRE>
+</DIV></DIV>
+<P> in the launcher directory.</P>
+
+
+<H3><A name="Samples-Beta1-maven"></A>maven</H3>
+
+<P>To execute a sample contribution from Maven</P>
+
+<P>look for contributions that have the following configuration in their pom.xml file:</P>
+
+<P>&lt;plugin&gt;<BR>
+&lt;groupId&gt;org.apache.tuscany.maven.plugins&lt;/groupId&gt;<BR>
+&lt;artifactId&gt;maven-tuscany-plugin&lt;/artifactId&gt;<BR>
+&lt;version&gt;2.0-SNAPSHOT&lt;/version&gt;<BR>
+&lt;/plugin&gt;</P>
+
+<P>For contributions that have this, for example, learning-more/binding-sca/contribution-calculator, do the following</P>
+
+<P>cd samples/learning-more/binding-sca/contribution-calculator<BR>
+mvn tuscany:run</P>
+
+<P>This will launch the contribution in the Tuscany runtime and then wait. At this point you can use<BR>
+other clients to send messages to services that the running SCA applcation exposes,<BR>
+for example, try learning-more/calculator-scaclient.</P>
+
+<H3><A name="Samples-Beta1-osgi"></A>osgi</H3>
+
+<P>The Tuscany runtime can be run in and OSGi container.&nbsp;</P>
+
+
+<P><B>Running in Equinox</B></P>
+
+<P>On Windows, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java \-jar ..\..\modules\osgi-3.5.0-v20090520.jar \-configuration ..\..\features\configuration \-clean \-console
+
+</PRE>
+</DIV></DIV>
+
+<P>On &#42;Unix, run</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java \-jar ../../modules/osgi-3.5.0-v20090520.jar \-configuration ../../features/configuration \-clean \-console
+
+</PRE>
+</DIV></DIV>
+
+<P>You should see the osgi console:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt;
+
+osgi&gt; Jun 22, 2009 1:32:27 PM org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator start
+
+INFO: Equinox-based service discoverer is now configured.
+
+</PRE>
+</DIV></DIV>
+
+<P>You can run &quot;ss&quot; command under the osgi&gt; to see the status of the bundles.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; ss
+
+</PRE>
+</DIV></DIV>
+
+<P>Then you can install and start contributions as bundles by doing the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+osgi&gt; install file:./path/to/contribution_bundle.jar
+
+</PRE>
+</DIV></DIV>
+
+<P>Note that contribution_bundle.jar will need an activator in order to register the bundle as a SCA contribution</P>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>see samples/????<BR>
+TODO is this still true</TD></TR></TABLE></DIV>
+<P>Running on Felix</P>
+
+<P>See <A href="http://tuscany.apache.org/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html" class="external-link" rel="nofollow">http://tuscany.apache.org/documentation-2x/running-tuscany-sca-2x-with-equinox-and-felix.html</A></P>
+
+
+<H3><A name="Samples-Beta1-shell"></A>shell</H3>
+
+<P>This directory contains a sample shell program supporting simple commands to<BR>
+start and stop SCA composites.</P>
+
+<P>To build the sample shell do this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn install
+</PRE>
+</DIV></DIV>
+<P>To run it:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca
+</PRE>
+</DIV></DIV>
+
+<P>at the prompt:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+start myNode ../../applications/store/target/sample-store.jar
+</PRE>
+</DIV></DIV>
+<P>or:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+start myNode http:<SPAN class="code-comment">//people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar</SPAN>
+</PRE>
+</DIV></DIV>
+<P>also try:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+status
+stop myNode
+bye
+</PRE>
+</DIV></DIV>
+<P>Starting and stopping composites is pretty fast. To see that, try the following<BR>
+two scripts, which start/stop the sample store composite 10 times.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca &lt;scripts/test.txt
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+./sca &lt;scripts/test-remote.txt
+</PRE>
+</DIV></DIV>
+
+<P>The shell can also run as a Webapp. To try it install target/scashell.war in<BR>
+a Web container, point your Web browser to <A href="http://localhost:8080/scashell" class="external-link" rel="nofollow">http://localhost:8080/scashell</A><BR>
+and try the links on that page.</P>
+
+
+<H3><A name="Samples-Beta1-webapp"></A>webapp</H3>
+
+<P>To execute sample webapp based contributions (contributions that have webapp at the end of their name) you<BR>
+can build the contribution using maven and then copy the resulting war file to your container of choice</P>
+
+<P>For example, for binding-jsonrpc/contribution-calculator-webapp, do the following</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd samples/binding-jsonrpc/contribution-calculator-webapp
+mvn
+cp target/sample-contribution-binding-jsonrpc-calculator-webapp.war your_container_deployment-dir
+</PRE>
+</DIV></DIV>
+
+<P>As an alternative sample webapp based contributions can be run within Jetty directly from Maven, look for<BR>
+webapp contributions that have the following configuration in their pom.xml file:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;plugin&gt;
+    &lt;groupId&gt;org.mortbay.jetty&lt;/groupId&gt;
+    &lt;artifactId&gt;maven-jetty-plugin&lt;/artifactId&gt;
+    &lt;version&gt;6.1.18&lt;/version&gt;
+&lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For contributions that have this, for example, binding-jsonrpc/contribution-calculator-webapp, do the following</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd samples/binding-sca/contribution-calculator
+mvn jetty:run
+</PRE>
+</DIV></DIV>
+
+<P>This will launch the contribution in the Jetty runtime and then wait. At this point you can use<BR>
+HTTP clients to send messages to services that the running SCA applcation exposes. For this<BR>
+example try pointing your browser at:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8080/sample-contribution-binding-jsonrpc-calculator-webapp/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="Samples-Beta1-learningmore"></A>learning-more</H2>
+
+<P>The samples found in the contributions below illustrate how to see more of SCA and Tuscany's features in action. You'll need to employ the information above in the &quot;running tuscany&quot; section to select an appropriate way of runing the contributions in the samples listed below.</P>
+
+<H3><A name="Samples-Beta1-async"></A>async</H3>
+
+<P>This sample &nbsp;demonstrates invocation of services offered in both synchronous and asynchronous forms. Asynchroncity is possible by either callback to or polling by the original service invoker.</P>
+
+<H4><A name="Samples-Beta1-"></A><FONT color="#003366"><B>sample-contribution-implementation-java-calculator-async</B></FONT></H4>
+
+<P>In the composite file src/main/resources/Calculator.composite the references &quot;calculatorServiceRefSync&quot; &nbsp;and &quot;calculatorServiceRefAsync&quot; make use of the alternative implementations of the Calculator service described in the CalculatorSync and CalculatorAsync components and implemented in the&nbsp;calculator.CalculatorServiceSyncImpl and calculator.CalculatorServiceAsyncImpljava classes.&nbsp;</P>
+
+
+<H4><A name="Samples-Beta1-embeddedjseasyncsamplelauncher"></A>embedded-jse-async-sample-launcher</H4>
+
+
+<P>Note that the launcher simply starts and stops a node running the contribution. &nbsp;Within the contribution the CalculatorClient java class, marked with the @EagerInit annotation, runs its calculate method (marked with the @Init annotation), thereby triggering the calculation service to be performed. The calculator service is actually performed by the injected instance of CalculatorServiceProxyImpl, which uses both of its references (one for the sync service, one for the async) to perform calculations. The calculations are then performed by instances of&nbsp;CalculatorServiceSyncImpl and&nbsp;CalculatorServiceAsyncImpl. Note that the Tuscany runtime views the following two interfaces as compatible.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CalculatorService {
+   <SPAN class="code-object">String</SPAN> calculate(<SPAN class="code-object">Integer</SPAN> n1);
+}
+
+@Remotable
+@AsyncInvocation
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CalculatorServiceAsync {
+
+   void calculateAsync(<SPAN class="code-object">Integer</SPAN> n1, ResponseDispatch&lt;<SPAN class="code-object">String</SPAN>&gt; response);
+
+}
+
+</PRE>
+</DIV></DIV>
+
+<H3><A name="Samples-Beta1-bindingcomet"></A>binding-comet</H3>
+
+<P>Executing the command &quot;mvn&quot; in this sample project creates a web archive suitable for deployment to Tomcat.  It makes use of the tuscany coment binding. Comet support allows a servlet to process IO asynchronously, receiving events when data is available for reading on the connection (rather than always using a blocking read), and writing data back on connections asynchronously (most likely responding to some event raised from some other source).</P>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Needs expert review/update</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-bindingjsonrpc"></A>binding-jsonrpc</H3>
+
+
+<P>This sample demonstrates using a simple calculator service component which makes use of four services for the basic arithmetic functions. In this variant of the calculator sample you can see by looking in the src/main/resources/Calculator.composite xml file that the AddService is configured to be invoked using the json rpc protocol.</P>
+
+<H4><A name="Samples-Beta1-contributioncalculator"></A>contribution-calculator</H4>
+
+
+<P>This variant of the calculator contribution configures the AddService to be accessed via the JSON RPC protocol (see the XML in the Calculator.composite file).</P>
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>Needs review/completion</TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributioncalculatorwebapp"></A>contribution-calculator-webapp</H4>
+
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-bindingrmi"></A>binding-rmi</H3>
+
+<P>In this example the calculator function is split over two contributions in order to demonstrate the remote method invocation binding. The&nbsp;CalculatorService in the&nbsp;CalculatorServiceComponent defined in the&nbsp;CalculatorRMIServer.composite file is configured to be accessible using RMI.</P>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>Needs review/completion</TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributioncalculatorreference%28forbindingrmi%29"></A>contribution-calculator-reference (for binding-rmi)</H4>
+
+
+<P>This contribution serves the purpose of accessing the services of the calculator service contribution, in particular defining a reference that uses the add service of that contribution using the RMI protocol.</P>
+
+<H4><A name="Samples-Beta1-contributioncalculatorservice%28forbindingrmi%29"></A>contribution-calculator-service (for binding-rmi)</H4>
+
+
+<P>This contribution defines the calcullators add service to be available via RMI invocation.</P>
+
+<H3><A name="Samples-Beta1-bindingsca"></A>binding-sca</H3>
+
+
+<P>This sample is the simplest sample other than that shown in the getting starting section. It uses the default SCA protocol for communicating between the components.&nbsp;</P>
+
+<H4><A name="Samples-Beta1-contributioncalculator%28forbindingSCA%29"></A>contribution-calculator (for binding SCA)</H4>
+
+<P><FONT color="#000000">The service and reference definitions in the Calculator.composite and CalculatorClient.composite files have no binding attributes, thereby defaulting to the SCA binding for communication between the running instances of the components.</FONT></P>
+
+<H3><A name="Samples-Beta1-bindingws"></A>binding-ws</H3>
+
+
+<P>This sample contains contrributions which show how the services can be offered via a web service interfaqce.</P>
+
+<H4><A name="Samples-Beta1-contributioncalculator%28forbindingws%29"></A>contribution-calculator (for binding-ws)</H4>
+
+<P>This contribution provides the four arithmetic operations in the calculator service, with the AddService being accessible as a web service via the URL&nbsp;<A href="http://localhost:8085/AddServiceComponent" class="external-link" rel="nofollow">http://localhost:8085/AddServiceComponent</A>, as configured in the Calculator.composite file in the contribution project.</P>
+
+<H4><A name="Samples-Beta1-contributionhelloworldwssdo%28forbindingws%29"></A>contribution-helloworld-ws-sdo (for binding-ws)</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document - rework the content of the README as given below</FONT></TD></TR></TABLE></DIV>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+Hello World Web Service References using SDO Sample
+===================================================
+This sample demonstrates an SCA reference that uses a web service binding which works with SDO.  
+
+The README in the samples directory (the directory above <SPAN class="code-keyword">this</SPAN>) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+To run <SPAN class="code-keyword">this</SPAN> sample
+------------------
+This sample is dependent on helloworld-ws-service. Open a command prompt to start
+the service. If you are running ant <SPAN class="code-keyword">do</SPAN> the following:
+
+cd helloworld-ws-service
+ant run
+
+<SPAN class="code-keyword">if</SPAN> you don't have ant, issue one of the following commands <SPAN class="code-keyword">for</SPAN> windows or *nix:
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
+
+and on *nix <SPAN class="code-keyword">do</SPAN>
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
+
+You should see the following output:
+
+Buildfile: build.xml
+
+run-server:
+     [java] log4j:WARN No appenders could be found <SPAN class="code-keyword">for</SPAN> logger (org.apache.axiom.
+om.util.StAXUtils).
+     [java] log4j:WARN Please initialize the log4j system properly.
+     [java] Aug 24, 2007 11:17:33 AM org.apache.catalina.core.StandardEngine sta
+rt
+     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.ContextConfig d
+efaultWebConfig
+     [java] INFO: No <SPAN class="code-keyword">default</SPAN> web.xml
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
+ register
+     [java] WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/jsp_2_0.
+xsd
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
+ register
+     [java] WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jspt
+aglibrary_1_1.dtd
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
+ register
+     [java] WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jspt
+aglibrary_1_2.dtd
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
+ register
+     [java] WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jspt
+aglibrary_2_0.xsd
+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
+ register
+     [java] WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/resources/j2ee_web_ser
+vices_1_1.xsd
+     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol ini
+t
+     [java] INFO: Initializing Coyote HTTP/1.1 on http-8085
+     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol sta
+rt
+     [java] INFO: Starting Coyote HTTP/1.1 on http-8085
+     [java] Aug 24, 2007 11:17:34 AM org.apache.tuscany.sca.http.tomcat.TomcatSe
+rver addServletMapping
+     [java] INFO: Added Servlet mapping: http:<SPAN class="code-comment">//localhost:8085/HelloWorldService
+</SPAN>
+     [java] HelloWorld server started (press enter to shutdown)
+
+The server is now ready.
+
+
+Now, open another command window to run the client.  
+
+cd helloworld-ws-sdo
+ant run
+
+OR <SPAN class="code-keyword">if</SPAN> you don't have ant, on Windows <SPAN class="code-keyword">do</SPAN>
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld.HelloWorldClient
+
+and on *nix <SPAN class="code-keyword">do</SPAN>
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworl.HelloWorldClient
+
+You should be able to see the following result:
+
+Buildfile: build.xml
+
+run:
+     [java] log4j:WARN No appenders could be found <SPAN class="code-keyword">for</SPAN> logger (org.apache.axiom.
+om.util.StAXUtils).
+     [java] log4j:WARN Please initialize the log4j system properly.
+     [java] Injected helloWorldService
+     [java] Called getGreetings
+     [java] Hello David Haney
+
+BUILD SUCCESSFUL
+Total time: 9 seconds
+
+
+Sample Overview
+---------------
+The sample provides a single component that is wired to a reference with a 
+web service binding. The binding refers to WSDL that identifies the service
+exposed by the helloworld-ws-service sample. 
+
+helloworld-ws-sdo/
+  src/
+    main/
+      java/
+        helloworld/
+          HelloWorldService.java          - <SPAN class="code-keyword">interface</SPAN> description <SPAN class="code-keyword">for</SPAN> 
+                                            HelloWorldServiceComponent
+          HelloWorldServiceComponent.java - component implementation
+          HelloWorldClient.java           - starts the SCA <SPAN class="code-object">Runtime</SPAN> and 
+                                            deploys the helloworldwsclient
+                                            .composite. It then calls the 
+                                            HelloWorldServiceComponent
+      resources/
+        wsdl
+          helloworld.wsdl                 - the service description that the 
+                                            SCA reference uses to bind to service. 
+      
+    test/
+      java/
+        helloworld/
+          HelloWorldClientTestCase.java   - JUnit test <SPAN class="code-keyword">case</SPAN>
+        helloworld-ws-sdo.png             - a pictorial representation of the 
+                                            sample .composite file
+  build.xml                               - the Ant build file
+  pom.xml                                 - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+You can build and run the sample with the binary distribution using Ant. 
+Make sure that you have started helloworld-ws-service which <SPAN class="code-keyword">this</SPAN> sample is dependent on
+in a separate command window. You can either follow the instruction at the begining of <SPAN class="code-keyword">this</SPAN> 
+sample file or <SPAN class="code-keyword">if</SPAN> you want to build and run the service, follow the README under helloworld-ws-service.
+
+Now, let's build and run helloworld-ws-sdo sample:
+
+cd helloworld-ws-sdo                                             
+ant 
+ant run 
+
+You should see the following output from the run target.
+
+run:
+     [java] log4j:WARN No appenders could be found <SPAN class="code-keyword">for</SPAN> logger (org.apache.axiom.
+om.util.StAXUtils).
+     [java] log4j:WARN Please initialize the log4j system properly.
+     [java] Injected helloWorldService
+     [java] Called getGreetings
+     [java] Hello World
+
+Building And Running The Sample Using Maven 
+-------------------------------------------
+You can build and run the sample with either the binary or source distributions using Maven. Please note that you <SPAN class="code-keyword">do</SPAN> not need to start helloworld-ws-service in <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">case</SPAN> since Maven does <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">for</SPAN> you.
+
+cd helloworld-ws-sdo
+mvn
+
+You should see the following output from the test phase.
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Running helloworld.HelloWorldClientTestCase
+log4j:WARN No appenders could be found <SPAN class="code-keyword">for</SPAN> logger (org.apache.axiom.om.util.StAX
+Utils).
+log4j:WARN Please initialize the log4j system properly.
+log4j:WARN No appenders could be found <SPAN class="code-keyword">for</SPAN> logger (org.apache.axiom.om.util.StAX
+Utils).
+log4j:WARN Please initialize the log4j system properly.
+Aug 23, 2007 2:27:32 PM org.apache.catalina.core.StandardEngine start
+INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.ContextConfig defaultWebConf
+ig
+INFO: No <SPAN class="code-keyword">default</SPAN> web.xml
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
+WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/jsp_2_0.xsd
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
+WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jsptaglibrary_1_
+1.dtd
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
+WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jsptaglibrary_1_
+2.dtd
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
+WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/jsp/resources/web-jsptaglibrary_2_
+0.xsd
+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
+WARNING: Could not get url <SPAN class="code-keyword">for</SPAN> /javax/servlet/resources/j2ee_web_services_1_1.xs
+d
+Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol init
+INFO: Initializing Coyote HTTP/1.1 on http-8085
+Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol start
+INFO: Starting Coyote HTTP/1.1 on http-8085
+Aug 23, 2007 2:27:32 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServl
+etMapping
+INFO: Added Servlet mapping: http:<SPAN class="code-comment">//localhost:8085/HelloWorldService
+</SPAN>Injected helloWorldService
+Called getGreetings
+Aug 23, 2007 2:27:34 PM org.apache.coyote.http11.Http11Protocol destroy
+INFO: Stopping Coyote HTTP/1.1 on http-8085
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.502 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+
+This shows that the Junit test cases have run successfully. 
+
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="Samples-Beta1-distributedosgi"></A>distributed-osgi</H3>
+
+<P>These samples demonstrate the execution of Tuscany contributions in a distributed OSGI environment.</P>
+
+<H4><A name="Samples-Beta1-dosgidynamiccalculator"></A>dosgi-dynamic-calculator</H4>
+
+
+<H4><A name="Samples-Beta1-dosgidynamiccalculatoroperations"></A>dosgi-dynamic-calculator-operations</H4>
+
+
+<H3><A name="Samples-Beta1-implementationbpel"></A>implementation-bpel</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributionhelloworldbpel"></A>contribution-helloworld-bpel</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>check instructions work and fix up</TD></TR></TABLE></DIV>
+<P>This sample demonstrates an SCA service implemented by a BPEL process.</P>
+
+<P>If you just want to run it to see what happens open a command prompt, navigate<BR>
+to this sample directory, and do</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant compile run
+</PRE>
+</DIV></DIV>
+<P>OR if you don't have ant, on Windows do</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mkdir target\classes
+mkdir target\wsdl2java-source
+java \-cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator \-targetDirectory target/wsdl2java-source \-prefix HelloWorld \-noContainment \-noUnsettable src/main/resources/helloworld.wsdl
+java \-cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator \-targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl
+unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip \-d target\database
+javac \-d target\classes \-cp target\classes;..\..\lib\tuscany-sca-manifest.jar \-sourcepath src\main\java;target\wsdl2java-source \-target 1.5 \-g \-source 1.5 src\main\java\helloworld\BPELClient.java
+copy src\main\resources\* target\classes
+java \-cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database helloworld.BPELClient
+</PRE>
+</DIV></DIV>
+<P>and on &#42;nix do</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mkdir target/classes
+mkdir target/wsdl2java-source
+java \-cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator \-targetDirectory target/wsdl2java-source \-prefix HelloWorld \-noContainment \-noUnsettable src/main/resources/helloworld.wsdl
+java \-cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator \-targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl
+unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip \-d target/database
+javac \-d target/classes \-cp target/classes;../../lib/tuscany-sca-manifest.jar \-sourcepath src/main/java;target/wsdl2java-source \-target 1.5 \-g \-source 1.5 src/main/java/helloworld/BPELClient.java
+cp src/main/resources/\* target/classes
+java \-cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database helloworld.BPELClient
+</PRE>
+</DIV></DIV>
+<P>The sample will start an embedded BPEL engine, deploy a process and invoke it.</P>
+
+<P><B>Sample Overview</B></P>
+
+<P>The sample provides a single component that is wired to a service with a<BR>
+web service binding.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+helloworld-bpel/
+src/
+main/
+java/
+helloworld/
+BPELClient.java          	  - client application <SPAN class="code-keyword">for</SPAN>
+BEPELHelloWorldComponent
+
+resources/
+deploy.xml			  - ODE deployment descriptor
+helloworld.bpel		  - helloworld bpel process
+helloworld.componentType	  - helloworld bpel service description
+helloworld.composite            - the SCA assembly <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">this</SPAN> sample
+helloworld.wsdl                 - the service description that describes
+the bpel process
+log4j.properties                - logging configuration
+
+test/
+java/
+helloworld/
+BPELHelloWorldTestCase.java     - JUnit test <SPAN class="code-keyword">case</SPAN>
+helloworld-bpel.png                     - a pictorial representation of the
+sample .composite file
+build.xml                               - the Ant build file
+pom.xml                                 - the Maven build file
+</PRE>
+</DIV></DIV>
+<P><B>Building And Running The Sample Using Ant</B></P>
+
+<P>With the binary distribution the sample can be built and run using Ant as<BR>
+follows</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd helloworld-bpel
+ant compile
+ant run
+</PRE>
+</DIV></DIV>
+<P>You should see the following output from the run target.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+run:
+[java] Starting BPELHelloWorldComponent
+[java] &gt;&gt;&gt; Deploying : D:\temp\SCA1.1-RC1\tuscany-sca-1.1-incubating\samples\helloworld-bpel\target\classes
+[java] ::arg:::::: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+[java] &lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;&lt;message xmlns=&quot;http://tuscany.apache.org/implementation/bpel/exampl
+</SPAN>e/helloworld.wsdl&quot;&gt;Hello&lt;/message&gt;&lt;/hello&gt;
+[java] ::message:: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+[java] &lt;message&gt;&lt;TestPart&gt;&lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;&lt;message xmlns=&quot;http://tuscany.apache.org/impleme
+</SPAN>ntation/bpel/example/helloworld.wsdl&quot;&gt;Hello&lt;/message&gt;&lt;/hello&gt;&lt;/TestPart&gt;&lt;/message&gt;
+[java] Status: RESPONSE
+[java] Response: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+[java] &lt;message&gt;&lt;TestPart&gt;&lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;Hello World&lt;/hello&gt;&lt;/TestPart&gt;&lt;/message&gt;
+</SPAN>[java] Hello World
+[java] Stopping BPELHelloWorldComponent
+[java] Stopped \!\!\!
+
+BUILD SUCCESSFUL
+Total time: 36 seconds
+</PRE>
+</DIV></DIV>
+<P><B>Building And Running The Sample Using Maven</B></P>
+
+<P>With either the binary or source distributions the sample can be built and run<BR>
+using Maven as follows. When using Maven, a simple test is present that exercise<BR>
+the same logic as the client to invoke the BPEl process.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd helloworld-bpel
+mvn
+</PRE>
+</DIV></DIV>
+<P>You should see the following output from the test phase.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+\------------------------------------------------------\-
+T E S T S
+\------------------------------------------------------\-
+Running helloworld.BPELHelloWorldTestCase
+Starting BPELHelloWorldComponent
+&gt;&gt;&gt; Deploying : D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\classes
+::arg:::::: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;&lt;message xmlns=&quot;http://tuscany.apache.org/implementation/bpel/example/helloworld
+</SPAN>.wsdl&quot;&gt;Hello&lt;/message&gt;&lt;/hello&gt;
+::message:: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;message&gt;&lt;TestPart&gt;&lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;&lt;message xmlns=&quot;http://tuscany.apache.org/implementation/bpel
+</SPAN>/example/helloworld.wsdl&quot;&gt;Hello&lt;/message&gt;&lt;/hello&gt;&lt;/TestPart&gt;&lt;/message&gt;
+Status: RESPONSE
+Response: &lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;message&gt;&lt;TestPart&gt;&lt;hello xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;Hello World&lt;/hello&gt;&lt;/TestPart&gt;&lt;/message&gt;
+</SPAN>Stopping BPELHelloWorldComponent
+Stopped \!\!\!
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.656 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+[INFO] [jar:jar]
+[INFO] Building jar: D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar
+[INFO] [install:install]
+[INFO] Installing D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar to C:\Documents and Settings\lresend
+e\.m2\repository\org\apache\tuscany\sca\sample-helloworld-bpel\1.1-incubating-SNAPSHOT\sample-helloworld-bpel-1.1-incubating-SNAPSHOT.jar
+[INFO] \-----------------------------------------------------------------------\-
+[INFO] BUILD SUCCESSFUL
+[INFO] \-----------------------------------------------------------------------\-
+[INFO] Total time: 53 seconds
+[INFO] Finished at: Sun Jan 13 09:54:39 PST 2008
+[INFO] Final Memory: 24M/43M
+[INFO] \-----------------------------------------------------------------------\-
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+</PRE>
+</DIV></DIV>
+
+<P>This shows that the Junit test cases have run successfully.</P>
+
+<H4><A name="Samples-Beta1-helloworldbpelwebapp"></A>helloworld-bpel-webapp</H4>
+
+<H3><A name="Samples-Beta1-implementationcomposite"></A>implementation-composite</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-helloworldrecursive"></A>helloworld-recursive</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR>Understand and Document</TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-helloworldrecursivews"></A>helloworld-recursive-ws</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-implementationextension"></A>implementation-extension</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-implementationjava"></A>implementation-java</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributioncalculator"></A>contribution-calculator</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-implementation.osgi"></A>implementation.osgi</H3>
+
+<H4><A name="Samples-Beta1-dosgicalculator"></A>dosgi-calculator</H4>
+
+
+<H4><A name="Samples-Beta1-dosgicalculatoroperations"></A>dosgi-calculator-operations</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-implementationscript"></A>implementation-script</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributioncalculator"></A>contribution-calculator</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-implementationspring"></A>implementation-spring</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-contributionhelloworldspring"></A>contribution-helloworld-spring</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-helloworldspringwebapp"></A>helloworld-spring-webapp</H4>
+
+<H3><A name="Samples-Beta1-implementationwebapp"></A>implementation-webapp</H3>
+
+<H4><A name="Samples-Beta1-helloworldjaxrswebapp"></A>helloworld-jaxrs-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldjmswebapp"></A>helloworld-jms-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldjsclientwebapp"></A>helloworld-js-client-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldjsfwebapp"></A>helloworld-jsf-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldjspwebapp"></A>helloworld-jsp-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldservletwebapp"></A>helloworld-servlet-webapp</H4>
+
+
+<H4><A name="Samples-Beta1-helloworldstripeswebapp"></A>helloworld-stripes-webapp</H4>
+
+<H3><A name="Samples-Beta1-loggingscribe"></A>logging-scribe</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-mavenosgijunit"></A>maven-osgi-junit</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-calculatorosgi"></A>calculator-osgi</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-calculatorrestosgi"></A>calculator-rest-osgi</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-scaclient"></A>sca-client</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-calculatorscaclient"></A>calculator-scaclient</H4>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H4><A name="Samples-Beta1-helloworldscaclient"></A>helloworld-scaclient</H4>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H2><A name="Samples-Beta1-applications"></A>applications</H2>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-store"></A>store</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+
+<H3><A name="Samples-Beta1-storewebapp"></A>store-webapp</H3>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>TODO</B><BR><FONT color="#000000">Understand and Document</FONT></TD></TR></TABLE></DIV>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="20-beta-samples-documentation.html" title="2.0-beta-Samples documentation">2.0-beta-Samples documentation</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v3.0 Documentation : Samples- Beta1';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/samples.html b/site/trunk/site-publish/documentation-2x/samples.html
new file mode 100644
index 0000000000..ecb8d36f65
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/samples.html
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Samples : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="" title="Samples">Samples</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="getting-started.html" title="Getting Started">Getting Started</A>&nbsp;&gt;&nbsp;<A href="" title="Samples">Samples</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Samples</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337713">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=23337713">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="Samples-"></A><FONT color="#003366"><B>Tuscany Samples</B></FONT></H1>
+
+<P>The Tuscany samples are shipped with Tuscany binary and source releases. To make sure that you're looking at the documentation that matches the distribution you have downloaded select the appropriate link below:</P>
+
+<P><A href="20-beta-samples-documentation.html" title="2.0-beta-Samples documentation">2.0-Beta1 samples documentation</A></P>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="20-beta-samples-documentation.html" title="2.0-beta-Samples documentation">2.0-beta-Samples documentation</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Samples';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg b/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg
new file mode 100644
index 0000000000..4c1ea05f6d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg.jpeg b/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg.jpeg
new file mode 100644
index 0000000000..b0e371f303
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/calc.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png b/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/component.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg b/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg
new file mode 100644
index 0000000000..587094badc
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg.jpeg b/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg.jpeg
new file mode 100644
index 0000000000..829bd77110
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.data/domain.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-introduction.html b/site/trunk/site-publish/documentation-2x/sca-introduction.html
new file mode 100644
index 0000000000..717163f95b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-introduction.html
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Introduction : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Introduction">SCA Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Introduction">SCA Introduction</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <UL>
+	<LI><A href="#SCAIntroduction-whatisSCA">What is SCA?</A></LI>
+	<LI><A href="#SCAIntroduction-scacomponent">SCA Component</A></LI>
+	<LI><A href="#SCAIntroduction-scawire">SCA Wire</A></LI>
+	<LI><A href="#SCAIntroduction-scacomposite">SCA Composite</A></LI>
+	<LI><A href="#SCAIntroduction-scacontribution">SCA Contribution</A></LI>
+	<LI><A href="#SCAIntroduction-scadomain">SCA Domain</A></LI>
+	<LI><A href="#SCAIntroduction-scabinding">SCA Binding</A></LI>
+	<LI><A href="#SCAIntroduction-scapolicy">SCA Policy</A></LI>
+</UL>
+
+
+<H2><A name="SCAIntroduction-WhatisSCA%3F"></A><A name="SCAIntroduction-whatisSCA"></A>What is SCA?</H2>
+<P>SCA is a standard programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Now let's talk about SCA building blocks and concepts.</P>
+
+<H2><A name="SCAIntroduction-SCAComponent"></A><A name="SCAIntroduction-scacomponent"></A>SCA Component</H2>
+
+<P>The basic building block for SCA is a component. It is the abstraction of a given business function. A component is described with the following attributes:</P>
+
+<UL>
+	<LI><B>Service:</B> Describes the functions that this type of component provides. A component can offer one ore more services. A service is an interface.</LI>
+	<LI><B>Reference:</B> This describes the dependencies this type of component has in order to function. A reference is an interface.</LI>
+	<LI><B>Property:</B> This defines configuration parameters that can controls how the business function can behave. For example, what currency to use for an account component.</LI>
+	<LI><B>Intent policies:</B> This describes assumptions on how the component will behave. There are two types of policies.
+	<UL>
+		<LI>Implementation policy- Impact the behavior of an implementation. For example, transaction, monitor and logging</LI>
+		<LI>Interaction policy - defines how the components behave with one another. For example, security.</LI>
+	</UL>
+	</LI>
+	<LI><B>Implementation:</B>  Every component has some implementation associated with it. This can be a new business logic or an existing one that is now being used in the assembly.  A business logic can handle different operations and some of which are exposed externally as callable services.  Component implementation can be in any technology, for example for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.</LI>
+</UL>
+
+
+<P>This is demonstrated below.<BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-introduction.data/component.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The implementation of a component can be in any language that is suitable for the user, for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.  </P>
+
+<H2><A name="SCAIntroduction-SCAWire"></A><A name="SCAIntroduction-scawire"></A>SCA Wire</H2>
+
+<P>As mentioned above, an SCA component may have zero or more references. Refrences in SCA define how SCA components invoke services. The relationship between a reference and a service is typically demonstrated through a line in a SCA diagrams and is referred to as a wire. </P>
+
+<P>The term wire can at the begining seem confusing because you may ask how a wire is realized. There is no physical definition for a wire, it is really derived from the relationship between a Service and its refrence(s) at runtime. This is realized through dependency injection in Tuscany. </P>
+
+
+<H2><A name="SCAIntroduction-SCAComposite"></A><A name="SCAIntroduction-scacomposite"></A>SCA Composite</H2>
+
+<P>An SCA composite consists of components, services, references, and wires that connect them. A composite is the unit of deployment for SCA.<BR>
+A composite can be viewed as a component whose implementation is not code but an aggregation of one or more components co-operating to provide higher level services. Think of composite as a solution, for example a credit check composite may consist of multiple components that together perform the credit checking work. A composite can also be used within a larger solution, for example credit check can be part of a order processing composite. A composite has the same charactersitics as a component. It provides Services, has References to other dependencies, and can be configured using Properties and can have intent policies in just the same way as an individual components can. In thise case, attributes of some of the components that are embedded in the composite get 'promoted' and becom the attribute of the composite. In the example below, you see a calculator composite which consists of 5 components, a calculator service has references to four components:Add, Subtract, Multiply and Divide.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-introduction.data/calc.jpg" style="border: 0px solid black"></SPAN><BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The assembly or wiring is defined in .composite file through Service Component Definition Language (SCDL) that is in XML. For example, calculator.composite would define that calculator component references the other four components.</P>
+
+<H2><A name="SCAIntroduction-SCAContribution"></A><A name="SCAIntroduction-scacontribution"></A>SCA Contribution</H2>
+
+<P>The artifacts that make up a solution get packaged into what is called a contribution. A contribution can take a number of different forms.  For example, it could be a jar file, or it could be a directory tree on the file system. A contribution can contain composites, java classes, BPEL processes, XSD files, wsdl files, etc. An SCA application can be divided into multiple contributions with dependencies between them. In general, some services depend closely on other services and it makes sense to package them together.  If services are more independent it is best to package them separately so that they can be reused in different contexts. A contribution is a deployable unit. A solution may require multiple contributions that share artifacts and artifacts can be shared between (imported) between contributions.</P>
+
+<H2><A name="SCAIntroduction-SCADomain"></A><A name="SCAIntroduction-scadomain"></A>SCA Domain</H2>
+
+<P>Contribution packages get contributed to what is called SCA domain which is the scope of adminstration at runtime. An SCA Domain represents a complete runtime configuration, potentially distributed over a series of interconnected runtime nodes and is a logical view of the running applications or a coherent grouping of components that are working together. An SCA Domain typically represents an area of business functionality controlled by a single organization. For example, an SCA Domain may be the whole of a business, or it may be a department within a business.</P>
+
+<P>Therefore, an SCA domain consists of the definitions of composites, components, their implementations, <B>and the nodes</B> on which they run. Components deployed into a domain can directly wire to other components within the same domain. Communication with services outside of a domain is done through bindings. </P>
+
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services. However, during development one is not concerned with all this. The code is packaged and made available for deployment. Tuscany SCA Java supports contributions in the form of JAR or filesystem. </P>
+
+<P>Below is an example of domain with two contributions.<BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-introduction.data/domain.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="SCAIntroduction-SCABinding"></A><A name="SCAIntroduction-scabinding"></A>SCA Binding</H2>
+<P>A binding is used as a means of communication between services and handles the protocols. It defines with what communication method a service can be accessed with or with what communication method it can will access other services.  There can be different types of bindings depending on technologies used to develop a solution. For example JMS binding, Webservices binding, Atom binding for web20 interaction, etc. </P>
+
+<P>Services can be configured with different bindings and there can be multiple bindings for a service.  Bindings for the services and references get defined declaratively in the .composite file. There is a default binding called binding.sca which when used leaves the choice of binding to the underlying infrastructure by default.</P>
+
+<P>The declarative bindings and the abstraction of protocols from business logic brings agility to SCA applications. This allows SCA applications to be purely focused on business logic and not be contaminated with protocol handling information. It also enables the SCA compositions to grow or change without code modification while also working with applications that are not enabled with SCA.</P>
+
+
+<H2><A name="SCAIntroduction-SCAPolicy"></A><A name="SCAIntroduction-scapolciy"></A>SCA Policy</H2>
+<P>An enterprise application requires control beyond the business functional capability which can include how security is handled in the enterprise or what transactional capability should be applied to services that are offered. SCA policies define the constraints or capabilities that get applied to services and their interaction. Two types of policies are defined in SCA.</P>
+<UL>
+	<LI>Interaction Policies - Define the policies that influence interaction of services for example whether authentication is required or not.</LI>
+	<LI>Implementation Policies - Define how the components behave at runtime for example whether it is transactional or not.</LI>
+</UL>
+
+
+<P>SCA mechanisms for defining policies such as intents and policySets can only be used in the context of a single domain. The fact that policies can be defined declaratively make applications adaptive to the environment that they get deployed into or to changes in the business requirements. <BR>
+For more information about policy check out the <A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf" class="external-link" rel="nofollow">sca policy framework specification</A>version=1]</P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Introduction';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingatom.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingatom.html
new file mode 100644
index 0000000000..a8cd6b593d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingatom.html
@@ -0,0 +1,575 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.atom : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.atom">SCA Java binding.atom</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.atom">SCA Java binding.atom</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.atom</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964961">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964961">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964961">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964961">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964961">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964961">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavabinding.atom-%3Cbinding.atom%3EIntroduction"></A>&lt;binding.atom&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Atom using the &lt;binding.atom&gt; extension. Tuscany can communicate with services that provide or consume items described in the Atom Syndication Format and Atom Publishing Protocol. The Atom protcol is an additional conceptual layer that operates on top of the Hyper Text Transfer Protocol, so it is useful to understand that underlying protocol as well. Reference materials on these specifications is available here.</P>
+
+<UL>
+	<LI><A href="http://tools.ietf.org/html/rfc2616" class="external-link" rel="nofollow">Hyper Text Transfer Protocol</A>.</LI>
+	<LI><A href="http://tools.ietf.org/html/rfc4287" class="external-link" rel="nofollow">Atom Syndication Format</A>.</LI>
+	<LI><A href="http://tools.ietf.org/html/rfc5023" class="external-link" rel="nofollow">Atom Publishing Protocol</A>.</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Some of the function described here is included in the Tuscany 1.3.2 and 1.4 releases. The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A>.</P>
+
+
+<H3><A name="SCAJavabinding.atom-UsingtheTuscanyAtombinding"></A>Using the Tuscany Atom binding</H3>
+
+<P>The primary use of the Atom binding is to provide support for collections that can be shared in a distributed fashion. Examples of shared collections includes shopping carts, telephone directories, insurance forms, and blog sites. These collections of items can be added, retrieved, updated, and deleted using the 4 basic actions of the HTTP protocol:</P>
+<UL>
+	<LI>POST (create or add)</LI>
+	<LI>GET (retreive or query)</LI>
+	<LI>PUT (update)</LI>
+	<LI>DELETE (destroy or remove</LI>
+</UL>
+
+
+<P>The simplest way to use the Atom binding is to declare a collection as a service and provide an HTTP address where one can access the service. This service is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	&lt;service name=<SPAN class="code-quote">&quot;customer&quot;</SPAN> promote=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+		&lt;tuscany:binding.atom uri = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/customer&quot;</SPAN>/&gt;
+</SPAN>	&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The service can be implemented in Java or any of the the Tuscany implementation types. For example, here is a way to create an implmentation for the above CustomerCollection service in the Java type.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.atom.CustomerCollectionImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>A collection that uses the Atom binding usually implements the Collection interface given in the package org.apache.tuscany.sca.binding.atom.collection. This interface declares the basic access methods mentioned above (post, get, put, and delete), and the data types on the methods are expressed as Atom type objects Feed and Entry. In other words, one can view the collection as an Atom Feed, and manipulate items in the Feed as Atom Entries. This shows the basic methods of the Atom Collection intergface in Tuscany:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Collection {
+
+    Entry post(Entry entry);
+    Entry get(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+    void put(<SPAN class="code-object">String</SPAN> id, Entry entry) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+    void delete(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+
+    Feed getFeed();
+    Feed query(<SPAN class="code-object">String</SPAN> queryString);
+}
+</PRE>
+</DIV></DIV>
+
+<P>It is up to the developer or implementer of the shopping cart, telephone directory, or blog site to provide the code that implements the Collection interface. The developer or implementor also provides the code that translates from the business objects (shopping cart items, directory entries, insurance forms, blog articles) to the Atom model objects Feed and Entry.</P>
+
+<P>One of the features of using this binding is that your business objects (shopping cart items, directory entries, insurance forms, and blog articles) can now be easily published and shared by the many Atom supporting tools such as feed readers, web browsers, and syndication aggregation. In other words, people can access your collection most anywhere on any device.</P>
+
+<H3><A name="SCAJavabinding.atom-Example"></A>Example</H3>
+
+<P>Continuing with the CustomerCollection example shown above, let's see how one of the common access methods. In this case, let's look at the post method and how one would add a new item to the collection. When you declared your Atom binding in your SCA composite, you also provided a uri for your collection. Using a web browser or other device, a user performs an HTTP put request to this uri, with the body of the put containing the data. Tuscany SCA performs the task of invoking the correct service and finding the Java implementation for your collection and calling the correct method. </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    <SPAN class="code-keyword">public</SPAN> Entry post(Entry entry) {
+       <SPAN class="code-comment">// 1. Validate entry fields
+</SPAN>       <SPAN class="code-keyword">if</SPAN> (entry.getTitle() != <SPAN class="code-keyword">null</SPAN> ) {
+          entryID = <SPAN class="code-quote">&quot;tag:&quot;</SPAN> + site <SPAN class="code-quote">&quot;,&quot;</SPAN> + todaysDate + <SPAN class="code-quote">&quot;:&quot;</SPAN> + title;
+          entry.setID( entryID );
+       }
+       <SPAN class="code-comment">// 2. Provide any additional data.
+</SPAN>       entry.setUpdated( <SPAN class="code-keyword">new</SPAN> Date() );
+       <SPAN class="code-comment">// 3. Store data in local collection or data base.
+</SPAN>       entries.put(id, entry);
+       <SPAN class="code-comment">// 4. Return entry to poster.
+</SPAN>       <SPAN class="code-keyword">return</SPAN> entry;
+    }
+</PRE>
+</DIV></DIV>
+
+<P>Much of the code consists of converting from a Feed or Entry to a business data model and storing to a collection.</P>
+
+<P>Tuscany uses the Apache Abdera project to provide a model for Atom data. Please see <A href="http://incubator.apache.org/abdera/" class="external-link" rel="nofollow">Apache Abdera</A> for the Java method to access Atom Feeds and Entries, and how to easily convert these Java objects to and from XML.</P>
+
+<H3><A name="SCAJavabinding.atom-OtherFeaturesoftheTuscanyAtomBinding"></A>Other Features of the Tuscany Atom Binding</H3>
+
+<P>More advanced features of the Tuscany Atom binding are described below.</P>
+
+<H4><A name="SCAJavabinding.atom-DataCachingusingETags%2CLastModified%2CandotherHeaderCommands"></A>Data Caching using ETags, Last-Modified, and other Header Commands</H4>
+
+<P>Atom feeds and entries can often be very large pieces of data. Since Tuscany uses the Atom data binding as one of its supported bindings, there is the potential that many requests for data may have large pieces of data associated with a request.</P>
+
+<P>Hyper Text Transfer Protocol (HTTP), the basis of the web, has support to help limit or cache the amount of data shared between a client and server by adding tags to a resource reques. These header tags are the ETag and the Last-Modified tags. When used with a predicate tag such as If-Match, If-Not-Match, If-Modified-Since, If-Unmodified-Since, etc., the client and the server can avoid shipping large pieces of data when updated data is not needed. </P>
+
+<P>The following entry scenarios show how Tuscany supports this form of caching throught ETags, Last-Modified, and other Header Commands.</P>
+
+<UL>
+	<LI>Posting new entry data to a feed<BR>
+  (Show entry data post request, item does not exist on server, server response code 200, return entry data body)</LI>
+	<LI>Updating existing entry data in a feed<BR>
+  (Show data update put, If-Match precondition, item is newer and matching, matching return code 412)</LI>
+	<LI>Requesting existing entry data<BR>
+  (Show get via ETag, If-None-Match precondition, modified entry data item, matching entry body returned)	</LI>
+	<LI>Requesting stale entry data<BR>
+  (Show get via ETAG, If-None-Match precondition, unmodified entry data item, not modified return code 304)</LI>
+	<LI>Requesting up-to-date entry data<BR>
+  (Show request via last-modified date, entry data is unmodified, Not modified return code 304)</LI>
+	<LI>Requesting out-of-date entry data<BR>
+  (Show request via last-modified date, entry data is modified, updated data is returned)</LI>
+</UL>
+
+
+<P>Tuscany provides a test case ProviderEntryEntityTagsTest.java in module binding.atom.abdera that validates these Entry caching scenarios via JTest. Additionally, the following Feed scenarios are provided in the test case ProviderFeedEntityTagsTest.java.</P>
+
+<UL>
+	<LI>Test feed basics<BR>
+   (Request Atom feed. Check that feed is non-null, has Id, title, and updated values. Check for Etag and Last-Modified headers)</LI>
+	<LI>Test Unmodified If-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-Match predicate in request header. Expect status 200 and feed body.)</LI>
+	<LI>Test Unmodified If-None-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-None-Match predicate in request header. Expect status 304, item not modified, no feed body.)</LI>
+	<LI>Test Unmodified If-Unmodified-Since predicate<BR>
+   (Request feed based on very current Last-Modified. Use If-Unmodified-Since predicate in request header. Expect status 304, item not modified, no feed body.)</LI>
+	<LI>Test Unmodified If-Modified-Since predicate<BR>
+   (Request feed based on very old Last-Modified. Use If-Modified-Since predicate in request header. Expect status 200, feed in body.)</LI>
+	<LI>Test Modified If-None-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-None-Match predicate in request header. Expect status 200, feed in body.)</LI>
+	<LI>Test Modified If-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-Match predicate in request header. Expect status 412, precondition failed, no feed in body.)</LI>
+	<LI>Test Modified If-UnModified-Since predicate<BR>
+   (Request feed based on very recent Last-Mod date. Use If-Unmodified-Since predicate in request header. Expect status 304, no feed in body.)</LI>
+	<LI>Test Modified If-Modified-Since predicate<BR>
+   (Request feed based on very old Last-Mod date. Use If-Modified-Since predicate in request header. Expect status 200, feed in body.)</LI>
+</UL>
+
+
+<P>Support of Web 2.0 data caching via ETags and Last-Modified fields allow the Tuscany user to save bandwidth and re-requests of data. Especially in the area of content feeds which can have very large data objects, the ability to cache improves server performance and reduces network bottlenecks. A full end-to-end demonstration of this network savings is being created via Jira TUSCANY-2537 which will show caching in the feed aggregator sample.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforNegotiatedContentTypes"></A>Support for Negotiated Content Types</H4>
+
+<P>Requests for data now respond with negotiated content types. In other words, the requester can now state which content types are preferred, and the responder can provide different content types. The data preference is expressed in the request header &quot;Accept&quot; parameter.</P>
+
+<P>These data binding types are supported:</P>
+<UL>
+	<LI>Atom XML format (Request header Accept=application/atom+xml)</LI>
+	<LI>Atom in JSON format (Request header Accept=application/atom+json)</LI>
+</UL>
+
+
+<P>The following content types are requestable in different data bindings</P>
+<UL>
+	<LI>Atom entry data (MIME type application/atom+xxx;type=entry where xxx=xml or json)</LI>
+	<LI>Atom feed data (MIME type application/atom+xxx;type=feed where xxx=xml or json)</LI>
+</UL>
+
+
+<P>For example, the requester asks for an Atom entry with no Accept header or Accept header value is application/atom+xml. The returned response body contains:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Atom Entry response body as XML</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version='1.0' encoding='UTF-8'?&gt;
+&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>  &lt;title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;customer Fred Farkle&lt;/title&gt;
+  &lt;updated&gt;2008-08-08T18:40:30.484Z&lt;/updated&gt;
+  &lt;author&gt;
+    &lt;name&gt;Apache Tuscany&lt;/name&gt;
+  &lt;/author&gt;
+  &lt;content type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;Fred Farkle&lt;/content&gt;
+  &lt;id&gt;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&lt;/id&gt;
+  &lt;link href=<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN> rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN> /&gt;
+  &lt;link href=<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN> rel=<SPAN class="code-quote">&quot;alternate&quot;</SPAN> /&gt;
+&lt;/entry&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>In contrast, the requester asks for an Atom entry with Accept header value is application/atom+json. The returned response body contains:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Atom Entry response body as JSON</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{
+ <SPAN class="code-quote">&quot;id&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;title&quot;</SPAN>:<SPAN class="code-quote">&quot;customer Fred Farkle&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;content&quot;</SPAN>:<SPAN class="code-quote">&quot;Fred Farkle&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;updated&quot;</SPAN>:<SPAN class="code-quote">&quot;2008-08-08T18:40:30.484Z&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;authors&quot;</SPAN>:[{
+   <SPAN class="code-quote">&quot;name&quot;</SPAN>:<SPAN class="code-quote">&quot;Apache Tuscany&quot;</SPAN>
+  }
+ ],
+ <SPAN class="code-quote">&quot;links&quot;</SPAN>:[{
+   <SPAN class="code-quote">&quot;href&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+   <SPAN class="code-quote">&quot;rel&quot;</SPAN>:<SPAN class="code-quote">&quot;edit&quot;</SPAN>
+  },{
+   <SPAN class="code-quote">&quot;href&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+   <SPAN class="code-quote">&quot;rel&quot;</SPAN>:<SPAN class="code-quote">&quot;alternate&quot;</SPAN>
+  }
+ ]
+}
+</PRE>
+</DIV></DIV> 
+
+<P>The ability to  view entires and feeds in multiple data formats allows the Tuscany user extreme flexibility in parsing and processing data returned by a service or collection.</P>
+
+<H4><A name="SCAJavabinding.atom-ServiceandWorkspaceDocumentSupport%28application%2Fatomsvcxml%29"></A>Service and Workspace Document Support (application/atomsvc+xml)</H4>
+
+<P>Prior to this implementation, there was a dummy service document provided when you visited an Atom feed service address with an &quot;atomsvc&quot; extension. For example, running the the Atom service binding unit tests, one could visit <A href="http://localhost:8080/customer/atomsvc" class="external-link" rel="nofollow">http://localhost:8080/customer/atomsvc</A> and receive the following service document:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany Atom Binding Dummy Service document</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;?xml version='1.0' encoding='UTF-8'?&gt;
+   &lt;service xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2007/app&quot;</SPAN> xmlns:atom=<SPAN class="code-quote">&quot;http://www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>      &lt;workspace&gt;
+         &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;resource&lt;/atom:title&gt;
+         &lt;collection href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//luck.ibm.com:8084/customer&quot;</SPAN>&gt;
+</SPAN>            &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;collection&lt;/atom:title&gt;
+            &lt;accept&gt;application/atom+xml;type=entry&lt;/accept&gt;
+            &lt;categories /&gt;
+         &lt;/collection&gt;
+      &lt;/workspace&gt;
+   &lt;/service&gt;
+</PRE>
+</DIV></DIV>
+<P>This dummy implementation did not provide a true collection name, URL to the collection, accept MIME types or categories.</P>
+
+<P>Following the inclusion of TUSCANY-2597 and the new implentation, the Tuscany Atom binding  will correctly populate an atomsvc document with information from the feed and give correct information for discovery. Now , running the the Atom service binding unit tests, one could visit <A href="http://localhost:8080/customer/atomsvc" class="external-link" rel="nofollow">http://localhost:8080/customer/atomsvc</A> and receive the following service document:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany Atom Binding Service document</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version='1.0' encoding='UTF-8'?&gt;
+&lt;service xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2007/app&quot;</SPAN> xmlns:atom=<SPAN class="code-quote">&quot;http://www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>  &lt;workspace xml:base=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/&quot;</SPAN>&gt;
+</SPAN>    &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;workspace&lt;/atom:title&gt;
+    &lt;collection href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/customer&quot;</SPAN>&gt;
+</SPAN>      &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;customers&lt;/atom:title&gt;
+      &lt;accept&gt;application/atom+xml; type=feed&lt;/accept&gt;
+      &lt;accept&gt;application/json; type=feed&lt;/accept&gt;
+      &lt;accept&gt;application/atom+xml; type=entry&lt;/accept&gt;
+      &lt;accept&gt;application/json; type=entry&lt;/accept&gt;
+      &lt;categories /&gt;
+    &lt;/collection&gt;
+  &lt;/workspace&gt;
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The service document is now properly populated with URLs, titles, accept MIME types and categories. These are elements that are needed for collection discovery and visitatin.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforfullJavaScriptAtomclient."></A>Support for full JavaScript Atom client.</H4>
+<P><A name="SCAJavabinding.atom-JavaScriptAtomClient"></A><BR>
+After creating and publishing your SCA service, it can be tedious converting to and from Atom Feeds and Entries on the client side. Tuscany provides a full JavaScript object model for Atom Feeds, Entries, and other data objects. This benefits customers and client developers by providing an easy model to use in HTML, JSP, scripts, GUIs, and other client side technology.</P>
+
+<P>For example, prior to this feature, developers would have to develop code in XML to manipulate nodes in the XML document that represented the current page:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany client side XML Document Manipulation (old style)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);              
+   <SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+   <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+      <SPAN class="code-keyword">var</SPAN> item = entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0].firstChild.nodeValue;
+      list += item + ' &lt;br&gt;';
+   }
+</PRE>
+</DIV></DIV>
+
+<P>Using the new JavaScript client object model, the code is greatly simplified and easier to understand:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany client side JavaScript Atom Object Model (new style)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> entries = feed.getEntries();              
+   <SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+   <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+      <SPAN class="code-keyword">var</SPAN> item = entries[i].getContent();
+      list += item + ' &lt;br&gt;';
+   }
+</PRE>
+</DIV></DIV>
+
+<P>Additionally, the Tuscany Atom JavaScript client provides full deserialization and serialization to and from the JavaScript Atom model and its XML format. In other words let's say you create an HTML page that scrapes a data base and wants to submit the data as an entry to a collection of blog articles. You can create the Entry data using the JavaScript Entry model:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+       <SPAN class="code-keyword">var</SPAN> entry = <SPAN class="code-keyword">new</SPAN> Entry();
+       entry.setNamespace( <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN> );
+</SPAN>       entry.setTitle( <SPAN class="code-quote">&quot;Atom-Powered Robots Run Amok&quot;</SPAN> );
+       entry.setId( <SPAN class="code-quote">&quot;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&quot;</SPAN> );
+       entry.setUpdated( <SPAN class="code-quote">&quot;2003-12-13T18:30:02Z&quot;</SPAN> );
+       entry.setContent( <SPAN class="code-quote">&quot;Some text.&quot;</SPAN> );
+       entry.addAuthor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;John Doe&quot;</SPAN> ) );
+       entry.addAuthor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Mark Pilgrim&quot;</SPAN>, <SPAN class="code-quote">&quot;f8dy@example.com&quot;</SPAN> ));
+       entry.addContributor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Sam Ruby&quot;</SPAN> ));
+       entry.addContributor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Joe Gregorio&quot;</SPAN> ));
+       entry.addLink( <SPAN class="code-keyword">new</SPAN> Link( <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/edit/first-post.atom&quot;</SPAN>, <SPAN class="code-quote">&quot;edit&quot;</SPAN> ));</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Now to convert this code to XML and submit it to a site is easy using the Tuscany Atom JavaScript client:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+       <SPAN class="code-keyword">var</SPAN> text = entry.toXML();
+</PRE>
+</DIV></DIV>
+
+<P>The text string now contains the fully serialized XML format of the Entry object</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+      <SPAN class="code-quote">&quot;&lt;?xml version=&quot;</SPAN>1.0&quot;?&gt;
+      &lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>        &lt;title&gt;Atom-Powered Robots Run Amok&lt;/title&gt;
+        &lt;id&gt;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&lt;/id&gt;
+        &lt;updated&gt;2003-12-13T18:30:02Z&lt;/updated&gt;
+        &lt;author&gt;&lt;name&gt;John Doe&lt;/name&gt;&lt;/author&gt;
+        &lt;content&gt;Some text.&lt;/content&gt;
+        &lt;link rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN> href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/edit/first-post.atom&quot;</SPAN>/&gt;
+</SPAN>      &lt;/entry&gt;&quot;
+</PRE>
+</DIV></DIV>
+
+<P>Similarly the Tuscany Atom JavaScript client contains methods for deserializing from XML reperesentations to a JavaScript Atom model:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> feed = <SPAN class="code-keyword">new</SPAN> Feed();
+   feed.readFromXML( xmlString );
+</PRE>
+</DIV></DIV>
+
+<P>A full example showing how to use this client model is given in implementation-widgets-runtime. The store.html page shows the older style of document XML manipulation. The storeJS.html page shows the newer style of JavaScript object manipulation.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforPostingandPuttingMediaItems"></A>Support for Posting and Putting Media Items</H4>
+<P>The Atom Publishing Protocol provides for a separate space for storage of media resources. The purpose of a separate space for these resources is to keep feeds and entries from growing too large with the contents of typically large items. Media resources can be any binary object that is supported by a MIME type, but typically media resources include video, image, and audio type files.</P>
+
+<P>Media resources are maintained by the collection implementor, and are given a dual identity. There is a location in the media respository, typically where one places the media files, and there is a location in the feed or entry space. This second reference is known as a media link entry.</P>
+
+<P>The Tuscany package at org.apache.tuscany.sca.binding.atom.collection (in tuscany-binding-atom-abdera package) has the following interface for MediaCollection:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany MediaCollection interface</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   /**
+     * Creates a <SPAN class="code-keyword">new</SPAN> media entry
+     * 
+     * @param title
+     * @param slug
+     * @param contentType
+     * @param media
+     */
+    Entry postMedia(<SPAN class="code-object">String</SPAN> title, <SPAN class="code-object">String</SPAN> slug, <SPAN class="code-object">String</SPAN> contentType, InputStream media);
+
+    /**
+     * Update a media entry.
+     * 
+     * @param id
+     * @param contentType
+     * @param media
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    void putMedia(<SPAN class="code-object">String</SPAN> id, <SPAN class="code-object">String</SPAN> contentType, InputStream media) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+</PRE>
+</DIV></DIV>
+
+<P>These two methods are used to create (post) new media files, and update (put) new media information and edits. The media resources may be retrieved (get) or removed (delete) via the normal HTTP get and delete operations and the links returned by the post and get methods.</P>
+
+<P>For instance, when creating a media resource, one typically posts the following information via an HTTP post request:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Requesting New Media Creation (postMedia method invoke)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+POST /edit/ HTTP/1.1
+Host: media.example.org
+Content-Type: image/png
+Slug: The Beach
+Authorization: Basic ZGFmZnk6c2VjZXJldA==
+Content-Length: nnn
+...binary data...
+</PRE>
+</DIV></DIV>
+
+<P>In turn, the Tuscany invocation framework invokes the postMedia shown above on the media collection implementation. The media collection implementation may then take the binary data from the media InputStream and store it to a media repository. The media collection implemenation should construct a proper Entry item via XML construction or some Atom model framework such as Apache Abdera. The Entry should contain the required elements (title, id, updated, summary, content, edit link, edit-media link) in order to provide the proper Atom Pub Protocol return headers and Entry data as given here:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Affirming New Media Creation (postMedia method return)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+HTTP/1.1 201 Created
+Content-Length: nnn
+Content-Type: application/atom+xml;type=entry;charset=<SPAN class="code-quote">&quot;utf-8&quot;</SPAN>
+Location: http:<SPAN class="code-comment">//example.org/media/edit/the_beach.atom
+</SPAN>&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN>?&gt;
+&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>   &lt;title&gt;The Beach&lt;/title&gt;
+   &lt;id&gt;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&lt;/id&gt;
+   &lt;updated&gt;2005-10-07T17:17:08Z&lt;/updated&gt;
+   &lt;author&gt;&lt;name&gt;Daffy&lt;/name&gt;&lt;/author&gt;
+   &lt;summary type=<SPAN class="code-quote">&quot;text&quot;</SPAN> /&gt;
+   &lt;content type=<SPAN class="code-quote">&quot;image/png&quot;</SPAN>
+      src=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//media.example.org/the_beach.png&quot;</SPAN>/&gt;
+</SPAN>   &lt;link rel=<SPAN class="code-quote">&quot;edit-media&quot;</SPAN>
+      href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//media.example.org/edit/the_beach.png&quot;</SPAN> /&gt;
+</SPAN>   &lt;link rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN>
+      href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/media/edit/the_beach.atom&quot;</SPAN> /&gt;
+</SPAN>&lt;/entry&gt; 
+</PRE>
+</DIV></DIV>
+
+<P>Note that the edit link provides the Atom Feed link to the media entry, and the edit-media link provides the media repository link to the media entry. Use these links to get and delete media.</P>
+
+<P>A special convention has been implemented to allow the media collection implementation to return properties in the response header. The summary element of the Entry returned may contain a set of key=value properties separated via commas. For example, in order to provide return Content-Type and Content-Length values in the response header, one can created this text in the postMedia Entry summary element: <TT>Content-Type=image/jpg,Content-Length=21642</TT>.</P>
+
+<P>The putMedia method acts in much the same way, but the URI to the item should contain an ID to the media being updated. For instance, if the usual post and get feed URI is <TT><A href="http://localhost:8084/receipt" class="external-link" rel="nofollow">http://localhost:8084/receipt</A></TT>, then to update the media given above one would put to the URI <TT><A href="http://localhost:8084/receipt/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" class="external-link" rel="nofollow">http://localhost:8084/receipt/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</A></TT>. Here is an example of a put request:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Requesting Media Update (putMedia method invoke)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+PUT /edit/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a HTTP/1.1
+Host: media.example.org
+Content-Type: image/png
+Authorization: Basic ZGFmZnk6c2VjZXJldA==
+Content-Length: nnn 
+...binary data...
+</PRE>
+</DIV></DIV>
+
+<P>After the above put request, the Atom binding will invoke the media collection implementation putMedia method. The media collection should update the media if the ID exists (and a 200 OK status code will return), or the media collection should throw a NotFoundException if the ID does not exist (and a 404 not found status code will return).</P>
+
+<P>The above scenarios are documents in the MediaCollectionTestCase unit test case in the binding-atom-abdera module in the Tuscany code base.</P>
+
+<H3><A name="SCAJavabinding.atom-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.atom-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.atom-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.atom';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingejb.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingejb.html
new file mode 100644
index 0000000000..67d7b36553
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingejb.html
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.ejb : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ejb">SCA Java binding.ejb</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ejb">SCA Java binding.ejb</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.ejb</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964955">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964955">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964955">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964955">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964955">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964955">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavabinding.ejb-%3Cbinding.ejb%3E"></A>&lt;binding.ejb&gt;</H3>
+
+<P>Tuscany provides the reference-side support for the <A href="http://www.osoa.org/download/attachments/35/SCA_EJBSessionBeanBinding_V100.pdf?version=1" class="external-link" rel="nofollow">SCA EJB Session Bean Binding V1.00</A>. It allows SCA components to access existing stateless session beans.</P>
+
+<H3><A name="SCAJavabinding.ejb-TheXMLconfigutation"></A>The XML configutation</H3>
+
+<P>To access a stateless session, the uri attribute of the &lt;binding.ejb&gt; element needs to be be configured with a JNDI name. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.ejb uri=<SPAN class="code-quote">&quot;corbaname:iiop:1.2@localhost:1050#BrokerServiceBean&quot;</SPAN> /&gt; 
+</PRE>
+</DIV></DIV>
+
+<P>Depending on which enviroment the SCA components are hosted, various styles of the JNDI names can be supported:</P>
+<UL>
+	<LI>relative JNDI</LI>
+	<LI>java:comp/env/&lt;ejb-ref&gt;</LI>
+	<LI>corbaname JNDI</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.ejb-Someexamples"></A>Some examples</H3>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN> name=<SPAN class="code-quote">&quot;account&quot;</SPAN>&gt;
+</SPAN>    &lt;component name=<SPAN class="code-quote">&quot;AccountDataServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;bigbank.accountdata.AccountDataServiceImpl&quot;</SPAN> /&gt; 
+        &lt;reference name=<SPAN class="code-quote">&quot;brokerService&quot;</SPAN>&gt;
+            &lt;binding.ejb uri=<SPAN class="code-quote">&quot;corbaname:iiop:1.2@localhost:1050#BrokerServiceBean&quot;</SPAN> /&gt; 
+        &lt;/reference&gt;
+  &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The open-ejb deployment descriptor</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;openejb-jar xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.openejb.org/xml/ns/openejb-jar-2.1&quot;</SPAN>&gt;
+</SPAN>    ...
+    &lt;enterprise-beans&gt;
+        &lt;session&gt;
+            &lt;ejb-name&gt;BrokerServiceBean&lt;/ejb-name&gt;
+            &lt;jndi-name&gt;BrokerServiceBean&lt;/jndi-name&gt;
+            &lt;tss-link&gt;IdentityTokenNoSecurity&lt;/tss-link&gt;
+        &lt;/session&gt;    
+    &lt;/enterprise-beans&gt;
+    ...
+&lt;/openejb-jar&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Integration with Geronimo 2.0.1</B><BR>Make sure org.apache.geronimo.configs/openejb-corba-deployer/2.0-SNAPSHOT/car is started. <BR>
+Look under System Modules in Admin Console. This module is required to support CORBA Naming.</TD></TR></TABLE></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.ejb';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg
new file mode 100644
index 0000000000..500725ebae
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg.jpeg
new file mode 100644
index 0000000000..d0f3bcc5f9
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.html b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.html
new file mode 100644
index 0000000000..b92c64e3ed
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp-security-policy-section.html
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.http security policy section : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http security policy section">SCA Java binding.http security policy section</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http security policy section">SCA Java binding.http security policy section</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.http security policy section</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964967">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964967">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964967">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964967">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964967">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964967">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavabinding.httpsecuritypolicysection-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.httpsecuritypolicysection-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.httpsecuritypolicysection-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.http security policy section';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp.html b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp.html
new file mode 100644
index 0000000000..0456869213
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindinghttp.html
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.http : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http">SCA Java binding.http</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http">SCA Java binding.http</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.http</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964959">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964959">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964959">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964959">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964959">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964959">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavabinding.http-%3Cbinding.http%3EIntroduction"></A>&lt;binding.http&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Hyper Text Transfer Protocol (HTTP) using the &lt;binding.http&gt; extension. Tuscany can communicate with services that provide or consume business data objects via the well known actions of HTTP, for example POST, GET, PUT, and DELETE. In HTTP interactions between a client and a server takes place as a series of requests and responses. Information is comunicated by reads and rights over server socket ports. HTTP actions, also known as verbs, are communicated between a client and a server in the requests and responses. Each request and response consists of a header and a body. Typically the header contains the request action name, a URI indicating the location of object of the object of the action, and a number property name and value pairs containing other meta information about the transaction (e.g. body length, modification dates, MIME type, etc.). The body contains the subject of the action, whether it be a text or binary encoding of the data, an error message, or a serialized object.</P>
+
+<P>More information on the HTTP protocol is located at:</P>
+<UL>
+	<LI><A href="http://tools.ietf.org/html/rfc2616" class="external-link" rel="nofollow">Hyper Text Transfer Protocol</A>.</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Some of the advanced function described here is included in the Tuscany 1.3.2 and 1.4 releases. The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A>. Users should also be aware of the <A href="http://tuscany.apache.org/sca-java-bindingatom.html" class="external-link" rel="nofollow">Atom binding</A> and <A href="http://tuscany.apache.org/sca-java-bindingrss.html" class="external-link" rel="nofollow">RSS binding</A> which sit on top of the HTTP binding, but have additional features and data types associated with the actions.</P>
+
+<P>A Tuscany protocol binding such as the HTTP binding, is a way to fit a common protocol into the Tuscany abstraction and way of doing things. Each binding identifies itself to the Tuscany runtime and states under what conditions it is available. The Tuscany runtime uses the binding to translate invocations and data from the Tuscany world into the world of the protocol and back. So in the case of the HTTP binding, Tuscany uses the HTTP request and response mechanism to share business data between service components.</P>
+
+
+<H3><A name="SCAJavabinding.http-UsingtheTuscanyHTTPbinding"></A>Using the Tuscany HTTP binding</H3>
+
+<P>The primary use of the HTTP binding is to share resources and services over HTTP over the web in a distributed fashion. Resources are items that have a resource implementation such as web content. Services are items that have data types and a defined business interfaces such as shared collections. Examples of shared collections includes shopping carts, telephone directories, insurance forms, and blog sites. These collections of items can be added, retrieved, updated, and deleted using the 4 basic actions of the HTTP protocol:</P>
+<UL>
+	<LI>POST (create or add)</LI>
+	<LI>GET (retreive or query)</LI>
+	<LI>PUT (update)</LI>
+	<LI>DELETE (destroy or remove</LI>
+</UL>
+
+
+<P>The simplest way to use the HTTP binding is to declare a resource that can be shared over the web via HTTP and provide an HTTP address where one can access the resource. This resource is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;ResourceServiceComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.resource location=<SPAN class="code-quote">&quot;content&quot;</SPAN>/&gt;
+    	&lt;service name=<SPAN class="code-quote">&quot;Resource&quot;</SPAN>&gt;
+    		&lt;tuscany:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/webcontent&quot;</SPAN>/&gt;
+</SPAN>    	&lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+<P>No further implementation is needed with a resource. It is served on the web like any other static web content.</P>
+
+<P>The HTTP binding can also declare a business service that can be shared over the web and provide an HTTP address where one can access the service. This resource is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;HTTPBindingComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.http.TestBindingImpl&quot;</SPAN>/&gt;
+    	&lt;service name=<SPAN class="code-quote">&quot;TestBindingImpl&quot;</SPAN>&gt;
+    		&lt;tuscany:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/httpbinding&quot;</SPAN>/&gt;
+</SPAN>    	&lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.http-ExampleHTTPServletandServiceImplementations"></A>Example HTTP Servlet and Service Implementations</H3>
+
+<P>A service that uses the HTTP binding usually implements the javax.servlet.Servlet interface. This interface declares the basic access methods mentioned in the J2EE specification: init, destroy, service, getServletInfo, etc. The Tuscany runtime ensures that the proper method is invoked whenever a service does one of the HTTP actions. For example here is a TestService implemented in the package org.apache.tuscany.sca.binding.http;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Service(Servlet.class)
+<SPAN class="code-keyword">public</SPAN> class TestServiceImpl <SPAN class="code-keyword">implements</SPAN> Servlet {
+
+    <SPAN class="code-keyword">public</SPAN> void init(ServletConfig config) <SPAN class="code-keyword">throws</SPAN> ServletException {
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void service(ServletRequest request, ServletResponse response) <SPAN class="code-keyword">throws</SPAN> ServletException, IOException {
+        response.getOutputStream().print(<SPAN class="code-quote">&quot;&lt;html&gt;&lt;body&gt;&lt;p&gt;Hello from Tuscany HTTP service&lt;/body&gt;&lt;/html&gt;&quot;</SPAN>);
+    }
+
+}
+</PRE>
+</DIV></DIV>
+
+<P>Another way of implementing an HTTP service is to use a collection interface that matches the actions of the HTTP protocol. In this case, the methods must be named post, get, put, and delete. Tuscany ensures that the proper method is invoked via the request and response protocol of HTTP:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class TestGetImpl {
+    
+    <SPAN class="code-keyword">public</SPAN> InputStream get(<SPAN class="code-object">String</SPAN> id) {
+        <SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> ByteArrayInputStream((<SPAN class="code-quote">&quot;&lt;html&gt;&lt;body&gt;&lt;p&gt;This is the service GET method, item=&quot;</SPAN> + id + <SPAN class="code-quote">&quot;&lt;/body&gt;&lt;/html&gt;&quot;</SPAN>).getBytes());
+
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<P>So using the common verbs of HTTP and Java object serialization, one can implement services and run them anywhere the HTTP protocol is implemented. The service developer or implementer simply creates methods for post, get, put, and delete, and a business collection such as a shopping cart, telephone directory, insurance form, or blog sites can be created. See the Tuscany module binding-http-runtime for complete examples.</P>
+
+<P>Unlike the Atom or RSS bindings, which have defined data types which encapsulate the business objects, the HTTP binding uses Java object serialization for passing business object data back and forth. Thus it is up to the developer or implementer to deserialize the data and reconstitute a business object.</P>
+
+<H3><A name="SCAJavabinding.http-AdvancedFeaturesoftheTuscanyHTTPBinding"></A>Advanced Features of the Tuscany HTTP Binding</H3>
+
+<H4><A name="SCAJavabinding.http-HTTPConditionalActionsandCachingusingETagsandLastModified"></A>HTTP Conditional Actions and Caching using ETags and Last-Modified</H4>
+
+<P>The HTTP specification provides a set of methods for HTTP clients and servers to interact. These methods form the foundation of the World Wide Web. Tuscany implements many of these methods a binding interface to a collection. The main methods are:</P>
+
+<UL>
+	<LI>GET - retrieves an item from a collection</LI>
+	<LI>POST - creates or adds an item to a collection</LI>
+	<LI>PUT - updates or replaces an item in a collection</LI>
+	<LI>DELETE - removes an item in a a collection</LI>
+</UL>
+
+
+<P>The HTTP specification (HTTP 1.1 Chapter 13 - Caching) also provides a mechanism by which these methods may be executed conditionally. To perform conditional methods, an HTTP client puts 3 items in the HTTP request header:</P>
+
+<UL>
+	<LI>ETag - entity tag, a unique identifier to an item in a collection. Normally created and returned by the server when creating (POST) a new item.</LI>
+	<LI>LastModified - an updated field. Normally a string containing a date and time of the last modification of the item.</LI>
+	<LI>Predicate - a logical test (e.g. IfModified, IfUnmodified) to use with the ETag and LastModified to determine whether to act.</LI>
+</UL>
+
+
+<P>The complete list of predicates is given in the HTTP specification.</P>
+
+<P>The most common use of conditional methods is to prevent two requests to the server instead of one conditional request. For example, a common scenario is to check if an item has been modified, if not changed update it with a new version, if changed do not update it. With a conditional PUT method (using the IfUnmodifed predicate and a LastModified date), this can be done in one action. Another common use is to prevent multiple GETs of an item to ensure we have a valid copy. Rather than doing a second request of a large item, one can do a conditional GET request (using an IfModified predicate and a LastModified date), and avoid the second request if our object is still valid. The server responds with either a normal response body, or status code 304 (Not Modified), or status code 412 (precondition failed).</P>
+
+<P>Tuscany implements the logic to move these caching items to and from the HTTP request and response headers, and deliver them to the collection implementation. The items are delivered to a user implementation via a serializable object called CacheContext. This object contains the value of the ETag, the LastModified value, and any predicates. It is up to the implementer of a collection to provide the correct server logic to act on these predicates. The CacheContext class is found in found in the Tuscany module package org.apache.tuscany.sca.binding.http.</P>
+
+<P>To implement conditional actions on your service, the developer or implementer implements any of the condional HTTP actions: conditionalPost, conditionalGet, conditionalPut, or conditionalDelete. Tuscany automatically routes a request with proper request header fields (ETag, LastModified, and predicates) to the proper collection method.</P>
+
+<P>For example, the TestBindingCacheImpl class in package org.apache.tuscany.sca.binding.http implements a server collection which pays attention to conditional methods. Notice that this collection implements conditionalGet, conditionalPut, conditionalPost, and conditionalDelete methods as well as get, put, post, delete. The server collection can look at the CacheContext obect to determine whether an item or a status code should be returned. In this example code, the conditionalGet checked the If-Modified predicate and determines whether the item is not modified and if so, throws a NotModifiedException.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	<SPAN class="code-keyword">public</SPAN> InputStream conditionalGet(<SPAN class="code-object">String</SPAN> id, HTTPCacheContext cacheContext)
+			<SPAN class="code-keyword">throws</SPAN> NotModifiedException, PreconditionFailedException {
+
+		<SPAN class="code-keyword">if</SPAN> (cacheContext != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">if</SPAN> (cacheContext.ifModifiedSince) {
+				<SPAN class="code-keyword">if</SPAN> ((id.equals(<SPAN class="code-quote">&quot;1&quot;</SPAN>))
+						&amp;&amp; (0 &gt; cacheContext.lastModifiedDate
+								.compareTo(<SPAN class="code-keyword">new</SPAN> Date())))
+					<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotModifiedException(<SPAN class="code-quote">&quot;item 1 was modified on &quot;</SPAN>
+							+ <SPAN class="code-keyword">new</SPAN> Date());
+			}
+                ...
+        ...
+</PRE>
+</DIV></DIV>
+
+<P>For a full example of all conditional methods and many combinations of predicates, one can look to the module http-binding unit tests to understand how these conditional request work. The HTTPBindingCacheTestCase contains 36 tests of all 4 HTTP conditonal methods. Various predicates are tested with various ETags and LastModified fields. The fields are tested in both the positive and negative cases.</P>
+
+<P>Here is a complete list of the tests:</P>
+<UL>
+	<LI>testGet() - tests normal GET method of collection, expects item</LI>
+	<LI>testConditionalGetIfModifiedNegative() - tests not modified GET, expects item</LI>
+	<LI>testConditionalGetIfModifiedPositive() - tests modified GET, expect code 304</LI>
+	<LI>testConditionalGetIfUnmodifiedNegative() - tests unmodifed GET, expects item</LI>
+	<LI>testConditionalGetIfUnmodifiedPositive() - tests modified GET, expects code 412</LI>
+	<LI>testConditionalGetIfMatchNegative() - tests matching GET, expects code 412</LI>
+	<LI>testConditionalGetIfMatchPositive() - tests matching GET, expects item</LI>
+	<LI>testConditionalGetIfNoneMatchNegative - tests unmatching GET, expects item</LI>
+	<LI>testConditionalGetIfNoneMatchPositive() - tests unmatching GET, expects code 412</LI>
+</UL>
+
+
+<P>Similarly, there are 9 tests each for DELETE, POST, and PUT, making a total of 36 test cases.</P>
+
+<H4><A name="SCAJavabinding.http-DifferencesBetweenHTTPBindingCachingandAtomBindingCachinginTuscany"></A>Differences Between HTTP Binding Caching and Atom Binding Caching in Tuscany</H4>
+
+<P>A similar sort of conditional posting is implemented in the Atom Binding. The difference is that the HTTP binding requires an implementer to provide conditional methods. The Atom binding caching uses the Abdera Atom model objects to automatically derive an ETag and a LastModified tags. In the Atom model, the Entry or Feed ID is used to make an item ETag field. The Atom Entry or Feed updated field is used to make an item LastModified field.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Use the HTTP binding caching when you are not using Atom Entries and Feeds as your business objects. However, the more flexible HTTP binding caching requires you to implement special conditional methods. Use the Atom binding when you can model your business data in terms of Atom Entries and Feeds. The more constrictive Atom binding caching will derive caching tags from your data model fields.</P>
+
+<H3><A name="SCAJavabinding.http-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.http-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.http-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/policy_interceptors_high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.http';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png
new file mode 100644
index 0000000000..05e62f3b8c
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg
new file mode 100644
index 0000000000..75743c1552
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png
new file mode 100644
index 0000000000..7db2eb03f5
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg
new file mode 100644
index 0000000000..f2674bcddd
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png
new file mode 100644
index 0000000000..5dc161000d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg
new file mode 100644
index 0000000000..8850a896f6
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png
new file mode 100644
index 0000000000..737772334e
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png.jpeg
new file mode 100644
index 0000000000..c704d7bd74
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.data/providers.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.html
new file mode 100644
index 0000000000..9548360ebe
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjms.html
@@ -0,0 +1,753 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.jms : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jms">SCA Java binding.jms</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jms">SCA Java binding.jms</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.jms</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964952">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964952">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964952">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964952">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964952">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964952">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavabinding.jms-%3Cbinding.jms%3E"></A>&lt;binding.jms&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports the Java Messaging Service using the &lt;binding.jms&gt; SCDL extension. New JMS based service endpoints can be provided using a &lt;binding.jms&gt; element within a SCA &lt;service&gt;, existing JMS queues can be accessed using a &lt;binding.jms&gt; element within a SCA &lt;reference&gt;.</P>
+
+<P>The JMS binding is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-bindings" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<H4><A name="SCAJavabinding.jms-UsingtheJMSbinding"></A>Using the JMS binding</H4>
+
+<P>The simplest way to use the JMS binding is to use the URI syntax to configure the binding, for example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:RequestQueue&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+<P>This tells the binding to use a JMS destination named &quot;RequestQueue&quot;, with all the other configuration options using default values. </P>
+
+<P>By default Tuscany will use a JMS connection factory named 'ConnectionFactory', this can be changed by using a query parameter in the URI, for example, to use a connection factory named 'myCF' can be done as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:RequestQueue?connectionFactoryName=myCF&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> When using a SCA reference for RPC style requests and no response destination is defined in the SCDL then a temporary replyTo queue will automatically be created and used.   </P>
+
+<P>When using the JMS binding with SCA services the syntax can be simplified even further by letting the destination name default to the service name. For example, the following SCDL snippet creates a JMS service listening on a JMS destination named &quot;MyService&quot;:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;service name=<SPAN class="code-quote">&quot;MyService&quot;</SPAN>&gt;
+   &lt;binding.jms /&gt;
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jms-ValidationintheJMSBinding"></A>Validation in the JMS Binding</H3>
+
+<P>Tuscany performs two types of validation of the JMS Binding specified in a composite file.</P>
+
+<OL>
+	<LI>All XML is validated according to the schema to be valid XML. Elements are validated to be of the correct number<BR>
+and order. URIs are validated to be of the correct form. Required attributes and elements are checked.</LI>
+	<LI>The model data for the JMS binding is validated. These are semantic issues such as the connection factory should not contradict destination type, connection factory and activation specification are mutually exclusive, and response connection must<BR>
+either be a name attribute or a response element.</LI>
+</OL>
+
+
+<P>Validation rules are taken from the binding schema and the OSOA and OASIS specs:</P>
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/documents.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/documents.php?wg_abbrev=sca-bindings</A> (sca-binding-jms-1.1-spec-cd01-rev4.pdf)</LI>
+	<LI><A href="http://www.osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications</A> (SCA JMS Binding V1.00 )</LI>
+</UL>
+
+
+<P>Invalid JMS bindings usually result in a JMSBindingException with error message and specific context of the error. See the JMSBindingProcessor for a complete list of validation rules.</P>
+
+<H3><A name="SCAJavabinding.jms-SomeExamples"></A>Some Examples</H3>
+
+<H4><A name="SCAJavabinding.jms-HelloWorld"></A>HelloWorld</H4>
+
+<P>The <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/" class="external-link" rel="nofollow">helloworld-jms</A> sample demonstrates basic RPC style operations over JMS. The sample has one component exposing a JMS service on a queue name 'HelloWorldService' and another component which invokes the service by sending JMS messages to that queue. A temporary destination is used for the response messages. The .composite file for this is shown below, see the helloworld sample <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/README" class="external-link" rel="nofollow">README</A> for full details.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldClient&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldClient&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldRef&quot;</SPAN>&gt;
+            &lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:HelloWorldService&quot;</SPAN>/&gt;
+        &lt;/reference&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldServiceImpl&quot;</SPAN> /&gt;
+	&lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+            &lt;binding.jms /&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jms-OperationSelection"></A>Operation Selection</H3>
+
+<P>Operation selection extensions allow you to choose how the JMS bindings determines which service operation to call based on the incoming MS message. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> operatiion selector </TH>
+<TH class="confluenceTh"> description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;opertionSelector.jmsdefault/&gt; </TD>
+<TD class="confluenceTd"> The default operations selector as described in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A>; 
+<UL>
+	<LI>If there is only one operation on the service interface then this operation is chosen.</LI>
+	<LI>Else If the property scaOperationName appears in the incoming JMS message then its value determines the service operation</LI>
+	<LI>Else the operation is assumed to be called onMessage</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;opertionSelector.jmsUserProp propertyName=&quot;somePropertyName&quot;/&gt; </TD>
+<TD class="confluenceTd"> The named property, in this case somePropertyName, on the incoming JMS message holds name of the service operation that will be called </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>While you can specify the default operation selector there is no need to as in lieu of other operation selectors being specified this one it assumed to be in force. You can add new operation selectors by adding the appropriate model objects, processors and providers.</P>
+
+<P>Following operation selection the actual operation that is called may be further affected by operationProperties configuration.</P>
+
+<H3><A name="SCAJavabinding.jms-WireFormats"></A>Wire Formats</H3>
+
+<P>Wire format extensions allow you to choose how message data is expected to appear inside the JMS message as it flows across the wire. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> wire format </TH>
+<TH class="confluenceTh"> description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsdefault sendFormat=&quot;text or bytes&quot;/&gt; </TD>
+<TD class="confluenceTd"> The default wire format as described in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A>; 
+<UL>
+	<LI>If the service operation has a single parameter of type javax.jms.Message then the incoming JMS message is passed in as is</LI>
+	<LI>Else the incoming message is a text message containing XML (we have added the sendFormat attribute to control whether the message type is actially text or bytes)
+	<UL>
+		<LI>If there is a single parameter in the service operation signature then the data in the JMS message is assumed to be a direct serialization of the data coming from/going to the service operation</LI>
+		<LI>Else there are multiple parameters in the servioce operation signature and  the data in the JMS message is assumed to be a document literal wrapped serialization of the data coming from/going to the service operation</LI>
+	</UL>
+	</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsBytes/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the native bytes of the data coming from/going to the service operation. The service operation signature is expected to have a single byte[] parameter </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsBytesXML/&gt; </TD>
+<TD class="confluenceTd">The data in the JMS message is an XML document literal wrapped representation of the parameters of the service operation presented as a series of bytes </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsText/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the string representation of data coming from/going to the service operation. The service operation signature is expected to have a single String parameter </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsTextXML/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is an XML document literal wrapped representation of the parameters of the service operation presented as a String </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsObject/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the Java object serialization of data coming from/going to the service operation </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>While you can specify this wire format there is no need to as in lieu of other operation selectors being specified this one it assumed to be in force. You can add new wire formats by adding the appropriate model objects, processors and providers.</P>
+
+<H3><A name="SCAJavabinding.jms-UsingSCAcallbackswiththeJMSbinding"></A>Using SCA callbacks with the JMS binding</H3>
+
+<P>The Tuscany JMS binding supports using SCA callbacks for creating asynchronous clients and services.</P>
+
+<P>This is done by using a &lt;callback&gt; element in the SCDL for the service or reference as shown in the following example. <BR>
+See the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/callbacks-jms/" class="external-link" rel="nofollow">callbacks-jms</A> sample for a complete example of using callbacks</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;CallbacksComposite&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ClientComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;callbacks.OrderServiceClient&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;orderService&quot;</SPAN> target=<SPAN class="code-quote">&quot;ServiceComponent/OrderService&quot;</SPAN>&gt;
+            &lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:OrderService&quot;</SPAN>/&gt;
+            &lt;callback&gt;
+                &lt;binding.jms /&gt;
+            &lt;/callback&gt;
+        &lt;/reference&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;callbacks.OrderServiceImpl&quot;</SPAN> /&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+            &lt;binding.jms /&gt;
+            &lt;callback&gt;
+                &lt;binding.jms /&gt;
+            &lt;/callback&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> When no destination is defined on the callback binding of a &lt;reference&gt; then a JMS temporary queue will be used.</P>
+
+<H3><A name="SCAJavabinding.jms-SettingJMSheadersanduserproperties"></A>Setting JMS headers and user properties</H3>
+
+<P>JMS headers and user properties can be set on JMS messages sent from Tuscany by using the &lt;Headers&gt; and &lt;OperationProperties&gt; elements of the JMS binding. The &lt;Headers&gt; element applies to all messages, the &lt;OperationProperties&gt; applies to individual operations and may override values set on the &lt;Headers&gt; element.</P>
+
+<P>An example of using these is shown in the following snippet of SCDL:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:ServiceQueue&quot;</SPAN>&gt;
+    &lt;headers JMSType=<SPAN class="code-quote">&quot;someTypeValue&quot;</SPAN> /&gt;
+    &lt;operationProperties name=<SPAN class="code-quote">&quot;op2&quot;</SPAN>&gt;
+        &lt;headers JMSType=<SPAN class="code-quote">&quot;op2SpecificTypeValue&quot;</SPAN> /&gt;
+    &lt;/operationProperties&gt;
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>A complete working example of using &lt;Headers&gt; and &lt;OperationProperties&gt; can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java" class="external-link" rel="nofollow">properties itest </A></P>
+
+<H3><A name="SCAJavabinding.jms-UsingJMSmessageselectors"></A>Using JMS message selectors </H3>
+
+<P>Services using the JMS binding to receive messages may only want a subset of the messages arriving on a queue or topic. This can be done by using the &lt;SubscriptionHeaders&gt; element which enables defining a <A href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS4.html#wp79281" class="external-link" rel="nofollow">JMS message selector </A> to filter the messages that will be received.   </P>
+
+<P>An example of using these is shown in the following snippet of SCDL:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:ServiceTopic&quot;</SPAN> &gt;
+    &lt;SubscriptionHeaders JMSSelector=<SPAN class="code-quote">&quot;JMSType = 'type1'&quot;</SPAN>/&gt;
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>A complete working example of using &lt;SubscriptionHeaders&gt; can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms-selectors" class="external-link" rel="nofollow">jms selectors itest </A>.</P>
+
+<H3><A name="SCAJavabinding.jms-Usingadefinitions.xmlfileandtherequestConnection%2FresponseConnectionattributes"></A>Using a definitions.xml file and the requestConnection/responseConnection attributes</H3>
+
+<P>It can be useful to define the details of the JMS resources separately from the SCA composite, to support this the SCA definitions.xml file can be used to define 'model' &lt;binding.jms&gt; elements which can then be referred to from the binding within the composite.  </P>
+
+<P>For example, the following shows a definitions.xml file defining a JMS queue and connection factory which are then used by a JMS binding within a composite.</P>
+
+<P>The definitions.xml file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>             xmlns:itest=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//jms&quot;</SPAN>
+</SPAN>             targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//jms&quot;</SPAN> &gt;
+</SPAN>
+    &lt;binding.jms name=<SPAN class="code-quote">&quot;itest:TestService&quot;</SPAN> &gt;
+        &lt;destination name=<SPAN class="code-quote">&quot;MyServiceQueue&quot;</SPAN> create=<SPAN class="code-quote">&quot;never&quot;</SPAN>/&gt;
+        &lt;connectionFactory name=<SPAN class="code-quote">&quot;MyConnectionFactory&quot;</SPAN>/&gt;
+    &lt;/binding.jms&gt;
+
+&lt;/definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>and a binding which uses the definitions.xml binding:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms requestConnection=<SPAN class="code-quote">&quot;itest:TestService&quot;</SPAN> /&gt;</PRE>
+</DIV></DIV>
+
+<P>A complete working example of using the requestConnection/responseConnection attributes can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms-definitions" class="external-link" rel="nofollow">jms definitions itest </A>.</P>
+
+<H3><A name="SCAJavabinding.jms-ConfiguringJMSresources"></A>Configuring JMS resources</H3>
+
+<P>Tuscany locates all JMS resources from JNDI so the environment where Tuscany is running needs to have JNDI and JMS correctly configured in order to use the Tuscany JMS binding. </P>
+
+<P>The following describes how to configure JMS in some common environments:</P>
+
+<H4><A name="SCAJavabinding.jms-TuscanyJ2SEstandaloneenvironmentwithActiveMQ"></A>Tuscany J2SE standalone environment with ActiveMQ</H4>
+
+<P>The Tuscany standalone runtime can use an embedded <A href="http://activemq.apache.org/" class="external-link" rel="nofollow">Apache ActiveMQ</A> message broker. To use ActiveMQ the application needs to include the  JMS API and ActiveMQ jars in the classpath and include a jndi.properties file to configure the ActiveMQ resources in JNDI. </P>
+
+<P>An example of this can be seen in the Tuscany <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/" class="external-link" rel="nofollow">JMS itest</A> which uses the <A href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-core/4.1.1/activemq-core-4.1.1.jar" class="external-link" rel="nofollow">ActiveMQ 4.1.1</A> release and <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties" class="external-link" rel="nofollow">this</A> jndi.properties file. </P>
+
+<P>For more information on using ActiveMQ see the Apache ActiveMQ website and specifically <A href="http://activemq.apache.org/jndi-support.html" class="external-link" rel="nofollow">this</A> page for information about configuring JNDI resources. </P>
+
+<H4><A name="SCAJavabinding.jms-ApacheTomcat"></A>Apache Tomcat</H4>
+
+<P>Tomcat does not include a JMS broker by default so you need to either embed one in each Tuscany application, install a broker into the tomcat installation, or use an external broker. Once that is done JNDI resources can be defined using the standard Tomcat facilities, see the Tomcat <A href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-resources-howto.html" class="external-link" rel="nofollow">JNDI How-to</A>. </P>
+
+<P>The Tuscany samples that use JMS and Tomcat demonstrate how to embed a JMS broker within the application by including ActiveMQ and its dependencies within the sample WAR, and using the webapp META-INF/context.xml file to define the JMS resources in JNDI. </P>
+
+
+<H4><A name="SCAJavabinding.jms-JEEapplicationserverssuchasApacheGeronimo%2CWebSphereetc"></A>JEE application servers such as Apache Geronimo, WebSphere etc</H4>
+
+<P>JEE Application servers such as Geronimo, WebSphere, WebLogic etc come with their own JMS broker that can be used by Tuscany. All the JMS resources used by a Tuscany application must be manually defined in the application server. Usually the application server has some sort of admin console where the resources can be defined using a web browser. </P>
+
+<P>The Tuscany helloworld JMS sample <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/helloworld-jms-webapp/README" class="external-link" rel="nofollow">README</A> describes the specific details of how to do this for some common application servers.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>ClassCastExceptions when using Tuscany applications in an Application Server</B><BR>Tuscany applications, specifically the JMS samples, are built to work out of-the-box on Tomcat by including a JMS broker embedded within the application. This causes incompatibilities with some Application Servers because the Java class of JMS resources may use different class loaders in the server and the application. The solution is to delete any JMS API jar included in the application WAR, for example, the geronimo-jms_1.1_spec-1.1.jar.</TD></TR></TABLE></DIV>
+
+<H4><A name="SCAJavabinding.jms-%28%2F%29UsingJEEresourcereferences"></A><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Using JEE resource references</H4>
+
+<P>When running Tuscany in a JEE environment it can be useful to use JEE resource references to map local application resource names to global JNDI names. This can be done by using &lt;resource-ref&gt; elements in the application deployment descriptor. If a &lt;resource-ref&gt; exists for a JMS binding resource then Tuscany will use that instead of looking up the resource directly in the global JNDI.</P>
+
+<P>For example, adding the following definitions to the helloworld JMS sample <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml" class="external-link" rel="nofollow">web.xml</A> will enable mapping the 'ConnectionFactory' and 'HelloWorldService' names used by the JMS binding into names for the actual resources used on the Application Server. This will normally occur when the application is dployed with the deploy tool asking what real resource names the resourecs should be mapped to.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;resource-ref&gt;
+    &lt;res-ref-name&gt;ConnectionFactory&lt;/res-ref-name&gt;
+    &lt;res-type&gt;javax.jms.ConnectionFactory&lt;/res-type&gt;
+    &lt;res-auth&gt;Container&lt;/res-auth&gt;
+    &lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+&lt;/resource-ref&gt;
+
+&lt;resource-ref&gt;
+    &lt;res-ref-name&gt;HelloWorldService&lt;/res-ref-name&gt;
+    &lt;res-type&gt;javax.jms.Queue&lt;/res-type&gt;
+    &lt;res-auth&gt;Container&lt;/res-auth&gt;
+    &lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+&lt;/resource-ref&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H4><A name="SCAJavabinding.jms-UsinganexternalJMSbroker"></A>Using an external JMS broker</H4>
+
+<P>When the Tuscany environment does not include a JMS broker then an external broker may be used by specifying the initialContextFactory and jndiURL attributes on the binding.jms element. Any JMS 1.1 compatible broker should work such as Apache ActiveMQ or any other proprietary broker. The Tuscany application classpath will need to include jars for the initial context factory and all of its dependencies.</P>
+
+<P>An example of using the Tuscany JMS binding with an external ActiveMQ broker is as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms initialContextFactory=<SPAN class="code-quote">&quot;org.apache.activemq.jndi.ActiveMQInitialContextFactory&quot;</SPAN> jndiURL=<SPAN class="code-quote">&quot;tcp:<SPAN class="code-comment">//localhost:61616&quot;</SPAN>&gt;
+</SPAN>   &lt;destination name=<SPAN class="code-quote">&quot;DestQueueA&quot;</SPAN>/&gt;
+&lt;/binding.jms&gt;  
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-UsingtheWebSphereclientforJMS"></A>Using the WebSphere client for JMS</H4>
+
+<P>The Tuscany JMS binding now (post Tuscany SCA 1.2) works the <A href="http://www-1.ibm.com/support/docview.wss?uid=swg24012804" class="external-link" rel="nofollow">WebSphere client for JMS </A> which enables Tuscany applications running outside of WebSphere to use JMS resources defined within WebSphere. You need to include the JMS client jars in the Tuscany classpath and ensure that the JMS connection factory has the &quot;endpoint providers&quot; field configured in WebSphere. See this <A href="http://apache.markmail.org/message/qufruqdwxuvaagev" class="external-link" rel="nofollow">email thread </A> for more information.</P>
+
+<H3><A name="SCAJavabinding.jms-JMSMessagetypesandmessagebodyformat"></A>JMS Message types and message body format</H3>
+
+<P>The SCA JMS specification only defines how to use JMS TextMessages which contain XML in the message body, however it is a common requirement to use alternative message types and body formats. Currently Tuscany defines an additional &quot;messageProcessor&quot; attribute on the binding.jms element to support additional message types and payload formats. For the time being this should be considered an interim solution which will be changed in future Tuscany releases.</P>
+
+<P>The messageProcessor attribute value may be &quot;XMLTextMessage&quot;, &quot;TextMessage&quot;, &quot;ObjectMessage&quot;, or the name of a Java class that implements the org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor interface. For example:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For a complete example of using the messageProcessor attribute see the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java" class="external-link" rel="nofollow">MessageProcessorTestCase</A> itest. </P>
+
+<H3><A name="SCAJavabinding.jms-UsingpolicytocontroltheJMSbinding"></A>Using policy to control the JMS binding</H3>
+<P>The JMS binding is aware of the following policy implementations. </P>
+
+<UL class="alternate" type="square">
+	<LI>org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy
+	<UL class="alternate" type="square">
+		<LI>Used to set various JMS message headers including JMSType, JMSCorrelationID, JMSDeliveryMode, JMSTimeToLive, JMSPriority and arbitrary user defined header properties</LI>
+	</UL>
+	</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy
+	<UL class="alternate" type="square">
+		<LI>Used to insert a user defined authentication property into the JMS header.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Intents and policy sets can be constructed to control the application of these policies. The following intents are defined by default</P>
+<UL class="alternate" type="square">
+	<LI>pritority</LI>
+	<LI>deliveryMode</LI>
+</UL>
+
+
+<P>New intents and policy sets can be designed are required to provide the level of control you need over your application.  </P>
+
+<H4><A name="SCAJavabinding.jms-Intent%3Apriority"></A>Intent: priority</H4>
+<P>The priority intent provides a coarse grained approach to setting message priority. For example,</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ &lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN> requires=<SPAN class="code-quote">&quot;priotiry.meduim&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The values &quot;priority.high&quot;, &quot;priority.medium&quot;, &quot;priority.low&quot; are supported. It is the responsibility of the user to define a policy set to support these intents. The following policy set could be used to support these priority values.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;policySet name=<SPAN class="code-quote">&quot;JMSPolicySet1&quot;</SPAN>
+               provides=<SPAN class="code-quote">&quot;priority&quot;</SPAN>
+               appliesTo=<SPAN class="code-quote">&quot;sca:binding.jms&quot;</SPAN>&gt;
+        &lt;intentMap provides=<SPAN class="code-quote">&quot;priority&quot;</SPAN> <SPAN class="code-keyword">default</SPAN>=<SPAN class="code-quote">&quot;medium&quot;</SPAN>&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;high&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;9&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;medium&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;4&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;low&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;0&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+        &lt;/intentMap&gt;
+    &lt;/policySet&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-Intent%3AdeliveryMode"></A>Intent: deliveryMode</H4>
+
+<P>The deliveryMode intent provides s simple way of specifying whether a message should be delivered persistently or non-persistently. For example, </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ &lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN> requires=<SPAN class="code-quote">&quot;deliveryMode.persistent&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The values &quot;deliveryMode.persistent&quot; and &quot;deliveryMode.nonPersistent&quot; are supported. It is the responsibility of the user to define a policy set to support these intents. The following policy set could be used to support these delivery mode values.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;policySet name=<SPAN class="code-quote">&quot;JMSPolicySet2&quot;</SPAN>
+               provides=<SPAN class="code-quote">&quot;deliveryMode&quot;</SPAN>
+               appliesTo=<SPAN class="code-quote">&quot;sca:binding.jms&quot;</SPAN>&gt;
+        &lt;intentMap provides=<SPAN class="code-quote">&quot;deliveryMode&quot;</SPAN> <SPAN class="code-keyword">default</SPAN>=<SPAN class="code-quote">&quot;nonPersistent&quot;</SPAN>&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;persistent&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSDeliveryMode=<SPAN class="code-quote">&quot;PERSISTENT&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;nonPersistent&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSDeliveryMode=<SPAN class="code-quote">&quot;NON_PERSISTENT&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+        &lt;/intentMap&gt;
+    &lt;/policySet&gt;    
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-Otherheadervalues"></A>Other header values</H4>
+
+<P>TBD</P>
+
+
+<H3><A name="SCAJavabinding.jms-JMSbindingschema"></A>JMS binding schema</H3>
+
+<P>The complete JMS binding SCDL schema has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms correlationScheme=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+             initialContextFactory=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>?
+             jndiURL=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>?
+             requestConnection=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             responseConnection=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             operationProperties=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             ... &gt;
+
+   &lt;destination name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>? create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/destination&gt;?
+
+   &lt;connectionFactory name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/connectionFactory&gt;?
+
+   &lt;activationSpec name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/activationSpec&gt;?
+
+   &lt;response&gt;
+      &lt;destination name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>? create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/destination&gt;?
+      &lt;connectionFactory name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/connectionFactory&gt;?
+      &lt;activationSpec name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/activationSpec&gt;?
+   &lt;/response&gt;?
+
+   &lt;complexType name=<SPAN class="code-quote">&quot;SubscriptionHeaders&quot;</SPAN>&gt; 
+      &lt;attribute name=<SPAN class="code-quote">&quot;JMSSelector&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>/&gt; 
+   &lt;/complexType&gt;
+
+   &lt;resourceAdapter name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;?
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/resourceAdapter&gt;?
+
+   &lt;headers JMSType=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSCorrelationId=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSDeliveryMode=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSTimeToLive=<SPAN class="code-quote">&quot;<SPAN class="code-object">int</SPAN>&quot;</SPAN>?
+            JMSPriority=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/headers&gt;?
+
+   &lt;operationProperties name=<SPAN class="code-quote">&quot;string&quot;</SPAN> nativeOperation=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;headers JMSType=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSCorrelationId=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSDeliveryMode=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSTimeToLive=<SPAN class="code-quote">&quot;<SPAN class="code-object">int</SPAN>&quot;</SPAN>?
+               JMSPriority=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/headers&gt;?
+   &lt;/operationProperties&gt;*
+
+   &lt;opertionSelector.jmsdefault/&gt;? | &lt;opertionSelector.jmsUserProp propertyName=<SPAN class="code-quote">&quot;somePropertyName&quot;</SPAN>/&gt;?
+   &lt;wireFormat.jmsdefault sendFormat+<SPAN class="code-quote">&quot;text|bytes&quot;</SPAN>/&gt;? | &lt;wireFormat.jmsBytes/&gt;? | &lt;wireFormat.jmsBytesXML/&gt;? | &lt;wireFormat.jmsText/&gt;? | &lt;wireFormat.jmsTextXML/&gt;? | &lt;wireFormat.jmsObject/&gt;?
+
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> See the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A> for full details of each of these configuration options.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Not all these elements are supported by Tuscany. Specifically, the &lt;activationSpec&gt; and &lt;resourceAdapter&gt; elements are not supported as Tuscany does not use JCA or MDBs for its JMS support.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The create attribute on the destination element is not supported in most environments and all JMS resources (connection factories, queues and topics) need to be pre-configured. An exception to this is when using Apache ActiveMQ as the JMS broker then Tuscany may be able to dynamically create queue and topic resources. This is mainly only useful for unit testing and it is recommended that user applications are designed with the expectation that JMS resources need to be preconfigured.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> the &quot;operationSelector&quot; and &quot;wireFormat&quot; elements are declared in the tuscany namespace (<A href="http://tuscany.apache.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.0</A>). The default operation selection and wire format behvaviour is defined in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A> but we have added a selection of other formats and selectors as alternatives. </P>
+
+<H3><A name="SCAJavabinding.jms-ImplementationNotes"></A>Implementation Notes</H3>
+
+<P>The JMS binding is the first binding where we have started to exploit the binding wire concept. This affects how the JMS binding is implemented.</P>
+
+<P>The addition of a binding wire to the infrastructure allows interceptors to be added that operate on message data in the context of the binding. This allows wire formats to be specified. This is important for bindings like JMS where the data format on the wire does not necessarily follow a well known specification. The default wire format in the Tuscany JMS binding is as described in the SCA JMS specification, i.e. a JMS text message containing XML. However JMS messages using any arbitrary format can be supported by constructing new wire format extensions. </P>
+
+<P>The following diagram shows an overview of how a reference JMS binding may be configured to talk to a service JMS binding using the Text XML wire format. </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/jmstextxml-invocation-chain.png" style="border: 0px solid black"></SPAN></P>
+
+<P>In the above diagram, <BR>
+1) databinding interceptor normalizes the data into an intermediate format that the binding can understand<BR>
+2) wire format interceptor, that is called WireFormat.jmsTextXML,  marshals the normalized data into the protocol-specific message, JMSMessage for binding.jms</P>
+
+<P>An example of a composite file which results in this kind of configuration is as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>	xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;helloworld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldReferenceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldService1&quot;</SPAN> &gt;
+            &lt;binding.jms&gt;
+                &lt;destination name=<SPAN class="code-quote">&quot;HelloWorldService1&quot;</SPAN>/&gt;
+                &lt;wireFormat.jmsTextXML/&gt;
+            &lt;/binding.jms&gt;
+        &lt;/reference&gt;      
+    &lt;/component&gt;
+    
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent1&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl&quot;</SPAN> /&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+            &lt;binding.jms&gt;
+                &lt;destination name=<SPAN class="code-quote">&quot;HelloWorldService1&quot;</SPAN>/&gt;
+            &lt;/binding.jms&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;     
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Note that &lt;wireFormat.jmsTextXML/&gt; is explicitly specified on the reference binding. As this is the default wire format it can be omitted as is the case on the service binding. </P>
+
+<P>Of course Tuscany already has a databinding framework that is able to transform between datatypes generically. So think of the wire format functionality as performing binding specific transformations. </P>
+
+<P>The following diagram gives an overview of the difference between the databinding and wireformat transformations on the reference side: </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/DataFormatScenarios-2-reference.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The following diagram gives an overview of the difference between the databinding and wireformat transformations on the service side:</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/DataFormatScenarios-2-service.png" style="border: 0px solid black"></SPAN></P>
+
+<P>When looking at the code itself you will see the following structure:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+binding-jms
+  The jms binding model
+
+binding-jms-runtime
+  /org/apache/tuscany/sca/binding/jms/provider
+     The base JMS binding runtime implementation. Exploits the Tuscany provider pattern. 
+
+  /org/apache/tuscany/sca/binding/jms/context
+     A structure that passes the binding context with the message and allows the wire format and operation selection interceptors to <SPAN class="code-keyword">do</SPAN> binding specific things
+  /org/apache/tuscany/sca/binding/jms/transport
+     JMS transport processing implmented as an interceptor
+  /org/apache/tuscany/sca/binding/jms/headers
+     JMS header processing implmented as an interceptor
+  /org/apache/tuscany/sca/binding/jms/wireformat
+     JMS wire format interceptors
+  /org/apache/tuscany/sca/binding/jms/operationselector
+     JMS operation selector interceptors
+      
+binding-jms-policy
+  Some base JMS policy implementations
+</PRE>
+</DIV></DIV>
+
+<P>The providers can be replaced in order to change the way that the JMS binding is constructed. </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/providers.png" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/providers.png" style="border: 0px solid black"></SPAN></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.jms';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingjsonrpc.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingjsonrpc.html
new file mode 100644
index 0000000000..8362ee137f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingjsonrpc.html
@@ -0,0 +1,329 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.jsonrpc : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jsonrpc">SCA Java binding.jsonrpc</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jsonrpc">SCA Java binding.jsonrpc</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.jsonrpc</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964964">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964964">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964964">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964964">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964964">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964964">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavabinding.jsonrpc-%3Cbinding.jsonrpc%3E"></A>&lt;binding.jsonrpc&gt;</H3>
+
+<P>Tuscany supports <A href="http://json-rpc.org/" class="external-link" rel="nofollow">JSON-RPC</A> as a protcol for use with SCA services by using the &lt;binding.jsonrpc&gt; element in your Application composite. This enables remote web browser clients to easily make RPC style calls to server-side SCA components.</P>
+
+<H3><A name="SCAJavabinding.jsonrpc-UserStories"></A>User Stories</H3>
+<UL>
+	<LI>A client application invoke a remote SCA Service using JSON-RPC and the invocation return business objects in JSON format. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g. Retrieve catalog items</LI>
+	</UL>
+	</LI>
+	<LI>A SCA component can define a reference to a remote SCA Service and use JSON-RPC for the invocation. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g. A catalog aggregator invoke various catalog services using JSON-RPC and aggregate the returned items into a single response</LI>
+	</UL>
+	</LI>
+	<LI>A client application invoke a SCA Service using JSON-RPC and the invocation returns a business exception. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g. Empty catalog throws a Busines Exception. Business Exception should properly propagate and display nicely to client.</LI>
+	</UL>
+	</LI>
+	<LI>A client application invoke a SCA Service using JSON-RPC and the invocation returns a runtime exception. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g. Try to retrieve catalog items from a catalog service that is un-available. Runtime exception properly propagate and display nicely to client.</LI>
+	</UL>
+	</LI>
+	<LI>A client application needs to access a service exposed trough JSON-RPC binding that requires authentication.
+	<UL>
+		<LI>e.g. make sure if nobody can get to the catalog if it's not authenticated</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<H3><A name="SCAJavabinding.jsonrpc-UsingtheTuscanyJSONRPCbinding"></A>Using the Tuscany JSON-RPC binding</H3>
+
+<P>You could use this binding without any configuration, or by providing a specific service URI. <BR>
+To include it on a SCA service or Reference, choose one of the examples below :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//docs.oasis-open.org/ns/opencsa/sca/200903&quot;</SPAN>
+</SPAN>           xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.1&quot;</SPAN>
+</SPAN>           ...
+
+	   &lt;tuscany:binding.jsonrpc/&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//docs.oasis-open.org/ns/opencsa/sca/200903&quot;</SPAN>
+</SPAN>           xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.1&quot;</SPAN>
+</SPAN>           ...
+
+   &lt;binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/store/catalog&quot;</SPAN>/&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jsonrpc-ConsumingJSONRPCservicesontheclientapplication"></A>Consuming JSON-RPC services on the client application</H3>
+
+<P>Any JSON-RPC client may be used to access SCA services which use &lt;binding.jsonrpc&gt;, below we are going to describe different ways you could consume the Tuscany JSON-RPC services in your client application.</P>
+
+<H4><A name="SCAJavabinding.jsonrpc-UtilizingTuscanyImplementation.widget"></A>Utilizing Tuscany Implementation.widget</H4>
+
+<P>When your web client application is defined as an SCA component utilizing <A href="sca-java-implementationwidget.html" title="SCA Java implementation.widget">Tuscany Widgets</A>, a JavaScript is generated which may be included within an HTML document to properly inject services references to SCA references defined on the same HTML document.</P>
+
+<P>This script is used by simply including the following tag within the HTML page :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;html-page-name.js&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This initializes the proxys for the SCA services which can then be injected into SCA references to make requests to the server-side components. For example, if there was a service named &quot;myService&quot; which had operations &quot;aOnewayRequest&quot; and &quot;anRpcRequest&quot; the scripts in the HTML page could now invoke these operations with the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;myService&quot;</SPAN>);
+myService.aOnewayRequest(args);
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;myService&quot;</SPAN>);
+myService.anRpcRequest(args, responseFunction);
+</PRE>
+</DIV></DIV>
+
+<P>Also see <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%2BJava%2Bimplementation.widget&linkCreation=true&fromPageId=5964964" class="createlink">Tuscany Widgets</A> for more details.</P>
+
+<H4><A name="SCAJavabinding.jsonrpc-UtilizingaJavaScriptClientProxy"></A>Utilizing a JavaScript Client Proxy</H4>
+
+<P>To simplify the task for web browsers developers Tuscany provides a 'binding-jsonrpc.js&quot; JavaScript client proxy code that can be included in your application. </P>
+
+<P>After copying the script to your application, it can be used bu simply including the following tag within the HTML page :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;binding-jsonrpc.js&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This initializes the proxys for the SCA services which can then be used make requests to the server-side components. Based on the scenario described above, below are the to invoke these operations.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>).service;
+myService.aOnewayRequest(args);
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>).service;
+myService.anRpcRequest(args, responseFunction);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-HandlingJSONRPCResponsewithcallbacks"></A>Handling JSON-RPC Response with callbacks</H4>
+
+<P>In that example 'responseFunction' is the name of a function which is called to process the response and which gets called asynchronously on another thread when the response is avaialble. RPC requests are done this way instead of the simpler &quot;answer = myService.anRpcRequest(args)&quot; to avoid hanging the browser while the (potentially slow) request is being processed. An example of the responseFunction for the previous example is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+function responseFunction(answer){
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with answer
+</SPAN>}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-Handlingerrors"></A>Handling errors</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//initialization code
+</SPAN><SPAN class="code-keyword">try</SPAN>{
+   myService.anRpcRequest(args, responseFunction);
+} <SPAN class="code-keyword">catch</SPAN>(e) {
+   <SPAN class="code-comment">//handle error
+</SPAN>   alert(e);
+}
+
+function responseFunction(answer, exception){
+   <SPAN class="code-comment">//handle exception information
+</SPAN>   <SPAN class="code-keyword">if</SPAN>(exception){
+      alert(exception.message);
+      <SPAN class="code-keyword">return</SPAN>;
+   }
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with answer
+</SPAN>}
+
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-UsingSCAJSONRPCserviceswithDojo"></A>Using SCA JSON-RPC services with Dojo</H4>
+
+<P>Apache Tuscany JSON-RPC services provide built-in support for <A href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9" class="external-link" rel="nofollow">Dojo RPC</A>. The <A href="http://dojotoolkit.org/" class="external-link" rel="nofollow">Dojo</A> toolkit is a popular framework for writing Ajax/Web 2.0 style browser client applications. Tuscany SCA services which use &lt;binding.jsonrpc&gt; will by default support  the <A href="http://dojo.jot.com/SMD" class="external-link" rel="nofollow">Simple Method Description (SMD) </A> protocol. SMD is similar to ?wsdl for Web services, entering a service endpoint appended with ?smd will return a SMD descriptor for the service. </P>
+
+<P>Using Tuscany SCA services with Dojo can therefore be as simple as the following:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  <SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> dojo.rpc.JsonService(<SPAN class="code-quote">&quot;myService?smd&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-Supporteddatatypes"></A>Supported data types</H4>
+
+<P>The JSON-RPC binding utilize the Databinding Framework to provide support for the following data transformations :</P>
+
+<UL>
+	<LI>Primitive Type &lt;==&gt; JSON &lt;==&gt; Primitive Type</LI>
+	<LI>Array of Primitive Type  &lt;==&gt; JSON &lt;==&gt; Array of Primitive Type</LI>
+	<LI>Java bean &lt;==&gt; JSON &lt;==&gt; Java bean</LI>
+	<LI>List &lt;==&gt; JSON &lt;==&gt; List</LI>
+	<LI>Map &lt;==&gt; JSON &lt;==&gt; Map</LI>
+	<LI>Set &lt;==&gt; JSON &lt;==&gt; Set</LI>
+</UL>
+
+
+<H4><A name="SCAJavabinding.jsonrpc-Someexamples%3A"></A>Some examples:</H4>
+
+<P>There are two samples showing using &lt;binding.jsonrpc&gt;, one which uses the Dojo Toolkit on the client, and another which uses the Tuscany scaDomain.js script. The samples are <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-dojo/" class="external-link" rel="nofollow">helloworld-dojo</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/" class="external-link" rel="nofollow">helloworld-jsonrpc</A>.</P>
+
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.jsonrpc';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingrest.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingrest.html
new file mode 100644
index 0000000000..5c7fa11f94
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingrest.html
@@ -0,0 +1,515 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.rest : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rest">SCA Java binding.rest</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rest">SCA Java binding.rest</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.rest</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644360">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644360">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644360">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644360">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644360">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=20644360">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavabinding.rest-%3Cbinding.rest%3EIntroduction"></A>&lt;binding.rest&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Representational State Transfer (REST) services invocations via the &lt;binding.rest&gt; extension. Tuscany REST binding leverage JAX-RS Standards based annotations to map business operations to HTTP operations such as POST, GET, PUT and DELETE and utilizes Tuscany Databindings to provide support for different wire formats such as JSON, XML, Binary, etc shielding the application developer from contaminating his business logic with code to handle payload production/transformation details.</P>
+
+<H3><A name="SCAJavabinding.rest-UsingtheTuscanyRESTbinding"></A>Using the Tuscany REST binding</H3>
+
+<P>The primary use of the REST binding is to provide business services over HTTP in a distributed fashion. The simplest way to use the REST binding is to declare a business service that can be shared over the web and provide an HTTP address where one can access the service. This service is declared in an SCA composite file.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">	
+    &lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+	&lt;implementation.java class=<SPAN class="code-quote">&quot;services.store.FruitsCatalogImpl&quot;</SPAN>/&gt; 
+        &lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+	    &lt;tuscany:binding.<SPAN class="code-keyword">rest</SPAN> uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/Catalog&quot;</SPAN>&gt;
+</SPAN>    	        &lt;tuscany:wireFormat.json /&gt;
+	        &lt;tuscany:operationSelector.jaxrs /&gt;
+    	    &lt;/tuscany:binding.<SPAN class="code-keyword">rest</SPAN>&gt;
+   	&lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+
+<P>Another way of implementing a REST service is to use a collection interface that matches the actions of the HTTP protocol. In this case, the methods must be named post, get, put, and delete. Tuscany ensures that the proper method is invoked via the request and response protocol of HTTP:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class TestGetImpl {
+    
+    <SPAN class="code-keyword">public</SPAN> InputStream get(<SPAN class="code-object">String</SPAN> id) {
+        <SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> ByteArrayInputStream((<SPAN class="code-quote">&quot;&lt;html&gt;&lt;body&gt;&lt;p&gt;This is the service GET method, item=&quot;</SPAN> + id + <SPAN class="code-quote">&quot;&lt;/body&gt;&lt;/html&gt;&quot;</SPAN>).getBytes());
+
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<P>So using the common verbs of HTTP and Java object serialization, one can implement services and run them anywhere the HTTP protocol is implemented. The service developer or implementer simply creates methods for post, get, put, and delete, and a business collection such as a shopping cart, telephone directory, insurance form, or blog sites can be created. See the Tuscany module binding-rest-runtime for complete examples.</P>
+
+
+<H3><A name="SCAJavabinding.rest-MappingbusinessinterfacestoHTTPOperationsusingJAXRSStandardAnnotations"></A>Mapping business interfaces to HTTP Operations using JAX-RS Standard Annotations</H3>
+
+<P>JAX-RS offers standards based annotations that allow properly configuration of the REST service endpoint and mappings of specific HTTP operations (e.g. get, put, post, delete) to java operations. The following subset of JAX-RS annotations are currently supported :</P>
+
+<H4><A name="SCAJavabinding.rest-URIMappings"></A>URI Mappings</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Path
+@Path(<SPAN class="code-quote">&quot;{id}&quot;</SPAN>)
+@PathParam(<SPAN class="code-quote">&quot;id&quot;</SPAN>)
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.rest-OperationMappings"></A>Operation Mappings</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@GET
+@PUT
+@POST
+@DELETE
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.rest-EnablingJAXRSannotationprocessing"></A>Enabling JAX-RS annotation processing</H4>
+
+<P>In order to enable JAX-RS annotation processing, a component need to be configured to use JAX-RS Operation Selector.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        &lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.store.FruitsCatalogImpl&quot;</SPAN>/&gt; 
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;tuscany:binding.<SPAN class="code-keyword">rest</SPAN> uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/Catalog&quot;</SPAN>&gt;
+</SPAN>    		            &lt;tuscany:wireFormat.json /&gt;
+			    &lt;tuscany:operationSelector.jaxrs /&gt;
+    		        &lt;/tuscany:binding.<SPAN class="code-keyword">rest</SPAN>&gt;
+   		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>/&gt;	
+	&lt;/component&gt; 
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Integration with a existent JAX-RS engine might help on processing the full set of JAX-RS annotations. I have started looking into leveraging Wink resourceProcessor or related code to help on this layer.</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.rest-MappingRPCstylecallsoverHTTPGET"></A>Mapping RPC style calls over HTTP GET</H3>
+
+<P>In some cases, there isn't a simple mapping of a business operation as resources, but there is still a desire to take advantage of HTTP caching and other benefits that HTTP GET type of operations provide. In order to accomplish this, binding.rest has built in functionality that allows you to map RPC style calls to HTTP GET operations.</P>
+
+
+
+<H4><A name="SCAJavabinding.rest-ClientInvocation"></A>Client Invocation</H4>
+
+<P>The URL schema follows a simple pattern :</P>
+
+<UL class="alternate" type="square">
+	<LI>&lt;base service URI&gt; ?<B>method=</B>&lt;operation name&gt;&amp;<B>parm1=</B>&lt;value&gt;&amp;<B>parm2=</B>&lt;value&gt;</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8085/EchoService?method=echo&amp;msg=Hello RPC</SPAN>
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//localhost:8085/EchoService?method=echoArrayString&amp;msgArray=Hello RPC1&amp;msgArray=Hello RPC2&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.rest-MappingQueryStringstoBusinessOperationparameters"></A>Mapping QueryStrings to Business Operation parameters</H4>
+
+<P>Standard JAX-RS annotation @QueryParam is used to map parameters sent over HTTP GET invocations using query string to business operation parameter</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Echo {
+
+    <SPAN class="code-object">String</SPAN> echo(@QueryParam(<SPAN class="code-quote">&quot;msg&quot;</SPAN>) <SPAN class="code-object">String</SPAN> msg);
+
+    <SPAN class="code-object">int</SPAN> echoInt(<SPAN class="code-object">int</SPAN> param);
+
+    <SPAN class="code-object">boolean</SPAN> echoBoolean(<SPAN class="code-object">boolean</SPAN> param);
+
+    <SPAN class="code-object">String</SPAN> [] echoArrayString(@QueryParam(<SPAN class="code-quote">&quot;msgArray&quot;</SPAN>) <SPAN class="code-object">String</SPAN>[] stringArray);
+
+    <SPAN class="code-object">int</SPAN> [] echoArrayInt(<SPAN class="code-object">int</SPAN>[] intArray);
+
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.rest-EnablingRPCtoHTTPGETmapping"></A>Enabling RPC to HTTP GET mapping</H4>
+
+<P>In order to enable automatically mapping, a component need to be configured to use RPC Operation Selector.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        &lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.store.FruitsCatalogImpl&quot;</SPAN>/&gt; 
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;tuscany:binding.<SPAN class="code-keyword">rest</SPAN> uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/Catalog&quot;</SPAN>&gt;
+</SPAN>    		            &lt;tuscany:wireFormat.json /&gt;
+                            &lt;tuscany:response&gt;
+                                &lt;tuscany:operationSelector.rpc /&gt;
+                            &lt;/tuscany:response&gt;
+    		        &lt;/tuscany:binding.<SPAN class="code-keyword">rest</SPAN>&gt;
+   		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>/&gt;	
+	&lt;/component&gt; 
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.rest-WireFormats"></A>Wire Formats</H3>
+
+<P>This binding will support two styles of wire formats and will be used to control what type of payload will be generated by the service:</P>
+
+<UL class="alternate" type="square">
+	<LI>hardWired : where you hard code the wire format expectations in the composite when configuring the binding. In the example below, service will be using JSON payload.</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding...&gt;
+   &lt;wireFormat.json&gt;
+&lt;/binding...&gt;
+</PRE>
+</DIV></DIV>
+
+<UL class="alternate" type="square">
+	<LI>dynamic : based on Content-Type header for request and Accept header for response. In the case below, the request content will be parsed based on the Content-Type request header and the response payload will be based on the request Accept header.</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding...&gt;
+   &lt;wireFormat.dynamic&gt;
+&lt;/binding...&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.rest-CachecontrolusingETags%2CLastModifiedandotherHTTPHeaders"></A>Cache control using ETags, Last-Modified and other HTTP Headers</H3>
+
+<P>The HTTP specification provides a set of methods for HTTP clients and servers to interact. These methods form the foundation of the World Wide Web. Tuscany implements many of these methods a binding interface to a collection. The main methods are:</P>
+
+<UL>
+	<LI>GET - retrieves an item from a collection</LI>
+	<LI>POST - creates or adds an item to a collection</LI>
+	<LI>PUT - updates or replaces an item in a collection</LI>
+	<LI>DELETE - removes an item in a a collection</LI>
+</UL>
+
+
+<P>The HTTP specification (HTTP 1.1 Chapter 13 - Caching) also provides a mechanism by which these methods may be executed conditionally. To perform conditional methods, an HTTP client puts 3 items in the HTTP request header:</P>
+
+<UL>
+	<LI>ETag - entity tag, a unique identifier to an item in a collection. Normally created and returned by the server when creating (POST) a new item.</LI>
+	<LI>LastModified - an updated field. Normally a string containing a date and time of the last modification of the item.</LI>
+	<LI>Predicate - a logical test (e.g. IfModified, IfUnmodified) to use with the ETag and LastModified to determine whether to act.</LI>
+</UL>
+
+
+<P>The complete list of predicates is given in the HTTP specification.</P>
+
+<P>The most common use of conditional methods is to prevent two requests to the server instead of one conditional request. For example, a common scenario is to check if an item has been modified, if not changed update it with a new version, if changed do not update it. With a conditional PUT method (using the IfUnmodifed predicate and a LastModified date), this can be done in one action. Another common use is to prevent multiple GETs of an item to ensure we have a valid copy. Rather than doing a second request of a large item, one can do a conditional GET request (using an IfModified predicate and a LastModified date), and avoid the second request if our object is still valid. The server responds with either a normal response body, or status code 304 (Not Modified), or status code 412 (precondition failed).</P>
+
+<P>Default cache control is done by using generated ETags based on response content checksum. To avoid data to be overwriten during concurrent updates, include an HTTP If-Match header that contains the original content ETag value. If you want to force an update regardless of whether someone else has updated it since you retrieved it, then use If-Match: * and don't include the ETag.</P>
+
+<H4><A name="SCAJavabinding.rest-Declarativecachecontrol"></A>Declarative cache control</H4>
+<P>In order to allow for better flexibility, and re-usability of the components exposed as REST services, there is an option to declare cache controls when configuring the REST Binding as show the example below :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	&lt;component name=<SPAN class="code-quote">&quot;CustomerService&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.customer.CustomerServiceImpl&quot;</SPAN>/&gt; 
+		&lt;service name=<SPAN class="code-quote">&quot;CustomerService&quot;</SPAN>&gt;
+			&lt;tuscany:binding.<SPAN class="code-keyword">rest</SPAN> uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/Customer&quot;</SPAN>&gt;
+</SPAN>    		    &lt;tuscany:wireFormat.xml /&gt;
+			    &lt;tuscany:operationSelector.jaxrs /&gt;
+			    &lt;tuscany:http-headers&gt;
+			       &lt;tuscany:header name=<SPAN class="code-quote">&quot;Cache-Control&quot;</SPAN> value=<SPAN class="code-quote">&quot;no-cache&quot;</SPAN>/&gt;
+			       &lt;tuscany:header name=<SPAN class="code-quote">&quot;Expires&quot;</SPAN> value=<SPAN class="code-quote">&quot;-1&quot;</SPAN>/&gt;
+			       &lt;tuscany:header name=<SPAN class="code-quote">&quot;X-Tuscany&quot;</SPAN> value=<SPAN class="code-quote">&quot;tuscany&quot;</SPAN>/&gt; 
+			    &lt;/tuscany:http-headers&gt;
+    		&lt;/tuscany:binding.<SPAN class="code-keyword">rest</SPAN>&gt;
+   		&lt;/service&gt;
+	&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>This could be enhanced to enable more complex injection of fields to cache control headers.</TD></TR></TABLE></DIV>
+
+
+
+<H3><A name="SCAJavabinding.rest-StorescenariosgoesRESTCatalogServicesusingbinding.rest"></A>Store scenarios goes REST - Catalog Services using binding.rest</H3>
+
+<P>Below is our Store Catalog exposed as REST services utilizing the new binding.rest.</P>
+
+<P>Let's start by looking on how the component gets defined and configured in the composite file, particularly the following details :</P>
+
+<UL class="alternate" type="square">
+	<LI>binding.rest uri defines the Catalog service endpoint</LI>
+	<LI>wireFormat.json configure the service to use JSON as the payload</LI>
+	<LI>operationSelector.jaxrs configure the binding to use JAX-RS annotations to map the HTTP operations to business operations</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite	xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//docs.oasis-open.org/ns/opencsa/sca/200912&quot;</SPAN>
+</SPAN>		xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.1&quot;</SPAN>
+</SPAN>		targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN>
+</SPAN>		name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		
+	&lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.store.FruitsCatalogImpl&quot;</SPAN>/&gt; 
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;tuscany:binding.<SPAN class="code-keyword">rest</SPAN> uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/Catalog&quot;</SPAN>&gt;
+</SPAN>    		            &lt;tuscany:wireFormat.json /&gt;
+			    &lt;tuscany:operationSelector.jaxrs /&gt;
+    		        &lt;/tuscany:binding.<SPAN class="code-keyword">rest</SPAN>&gt;
+   		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>/&gt;	
+	&lt;/component&gt; 
+    
+	&lt;component name=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.store.CurrencyConverterImpl&quot;</SPAN>/&gt;
+	&lt;/component&gt;     
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<P>Below is the Catalog Interface utilizing JAX-RS standard annotations to map HTTP operations to business operations.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services.store;
+
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.DELETE;
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.GET;
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.POST;
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.PUT;
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.Path;
+<SPAN class="code-keyword">import</SPAN> javax.ws.rs.PathParam;
+
+<SPAN class="code-keyword">import</SPAN> org.oasisopen.sca.annotation.Remotable;
+
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Catalog {
+    
+    @GET
+    Item[] getAll();
+    
+    @GET
+    @Path(<SPAN class="code-quote">&quot;{id}&quot;</SPAN>)
+    Item getItemById(@PathParam(<SPAN class="code-quote">&quot;id&quot;</SPAN>) <SPAN class="code-object">String</SPAN> itemId);
+    
+    @POST
+    void addItem(Item item);
+    
+    @PUT
+    void updateItem(Item item);
+    
+    @DELETE
+    @Path(<SPAN class="code-quote">&quot;{id}&quot;</SPAN>)
+    void deleteItem(@PathParam(<SPAN class="code-quote">&quot;id&quot;</SPAN>) <SPAN class="code-object">String</SPAN> itemId);
+}
+</PRE>
+</DIV></DIV>
+
+<P>Below is the Fuit catalog implementation</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>)
+<SPAN class="code-keyword">public</SPAN> class FruitsCatalogImpl <SPAN class="code-keyword">implements</SPAN> Catalog {
+    
+    @Property
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> currencyCode = <SPAN class="code-quote">&quot;USD&quot;</SPAN>;
+    
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> CurrencyConverter currencyConverter;
+    
+    <SPAN class="code-keyword">private</SPAN> Map&lt;<SPAN class="code-object">String</SPAN>, Item&gt; catalog = <SPAN class="code-keyword">new</SPAN> HashMap&lt;<SPAN class="code-object">String</SPAN>, Item&gt;();
+
+    @Init
+    <SPAN class="code-keyword">public</SPAN> void init() {
+        <SPAN class="code-object">String</SPAN> currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
+        catalog.put(<SPAN class="code-quote">&quot;Apple&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Apple&quot;</SPAN>,  currencySymbol + currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 2.99)));
+        catalog.put(<SPAN class="code-quote">&quot;Orange&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Orange&quot;</SPAN>, currencySymbol + currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 3.55)));
+        catalog.put(<SPAN class="code-quote">&quot;Pear&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Pear&quot;</SPAN>, currencySymbol + currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 1.55)));
+    }
+
+    <SPAN class="code-keyword">public</SPAN> Item[] getAll() {
+        Item[] catalogArray = <SPAN class="code-keyword">new</SPAN> Item[catalog.size()];
+        catalog.values().toArray(catalogArray);
+        <SPAN class="code-keyword">return</SPAN> catalogArray;
+    }
+    
+    <SPAN class="code-keyword">public</SPAN> Item getItemById(<SPAN class="code-object">String</SPAN> itemId) {
+        <SPAN class="code-keyword">return</SPAN> catalog.get(itemId);
+    }
+    
+    <SPAN class="code-keyword">public</SPAN> void addItem(Item item) {
+        catalog.put(item.getName(),item);
+    }
+    
+    <SPAN class="code-keyword">public</SPAN> void updateItem(Item item) {
+        <SPAN class="code-keyword">if</SPAN>(catalog.get(item.getName()) != <SPAN class="code-keyword">null</SPAN>) {
+            catalog.put(item.getName(), item);
+        }
+    }
+    
+    <SPAN class="code-keyword">public</SPAN> void deleteItem(<SPAN class="code-object">String</SPAN> itemId) {
+        <SPAN class="code-keyword">if</SPAN>(catalog.get(itemId) != <SPAN class="code-keyword">null</SPAN>) {
+            catalog.remove(itemId);
+        }        
+    }
+}
+</PRE>
+</DIV></DIV>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.rest';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingrmi.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingrmi.html
new file mode 100644
index 0000000000..db3ef6e3c6
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingrmi.html
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.rmi : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rmi">SCA Java binding.rmi</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rmi">SCA Java binding.rmi</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.rmi</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964949">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964949">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964949">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964949">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964949">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964949">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavabinding.rmi-%3Cbinding.rmi%3E"></A>&lt;binding.rmi&gt;</H3>
+
+<P>Tuscany supports <A href="http://java.sun.com/javase/technologies/core/basic/rmi/index.jsp" class="external-link" rel="nofollow">Remote Method Invocation (RMI)</A> as a protocol for use with SCA services and references by using the &lt;binding.rmi&gt; SCDL extension. </P>
+
+<P>The RMI binding enables SCA components to use or be used by any other application which uses the standard Java RMI protocol. One use of this is to easily integrate the Tuscany runtime with existing Java applications which use RMI.</P>
+
+<P>This RMI binding SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;binding.rmi host=<SPAN class="code-quote">&quot;&quot; port=&quot;</SPAN><SPAN class="code-quote">&quot; serviceName=&quot;</SPAN>&quot;/&gt;
+</PRE>
+</DIV></DIV>
+
+
+
+
+<H4><A name="SCAJavabinding.rmi-Someexamples%3A"></A>Some examples:</H4>
+
+<P>This example composite shows how to make an SCA component available as an RMI service:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           xmlns:rmi=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;HelloWorldRmiComposite&quot;</SPAN>&gt;
+
+   &lt;service name=<SPAN class="code-quote">&quot;HelloWorldRmiService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+      &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN>/&gt;
+      &lt;binding.rmi host=<SPAN class="code-quote">&quot;localhost&quot;</SPAN> port=<SPAN class="code-quote">&quot;8099&quot;</SPAN> serviceName=<SPAN class="code-quote">&quot;HelloWorldRemoteService&quot;</SPAN>   /&gt;
+      &lt;reference target=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;HelloWorldServiceComponent&lt;/reference&gt;
+   &lt;/service&gt;
+      
+   &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+      &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldImpl&quot;</SPAN>/&gt;
+   &lt;/component&gt;   
+  
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.rmi';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-bindingws.html b/site/trunk/site-publish/documentation-2x/sca-java-bindingws.html
new file mode 100644
index 0000000000..6f3d5a9946
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-bindingws.html
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java binding.ws : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ws">SCA Java binding.ws</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ws">SCA Java binding.ws</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java binding.ws</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964946">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964946">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964946">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964946">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964946">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964946">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavabinding.ws-%3Cbinding.ws%3E"></A>&lt;binding.ws&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports Web services by using the &lt;binding.ws&gt; SCDL extension. New Web service endpoints can be provided by using &lt;binding.ws&gt; within a SCA &lt;service&gt;, existing Web services can be invoked by using &lt;binding.ws&gt; within a SCA &lt;reference&gt;.</P>
+
+<P>The Web service binding is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-bindings" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<P>The Web service binding SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.ws name=<SPAN class="code-quote">&quot;NCName&quot;</SPAN>? uri=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>? wsdlElement=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>? wsdli:wsdlLocation=<SPAN class="code-quote">&quot;list of xs:anyURI&quot;</SPAN>? &gt;
+   &lt;wsa:EndpointReference&gt;...&lt;/wsa:EndpointReference&gt;*
+&lt;/binding.ws&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.ws-simpleuse"></A>simple use</H4>
+
+<P>All the attributes and elements of the Web service binding are optional, so the simplest way to use it is to use all the defaults:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.ws/&gt;</PRE>
+</DIV></DIV>
+
+<P>With that simplest form the endpoint which will be used is derived from the names of the component and binding. This works well for services but for references its likely not what you want, so with references the following is a more useful simplest form:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//someHost/someService&quot;</SPAN>/&gt;</SPAN></PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.ws-wsdlElement"></A>wsdlElement</H4>
+
+<P>The wsdlElement attribute indicates that a WSDL document exists which should be used and it points to the element within that WSDL to use. The value of the wsdlElement attribute can have one of the following four forms:</P>
+
+<OL>
+	<LI>Service:<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.service(&lt;service-name&gt;)<BR>
+ In this case, all the endpoints in the WSDL Service that have equivalent PortTypes with the SCA service or reference must be available to the SCA service or reference.</LI>
+	<LI>Port (WSDL 1.1):<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.port(&lt;service-name&gt;/&lt;port-name&gt;)<BR>
+ In this case, the identified port in the WSDL 1.1 Service must have an equivalent PortType with the SCA service or reference.</LI>
+	<LI>Endpoint (WSDL 2.0):<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.endpoint(&lt;service-name&gt;/&lt;endpoint-name&gt;)<BR>
+ In this case, the identified endpoint in the WSDL 2.0 Service must have an equivalent PortType with the SCA service or reference.</LI>
+	<LI>Binding:<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.binding(&lt;binding-name&gt;)<BR>
+ In this case, the identified WSDL binding must have an equivalent PortType with the SCA service or reference. In this case the endpoint address URI for the SCA service or reference must be provided via the URI attribute on the binding.</LI>
+</OL>
+
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>What will the endpoint be?</B><BR>The actual Web service endpoint used depends on whether or not a WSDL port is being used, if the EndpointReference element or the uri attribute of the &lt;binding.ws&gt; has been specified, and the names of the component and binding. The actual alogrythim defined in the Web service binding specification is: 
+
+<OL>
+	<LI>Either the URIs in the endpoint(s) of the referenced WSDL<BR>
+  or the URI specified by the wsa:Address element of the wsa:EndpointReference</LI>
+	<LI>The explicitly stated URI in the &quot;uri&quot; attribute of the binding.ws element, which may be relative,</LI>
+	<LI>The implicit URI as defined by the Assembly specification</LI>
+</OL>
+
+
+<P>The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a relative URI, in which case it is relative to the URI defined in (2) or (3). The wsa:Address element can be the empty relative URI, in which case it uses the URI defined in (2) or (3) directly. This allows the EPR writer to specify reference parameters, metadata and other EPR contents while allowing the URI to be chosen by the deployer. To reference a WSDL document and also specify an EPR, the wsdlElement attribute must refer to a binding element in the WSDL and not an endpoint or service.</P></TD></TR></TABLE></DIV>
+
+<H4><A name="SCAJavabinding.ws-wsdlLocation"></A>wsdlLocation</H4>
+
+<P>The wsdlLocation attribute enables defining the location of the WSDL document to be used. Using wsdlLocation is not normally necessary as the Tuscany contrabution service will have discovered all the WSDL documents within a deployed SCA contrabution.</P>
+
+<H4><A name="SCAJavabinding.ws-wsa%3AEndpointReference"></A>wsa:EndpointReference</H4>
+
+<P>This attribute enables using a WS-Addressing EndpointReference that specifies the endpoint for the service or reference, or any WSA reference parameters, metadata and other EPR contents to be used.</P>
+
+<H3><A name="SCAJavabinding.ws-Someexamples%3A"></A>Some examples:</H3>
+
+<P>This example shows making a HelloWorld component available as a Web service endpoint. All the Web service binding defaults are used so the endpoint of the Web service will be <A href="http://localhost:8080/HelloWorldComponent" class="external-link" rel="nofollow">http://localhost:8080/HelloWorldComponent</A>.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>           xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;helloworldws&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldComponent&quot;</SPAN>&gt;
+       &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN> /&gt;
+       &lt;binding.ws /&gt;
+    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldImpl&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java binding.ws';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-definitionsxml.html b/site/trunk/site-publish/documentation-2x/sca-java-definitionsxml.html
new file mode 100644
index 0000000000..6474cfcd7f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-definitionsxml.html
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java definitions.xml : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java definitions.xml">SCA Java definitions.xml</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java definitions.xml">SCA Java definitions.xml</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java definitions.xml</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964975">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964975">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964975">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964975">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964975">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964975">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavadefinitions.xml-definitions.xml"></A>definitions.xml</H1>
+
+<P>Section 1.8 describes the definitions.xml file as holding all of the artifacts that are useful for configuring an SCA domain but that are not specific to a particular composite or component. It goes on to say that &quot;All of these artifacts within and SCA Domain are defined in a global, SCA Domain-wide file named definitions.xml&quot;. To achieve our extensibility goals we, in Tuscany, consider the SCA Domain wide definitions.xml file to be a logical concept that is constructed at runtime from the contents of definitions.xml files provided in contributions and in Tuscany extensions. </P>
+
+<P>Each definitions.xml file may contain.</P>
+
+<UL>
+	<LI>Intents</LI>
+	<LI>Policy sets</LI>
+	<LI>Predefined binding specifications</LI>
+	<LI>Binding type descriptions</LI>
+	<LI>Implementation type descriptions</LI>
+</UL>
+
+
+<H2><A name="SCAJavadefinitions.xml-CompleteFeatures"></A>Complete Features</H2>
+
+<H3><A name="SCAJavadefinitions.xml-AddIntentsandPolicySetswithanExtension"></A>Add Intents and Policy Sets with an Extension</H3>
+
+<P>An extension, such as the modules/policy-security extension relies on some policy sets and intents being available in the SCA Domain. The definitions.xml is the place to define these and hence if you look in this extension module you will find the following. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>
+    &lt;!-- POLICY SETS --&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;runAs&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;allow&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;rolesAllowed&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;permitAll&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;denyAll&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    
+	&lt;!-- Policy Intents Defined by the SCA <SPAN class="code-object">Runtime</SPAN> --&gt;
+	&lt;intent name=<SPAN class="code-quote">&quot;authentication&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent on references requires necessary authentication information
+			to be sent along with outgoing messages. Specifying <SPAN class="code-keyword">this</SPAN> intent on service requires
+			incoming messages to be authenticated
+		&lt;/description&gt;
+	&lt;/intent&gt;
+	
+	&lt;intent name=<SPAN class="code-quote">&quot;confidentiality&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent requires message exchanged to be encrypted
+		&lt;/description&gt;
+	&lt;/intent&gt;
+	
+	&lt;intent name=<SPAN class="code-quote">&quot;integrity&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent requires message exchanged to be signed
+		&lt;/description&gt;
+	&lt;/intent&gt;
+&lt;/definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>When this module is loaded at runtime the contents of this file are made generally available and hence in you composite you can use statements such at. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+&lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+    &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+    &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> &gt;
+        &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.AddService&quot;</SPAN> /&gt;        
+        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/sample-calculator-ws-secure-webapp/AddServiceComponent&quot;</SPAN>
+</SPAN>                    requires=<SPAN class="code-quote">&quot;authentication&quot;</SPAN> /&gt;        
+    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where <TT>requires=&quot;authentication&quot;</TT> refers to <TT>intent name=&quot;authentication&quot;</TT> which is now available as an SCA Domain level definition.</P>
+
+<H2><A name="SCAJavadefinitions.xml-TODOFeatures"></A>TODO Features</H2>
+
+<H3><A name="SCAJavadefinitions.xml-AddIntentsandPolicySetswithaContribution"></A>Add Intents and Policy Sets with a Contribution</H3>
+
+<P>If contributionA provides a file such as:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;sca:definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>
+&lt;sca:intent name=<SPAN class="code-quote">&quot;specialAuthentication&quot;</SPAN> 
+            constrains=<SPAN class="code-quote">&quot;sca:binding.ws&quot;</SPAN>&gt;
+    &lt;description&gt;
+        Communitcation thro <SPAN class="code-keyword">this</SPAN> binding required Authentication.
+    &lt;/description&gt;
+&lt;/sca:intent&gt;	
+ 
+&lt;/sca:definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>and ContributionB provides a file such as:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;sca:policySet name=<SPAN class="code-quote">&quot;specialAuthenticationPolicy&quot;</SPAN>
+ 	       provides=<SPAN class="code-quote">&quot;tuscany:wsAuthentication&quot;</SPAN>
+ 	       appliesTo=<SPAN class="code-quote">&quot;<SPAN class="code-comment">//sca:binding.ws&quot;</SPAN>&gt;
+</SPAN>    &lt;tuscany:wsConfigParam&gt;
+        &lt;parameter name=<SPAN class="code-quote">&quot;OutflowSecurity&quot;</SPAN>&gt;
+            &lt;action&gt;
+                &lt;items&gt;UsernameToken&lt;/items&gt;
+                &lt;user&gt;TuscanyWsUser&lt;/user&gt;
+                &lt;passwordCallbackClass&gt;my.PWCBHandler&lt;/passwordCallbackClass&gt;&quot;
+                &lt;passwordType&gt;PasswordText&lt;/passwordType&gt;
+            &lt;/action&gt;
+        &lt;/parameter&gt;
+    &lt;/tuscany:wsConfigParam&gt;
+&lt;/sca:policySet&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then both the itent and the policySet should be available in the logical SCA Domain-wide definitions.xml and the policySet &quot;specialAuthenticationPolicy&quot; should successfully find the intent &quot;tuscany:wsAuthentication&quot;. Composite files contributed to the domain will successfully be able to reference both the intent and the policy set. </P>
+
+<P>See: </P>
+
+<P><A href="https://issues.apache.org/jira/browse/TUSCANY-2499" class="external-link" rel="nofollow">https://issues.apache.org/jira/browse/TUSCANY-2499</A><BR>
+<A href="http://www.mail-archive.com/dev@tuscany.apache.org/msg01077.html" class="external-link" rel="nofollow">http://www.mail-archive.com/dev%40tuscany.apache.org/msg01077.html</A></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java definitions.xml';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/Contribution-ClassLoading.doc b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/Contribution-ClassLoading.doc
new file mode 100644
index 0000000000..6787543f14
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/Contribution-ClassLoading.doc
@@ -0,0 +1,508 @@
+{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch11\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
+{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
+{\f11\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f36\fmodern\fcharset128\fprq1{\*\panose 00000000000000000000}@MS Mincho;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}
+{\f38\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f40\froman\fcharset161\fprq2 Times New Roman Greek;}{\f41\froman\fcharset162\fprq2 Times New Roman Tur;}{\f42\froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f43\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f44\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f45\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f47\fswiss\fcharset238\fprq2 Arial CE;}
+{\f48\fswiss\fcharset204\fprq2 Arial Cyr;}{\f50\fswiss\fcharset161\fprq2 Arial Greek;}{\f51\fswiss\fcharset162\fprq2 Arial Tur;}{\f52\fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f53\fswiss\fcharset178\fprq2 Arial (Arabic);}
+{\f54\fswiss\fcharset186\fprq2 Arial Baltic;}{\f55\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f57\fmodern\fcharset238\fprq1 Courier New CE;}{\f58\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f60\fmodern\fcharset161\fprq1 Courier New Greek;}
+{\f61\fmodern\fcharset162\fprq1 Courier New Tur;}{\f62\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f63\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f64\fmodern\fcharset186\fprq1 Courier New Baltic;}
+{\f65\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f149\fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt ?l?r ??\'81\'66c};}{\f147\fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt ?l?r ??\'81\'66c};}
+{\f148\fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt ?l?r ??\'81\'66c};}{\f150\fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt ?l?r ??\'81\'66c};}{\f151\fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt ?l?r ??\'81\'66c};}
+{\f154\fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt ?l?r ??\'81\'66c};}{\f399\fmodern\fcharset0\fprq1 @MS Mincho Western;}{\f397\fmodern\fcharset238\fprq1 @MS Mincho CE;}{\f398\fmodern\fcharset204\fprq1 @MS Mincho Cyr;}
+{\f400\fmodern\fcharset161\fprq1 @MS Mincho Greek;}{\f401\fmodern\fcharset162\fprq1 @MS Mincho Tur;}{\f404\fmodern\fcharset186\fprq1 @MS Mincho Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
+\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;
+\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\f0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 \snext0 Normal;}{\*\cs10 \additive 
+\ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\loch\f0\hich\af0\dbch\af11\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 
+\sbasedon10 \styrsid10050314 Hyperlink;}{\s16\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\f0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 
+\sbasedon0 \snext16 \styrsid10161153 Normal (Web);}}{\*\listtable{\list\listtemplateid1580348194\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1261573102
+\'01\u-4051 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid314066308}{\list\listtemplateid-523760100\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace360\levelindent0{\leveltext\leveltemplateid546055038\'01\u-3913 ?;}{\levelnumbers;}\f3\cf0\fbias0\hres0\chhres0 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5400\jclisttab\tx5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6120\jclisttab\tx6120\lin6120 }{\listname ;}\listid715159185}{\list\listtemplateid-1763118866{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0
+\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0
+{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid731079578}{\list\listtemplateid1667669574\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace360\levelindent0{\leveltext\leveltemplateid546055038\'01\u-3913 ?;}{\levelnumbers;}\f3\cf0\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid891424629}{\list\listtemplateid-2081029930{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0
+\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0
+{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid891693059}{\list\listtemplateid292338260{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1116608126}{\list\listtemplateid-1536026092\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
+{\leveltext\leveltemplateid546055038\'01\u-3913 ?;}{\levelnumbers;}\f3\cf0\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1181050274}{\list\listtemplateid1701054940{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-4051 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
+{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880
+\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel
+\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1313297007}{\list\listtemplateid1701054940\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace360\levelindent0{\leveltext\leveltemplateid1261573102\'01\u-4051 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1378965984}{\list\listtemplateid-2073944638{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0
+\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0
+{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1460950139}{\list\listtemplateid-1418542954{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1871453387}}{\*\listoverridetable{\listoverride\listid891693059\listoverridecount0\ls1}{\listoverride\listid731079578\listoverridecount0\ls2}
+{\listoverride\listid1116608126\listoverridecount0\ls3}{\listoverride\listid1871453387\listoverridecount0\ls4}{\listoverride\listid1460950139\listoverridecount0\ls5}{\listoverride\listid1378965984\listoverridecount0\ls6}{\listoverride\listid1313297007
+\listoverridecount0\ls7}{\listoverride\listid1181050274\listoverridecount0\ls8}{\listoverride\listid891424629\listoverridecount0\ls9}{\listoverride\listid715159185\listoverridecount0\ls10}{\listoverride\listid314066308\listoverridecount0\ls11}}{\*\pgptbl 
+{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid28757\rsid329786\rsid485903\rsid539137\rsid548600\rsid548764\rsid664037\rsid672375\rsid723666\rsid861443\rsid861593\rsid1127291\rsid1316508\rsid1455334\rsid1466653
+\rsid1575154\rsid1705583\rsid1932963\rsid2051197\rsid2174974\rsid2235070\rsid2296172\rsid2313813\rsid2439906\rsid2441954\rsid2501940\rsid2629112\rsid2635705\rsid2713663\rsid2758865\rsid2769575\rsid2780748\rsid2822041\rsid2843319\rsid2888904\rsid2960142
+\rsid3038408\rsid3107992\rsid3482368\rsid3826780\rsid3877851\rsid3891453\rsid4027380\rsid4073862\rsid4260013\rsid4344555\rsid4391115\rsid4462937\rsid4608592\rsid4618129\rsid4720541\rsid4731966\rsid4734635\rsid4738754\rsid4999167\rsid5056151\rsid5243868
+\rsid5314898\rsid5389511\rsid5452951\rsid5468238\rsid5580748\rsid5703112\rsid5724989\rsid5794882\rsid5854839\rsid5917115\rsid5927568\rsid5971993\rsid6121198\rsid6189819\rsid6357399\rsid6448318\rsid6517470\rsid6585698\rsid6643333\rsid6911675\rsid6973915
+\rsid7020819\rsid7030027\rsid7031409\rsid7109352\rsid7153642\rsid7209946\rsid7217972\rsid7348812\rsid7434793\rsid7437856\rsid7549295\rsid7741077\rsid7955637\rsid8015483\rsid8067903\rsid8069675\rsid8078383\rsid8091336\rsid8132030\rsid8215713\rsid8396446
+\rsid8475943\rsid8543011\rsid8733147\rsid8748637\rsid8995845\rsid9051788\rsid9177086\rsid9188473\rsid9199563\rsid9270497\rsid9306821\rsid9372065\rsid9399793\rsid9401222\rsid9468978\rsid9469928\rsid9519892\rsid9532276\rsid9635826\rsid9665659\rsid9708269
+\rsid9774965\rsid9796414\rsid9915706\rsid10050314\rsid10161153\rsid10355341\rsid10435185\rsid10494592\rsid10582935\rsid10637518\rsid10701367\rsid10754746\rsid10755770\rsid10955544\rsid10973461\rsid11015475\rsid11163266\rsid11172638\rsid11288764
+\rsid11304604\rsid11425526\rsid11470771\rsid11566354\rsid11946342\rsid11952921\rsid12022509\rsid12063004\rsid12075301\rsid12090221\rsid12210718\rsid12280750\rsid12324527\rsid12333177\rsid12468982\rsid12548043\rsid12792170\rsid12859467\rsid12918761
+\rsid13198821\rsid13325517\rsid13333265\rsid13396628\rsid13517596\rsid13593376\rsid13701908\rsid13713842\rsid13830030\rsid13983957\rsid13991654\rsid14158236\rsid14169179\rsid14180275\rsid14434127\rsid14439776\rsid14830590\rsid14879766\rsid14892148
+\rsid14952634\rsid14952839\rsid14972237\rsid15012329\rsid15290583\rsid15420045\rsid15475977\rsid15559859\rsid15622462\rsid15669620\rsid15809868\rsid15889451\rsid15947457\rsid15957589\rsid16001292\rsid16266353\rsid16278179\rsid16387045\rsid16453325
+\rsid16454606\rsid16464510\rsid16519714\rsid16523468\rsid16589844\rsid16650932\rsid16670320\rsid16719075\rsid16724526}{\*\generator Microsoft Word 10.0.6854;}{\info{\operator Ramkumar Ramalingam}{\creatim\yr2009\mo12\dy17\hr17\min8}
+{\revtim\yr2010\mo1\dy5\hr16\min25}{\version199}{\edmins585}{\nofpages3}{\nofwords812}{\nofchars4629}{\nofcharsws5431}{\vern16393}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 urn:schemas-microsoft-com:office:smarttags}}
+\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0 \widowctrl\ftnbj\aenddoc\grfdocevents0\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind1\viewscale115\nolnhtadjtbl\rsidroot10050314 \fet0{\*\wgrffmtfilter 013f}\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
+\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid8067903 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\f1\insrsid8067903\charrsid11566354 \hich\af1\dbch\af11\loch\f1 SCA Contribution Framework:
+
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\lang1024\langfe1024\noproof\insrsid8067903 
+\par }{\lang1024\langfe1024\noproof\insrsid28757 {\shpgrp{\*\shpinst\shpleft21\shptop64\shpright8181\shpbottom9424\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk1\shpfblwtxt0\shpz0\shplid1026
+{\sp{\sn groupLeft}{\sv 1821}}{\sp{\sn groupTop}{\sv 2056}}{\sp{\sn groupRight}{\sv 9981}}{\sp{\sn groupBottom}{\sv 11416}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}}
+{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shpgrp{\*\shpinst\shplid1027{\sp{\sn groupLeft}{\sv 1941}}{\sp{\sn groupTop}{\sv 6184}}{\sp{\sn groupRight}{\sv 5661}}
+{\sp{\sn groupBottom}{\sv 8584}}{\sp{\sn relLeft}{\sv 1821}}{\sp{\sn relTop}{\sv 2104}}{\sp{\sn relRight}{\sv 5541}}{\sp{\sn relBottom}{\sv 4504}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn posh}{\sv 0}}{\sp{\sn posv}{\sv 0}}
+{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shp{\*\shpinst\shplid1028{\sp{\sn relLeft}{\sv 1941}}{\sp{\sn relTop}{\sv 6184}}{\sp{\sn relRight}{\sv 5661}}
+{\sp{\sn relBottom}{\sv 8584}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 65536}}{\sp{\sn hspNext}{\sv 1028}}
+{\sp{\sn lidRegroup}{\sv 2}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid2822041\charrsid15290583 \hich\af0\dbch\af11\loch\f0 ContributionScannerExtensionPoint
+\par }}}}{\shp{\*\shpinst\shplid1029{\sp{\sn relLeft}{\sv 2065}}{\sp{\sn relTop}{\sv 6564}}{\sp{\sn relRight}{\sv 5417}}{\sp{\sn relBottom}{\sv 6944}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 131072}}{\sp{\sn hspNext}{\sv 1029}}{\sp{\sn lidRegroup}{\sv 2}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+Jar Contribution Scanner
+\par }}}}{\shp{\*\shpinst\shplid1030{\sp{\sn relLeft}{\sv 2065}}{\sp{\sn relTop}{\sv 7039}}{\sp{\sn relRight}{\sv 5417}}{\sp{\sn relBottom}{\sv 7419}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 196608}}{\sp{\sn hspNext}{\sv 1030}}{\sp{\sn lidRegroup}{\sv 2}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+Directory Contribution Scanner
+\par }}}}{\shp{\*\shpinst\shplid1031{\sp{\sn relLeft}{\sv 2065}}{\sp{\sn relTop}{\sv 7514}}{\sp{\sn relRight}{\sv 5417}}{\sp{\sn relBottom}{\sv 7894}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 262144}}{\sp{\sn hspNext}{\sv 1031}}{\sp{\sn lidRegroup}{\sv 2}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+OSGiBundle Contribution Scanner
+\par }}}}{\shp{\*\shpinst\shplid1032{\sp{\sn relLeft}{\sv 2065}}{\sp{\sn relTop}{\sv 7989}}{\sp{\sn relRight}{\sv 5417}}{\sp{\sn relBottom}{\sv 8369}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 327680}}{\sp{\sn hspNext}{\sv 1032}}{\sp{\sn lidRegroup}{\sv 2}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \loch\af0\dbch\af11\hich\f0 \'85\'85\'85\'85
+\'85
+\par }}}}}}{\shpgrp{\*\shpinst\shplid1033{\sp{\sn groupLeft}{\sv 6261}}{\sp{\sn groupTop}{\sv 2056}}{\sp{\sn groupRight}{\sv 9981}}{\sp{\sn groupBottom}{\sv 4624}}{\sp{\sn relLeft}{\sv 6261}}
+{\sp{\sn relTop}{\sv 2056}}{\sp{\sn relRight}{\sv 9981}}{\sp{\sn relBottom}{\sv 4624}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}
+{\sp{\sn fLayoutInCell}{\sv 1}}{\shp{\*\shpinst\shplid1034{\sp{\sn relLeft}{\sv 6261}}{\sp{\sn relTop}{\sv 2056}}{\sp{\sn relRight}{\sv 9981}}{\sp{\sn relBottom}{\sv 4624}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}
+{\sp{\sn lTxid}{\sv 393216}}{\sp{\sn hspNext}{\sv 1034}}{\sp{\sn lidRegroup}{\sv 6}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid14879766\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Artifact}{\b\fs20\insrsid539137\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Processor}{
+\b\fs20\insrsid14879766\charrsid4731966 \hich\af0\dbch\af11\loch\f0 ExtentionPoint}{\b\fs20\insrsid539137\charrsid4731966 
+\par }{\insrsid14879766 
+\par }}}}{\shp{\*\shpinst\shplid1035{\sp{\sn relLeft}{\sv 6381}}{\sp{\sn relTop}{\sv 2536}}{\sp{\sn relRight}{\sv 9741}}{\sp{\sn relBottom}{\sv 2896}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 458752}}{\sp{\sn hspNext}{\sv 1035}}{\sp{\sn lidRegroup}{\sv 6}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 XSD}{\fs20\insrsid8132030 
+\hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 Document}{\fs20\insrsid6911675\charrsid8015483 \hich\af0\dbch\af11\loch\f0 Processor}{\fs20\insrsid12468982\charrsid8015483 
+\par }}}}{\shp{\*\shpinst\shplid1036{\sp{\sn relLeft}{\sv 6381}}{\sp{\sn relTop}{\sv 3016}}{\sp{\sn relRight}{\sv 9741}}{\sp{\sn relBottom}{\sv 3376}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 524288}}{\sp{\sn hspNext}{\sv 1036}}{\sp{\sn lidRegroup}{\sv 6}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid8015483 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 WSDL}{
+\fs20\insrsid8132030 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid8015483\charrsid8015483 \hich\af0\dbch\af11\loch\f0 DocumentProcessor
+\par }\pard \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\insrsid12468982 
+\par }}}}{\shp{\*\shpinst\shplid1037{\sp{\sn relLeft}{\sv 6381}}{\sp{\sn relTop}{\sv 3496}}{\sp{\sn relRight}{\sv 9741}}{\sp{\sn relBottom}{\sv 3904}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 589824}}{\sp{\sn hspNext}{\sv 1037}}{\sp{\sn lidRegroup}{\sv 6}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4999167 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 
+Composite}{\fs20\insrsid4999167 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 DocumentProcessor}{\fs20\insrsid12468982\charrsid4999167 
+\par }}}}{\shp{\*\shpinst\shplid1038{\sp{\sn relLeft}{\sv 6381}}{\sp{\sn relTop}{\sv 4024}}{\sp{\sn relRight}{\sv 9741}}{\sp{\sn relBottom}{\sv 4384}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 655360}}{\sp{\sn hspNext}{\sv 1038}}{\sp{\sn lidRegroup}{\sv 6}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid6585698 \hich\af0\dbch\af11\loch\f0 Java Import/Export Processor}{
+\fs20\insrsid6585698\charrsid13198821 
+\par }}}}}}{\shpgrp{\*\shpinst\shplid1039{\sp{\sn groupLeft}{\sv 1941}}{\sp{\sn groupTop}{\sv 9414}}{\sp{\sn groupRight}{\sv 3861}}{\sp{\sn groupBottom}{\sv 11934}}{\sp{\sn relLeft}{\sv 1821}}
+{\sp{\sn relTop}{\sv 5104}}{\sp{\sn relRight}{\sv 3741}}{\sp{\sn relBottom}{\sv 7624}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn posh}{\sv 0}}
+{\sp{\sn posv}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shp{\*\shpinst\shplid1040{\sp{\sn relLeft}{\sv 1941}}{\sp{\sn relTop}{\sv 9414}}{\sp{\sn relRight}{\sv 3861}}
+{\sp{\sn relBottom}{\sv 11934}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 720896}}{\sp{\sn hspNext}{\sv 1040}}
+{\sp{\sn lidRegroup}{\sv 3}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid5468238\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Artifact}{\b\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 s}{\b\fs20\insrsid5468238\charrsid4731966 
+
+\par }{\insrsid5468238 
+\par }}}}{\shp{\*\shpinst\shplid1041{\sp{\sn relLeft}{\sv 2061}}{\sp{\sn relTop}{\sv 9894}}{\sp{\sn relRight}{\sv 3621}}{\sp{\sn relBottom}{\sv 10254}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 786432}}{\sp{\sn hspNext}{\sv 1041}}{\sp{\sn lidRegroup}{\sv 3}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238\charrsid5468238 \hich\af0\dbch\af11\loch\f0 XSD
+
+\par }}}}{\shp{\*\shpinst\shplid1042{\sp{\sn relLeft}{\sv 2061}}{\sp{\sn relTop}{\sv 10374}}{\sp{\sn relRight}{\sv 3621}}{\sp{\sn relBottom}{\sv 10734}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 851968}}{\sp{\sn hspNext}{\sv 1042}}{\sp{\sn lidRegroup}{\sv 3}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 WSDL}{
+\fs20\insrsid5468238\charrsid5468238 
+\par }}}}{\shp{\*\shpinst\shplid1043{\sp{\sn relLeft}{\sv 2061}}{\sp{\sn relTop}{\sv 10854}}{\sp{\sn relRight}{\sv 3621}}{\sp{\sn relBottom}{\sv 11214}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 917504}}{\sp{\sn hspNext}{\sv 1043}}{\sp{\sn lidRegroup}{\sv 3}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238\charrsid5468238 \hich\af0\dbch\af11\loch\f0 
+SCDL
+\par }}}}{\shp{\*\shpinst\shplid1044{\sp{\sn relLeft}{\sv 2061}}{\sp{\sn relTop}{\sv 11334}}{\sp{\sn relRight}{\sv 3621}}{\sp{\sn relBottom}{\sv 11694}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 983040}}{\sp{\sn hspNext}{\sv 1044}}{\sp{\sn lidRegroup}{\sv 3}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 Java Classes}{
+\fs20\insrsid5468238\charrsid13198821 
+\par }}}}}}{\shpgrp{\*\shpinst\shplid1045{\sp{\sn groupLeft}{\sv 6261}}{\sp{\sn groupTop}{\sv 5776}}{\sp{\sn groupRight}{\sv 9861}}{\sp{\sn groupBottom}{\sv 8296}}{\sp{\sn relLeft}{\sv 6381}}
+{\sp{\sn relTop}{\sv 5464}}{\sp{\sn relRight}{\sv 9981}}{\sp{\sn relBottom}{\sv 7984}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn posh}{\sv 0}}
+{\sp{\sn posv}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shp{\*\shpinst\shplid1046{\sp{\sn relLeft}{\sv 6261}}{\sp{\sn relTop}{\sv 5776}}{\sp{\sn relRight}{\sv 9861}}
+{\sp{\sn relBottom}{\sv 8296}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1048576}}{\sp{\sn hspNext}{\sv 1046}}
+{\sp{\sn lidRegroup}{\sv 7}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 Model Resolvers}{\b\fs20\insrsid2713663\charrsid4731966 
+\par }{\insrsid2713663 
+\par }}}}{\shp{\*\shpinst\shplid1047{\sp{\sn relLeft}{\sv 6464}}{\sp{\sn relTop}{\sv 6256}}{\sp{\sn relRight}{\sv 9621}}{\sp{\sn relBottom}{\sv 6616}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1114112}}{\sp{\sn hspNext}{\sv 1047}}{\sp{\sn lidRegroup}{\sv 7}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663\charrsid5468238 \hich\af0\dbch\af11\loch\f0 XSD
+}{\fs20\insrsid548600 \hich\af0\dbch\af11\loch\f0  ModelResolver}{\fs20\insrsid2713663\charrsid5468238 
+\par }}}}{\shp{\*\shpinst\shplid1048{\sp{\sn relLeft}{\sv 6464}}{\sp{\sn relTop}{\sv 6736}}{\sp{\sn relRight}{\sv 9621}}{\sp{\sn relBottom}{\sv 7096}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1179648}}{\sp{\sn hspNext}{\sv 1048}}{\sp{\sn lidRegroup}{\sv 7}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 WSDL}{\fs20\insrsid548600 
+\hich\af0\dbch\af11\loch\f0  ModelResolver}{\fs20\insrsid2713663\charrsid5468238 
+\par }}}}{\shp{\*\shpinst\shplid1049{\sp{\sn relLeft}{\sv 6464}}{\sp{\sn relTop}{\sv 7216}}{\sp{\sn relRight}{\sv 9621}}{\sp{\sn relBottom}{\sv 7576}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1245184}}{\sp{\sn hspNext}{\sv 1049}}{\sp{\sn lidRegroup}{\sv 7}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 
+Composite}{\fs20\insrsid15669620 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 ModelResolver}{\fs20\insrsid2713663\charrsid4999167 
+\par }}}}{\shp{\*\shpinst\shplid1050{\sp{\sn relLeft}{\sv 6464}}{\sp{\sn relTop}{\sv 7696}}{\sp{\sn relRight}{\sv 9621}}{\sp{\sn relBottom}{\sv 8056}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1310720}}{\sp{\sn hspNext}{\sv 1050}}{\sp{\sn lidRegroup}{\sv 7}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 Java }{\fs20\insrsid15809868 
+\hich\af0\dbch\af11\loch\f0 Import/Export ModelResolver}{\fs20\insrsid2713663\charrsid13198821 
+\par }}}}}}{\shp{\*\shpinst\shplid1051{\sp{\sn relLeft}{\sv 2901}}{\sp{\sn relTop}{\sv 4504}}{\sp{\sn relRight}{\sv 4341}}{\sp{\sn relBottom}{\sv 5104}}{\sp{\sn fRelFlipH}{\sv 1}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 20}}{\sp{\sn shapePath}{\sv 4}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineEndArrowhead}{\sv 1}}
+{\sp{\sn fArrowheadsOK}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}}{\shp{\*\shpinst\shplid1052{\sp{\sn relLeft}{\sv 3741}}{\sp{\sn relTop}{\sv 4264}}
+{\sp{\sn relRight}{\sv 6261}}{\sp{\sn relBottom}{\sv 6304}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 1}}{\sp{\sn shapeType}{\sv 20}}{\sp{\sn shapePath}{\sv 4}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineEndArrowhead}{\sv 1}}
+{\sp{\sn fArrowheadsOK}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}}{\shp{\*\shpinst\shplid1053{\sp{\sn relLeft}{\sv 8061}}{\sp{\sn relTop}{\sv 4624}}
+{\sp{\sn relRight}{\sv 8901}}{\sp{\sn relBottom}{\sv 5464}}{\sp{\sn fRelFlipH}{\sv 1}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 20}}{\sp{\sn shapePath}{\sv 4}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineEndArrowhead}{\sv 1}}
+{\sp{\sn fArrowheadsOK}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}}{\shp{\*\shpinst\shplid1054{\sp{\sn relLeft}{\sv 7821}}{\sp{\sn relTop}{\sv 7984}}
+{\sp{\sn relRight}{\sv 8301}}{\sp{\sn relBottom}{\sv 8944}}{\sp{\sn fRelFlipH}{\sv 1}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 20}}{\sp{\sn shapePath}{\sv 4}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineEndArrowhead}{\sv 1}}
+{\sp{\sn fArrowheadsOK}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}}{\shpgrp{\*\shpinst\shplid1055{\sp{\sn groupLeft}{\sv 4221}}{\sp{\sn groupTop}{\sv 8896}}
+{\sp{\sn groupRight}{\sv 8181}}{\sp{\sn groupBottom}{\sv 11416}}{\sp{\sn relLeft}{\sv 4221}}{\sp{\sn relTop}{\sv 8896}}{\sp{\sn relRight}{\sv 8181}}{\sp{\sn relBottom}{\sv 11416}}
+{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shp{\*\shpinst\shplid1056{\sp{\sn relLeft}{\sv 4221}}
+{\sp{\sn relTop}{\sv 8896}}{\sp{\sn relRight}{\sv 8181}}{\sp{\sn relBottom}{\sv 11416}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}
+{\sp{\sn lTxid}{\sv 1376256}}{\sp{\sn hspNext}{\sv 1056}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid5724989 \hich\af0\dbch\af11\loch\f0 Domain: sca://1.1/domain/default}{\b\fs20\insrsid12280750\charrsid4731966 
+\par }{\insrsid12280750 
+\par }}}}{\shp{\*\shpinst\shplid1057{\sp{\sn relLeft}{\sv 4401}}{\sp{\sn relTop}{\sv 9304}}{\sp{\sn relRight}{\sv 7821}}{\sp{\sn relBottom}{\sv 11224}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1441792}}{\sp{\sn hspNext}{\sv 1057}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt \pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid10355341 \hich\af0\dbch\af11\loch\f0 s}{
+\fs20\insrsid10355341\charrsid10355341 \hich\af0\dbch\af11\loch\f0 ca://1.1/domain/default/contribution1}{\fs20\insrsid6973915\charrsid10355341 
+\par }}}}{\shp{\*\shpinst\shplid1058{\sp{\sn relLeft}{\sv 4569}}{\sp{\sn relTop}{\sv 9712}}{\sp{\sn relRight}{\sv 7569}}{\sp{\sn relBottom}{\sv 11032}}{\sp{\sn fRelFlipH}{\sv 0}}
+{\sp{\sn fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 202}}{\sp{\sn lTxid}{\sv 1507328}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}{\shptxt {\listtext\pard\plain\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}
+\pard\plain \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls10\adjustright\rin0\lin360\itap0\pararsid7348812 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {
+\fs20\insrsid3038408\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Contribution }{\fs20\insrsid7348812\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Deployable}{\fs20\insrsid7348812 \hich\af0\dbch\af11\loch\f0 s}{\fs20\insrsid10355341\charrsid3038408 
+\par {\listtext\pard\plain\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}{\fs20\insrsid3038408\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Imports
+\par {\listtext\pard\plain\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}\hich\af0\dbch\af11\loch\f0 Exports}{\fs20\insrsid3038408 
+\par {\listtext\pard\plain\f3\fs20\insrsid1127291 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}{\fs20\insrsid1127291 \loch\af0\dbch\af11\hich\f0 \'85\loch\f0 .}{\fs20\insrsid1127291\charrsid3038408 
+\par }\pard \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\insrsid3038408 
+\par }}}}}}}{\shprslt{\*\do\dobxcolumn\dobypara\dodhgt8192\dpgroup\dpcount10\dpx21\dpy64\dpxsize8160\dpysize9360\dpgroup\dpcount6\dpx0\dpy48\dpxsize3720\dpysize2400\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid2822041\charrsid15290583 \hich\af0\dbch\af11\loch\f0 
+ContributionScannerExtensionPoint
+\par }}\dpx0\dpy0\dpxsize3720\dpysize2400\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+Jar Contribution Scanner
+\par }}\dpx124\dpy380\dpxsize3352\dpysize380\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+Directory Contribution Scanner
+\par }}\dpx124\dpy855\dpxsize3352\dpysize380\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \hich\af0\dbch\af11\loch\f0 
+OSGiBundle Contribution Scanner
+\par }}\dpx124\dpy1330\dpxsize3352\dpysize380\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2822041\charrsid12859467 \loch\af0\dbch\af11\hich\f0 \'85\'85\'85\'85
+\'85
+\par }}\dpx124\dpy1805\dpxsize3352\dpysize380\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0\dpgroup\dpcount6\dpx4440\dpy0\dpxsize3720\dpysize2568\dptxbx\dptxlrtb{\dptxbxtext\pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid14879766\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Artifact}{\b\fs20\insrsid539137\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Processor}{
+\b\fs20\insrsid14879766\charrsid4731966 \hich\af0\dbch\af11\loch\f0 ExtentionPoint}{\b\fs20\insrsid539137\charrsid4731966 
+\par }{\insrsid14879766 
+\par }}\dpx0\dpy0\dpxsize3720\dpysize2568\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 XSD}{\fs20\insrsid8132030 
+\hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 Document}{\fs20\insrsid6911675\charrsid8015483 \hich\af0\dbch\af11\loch\f0 Processor}{\fs20\insrsid12468982\charrsid8015483 
+\par }}\dpx120\dpy480\dpxsize3360\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid8015483 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid8015483 \hich\af0\dbch\af11\loch\f0 WSDL}{
+\fs20\insrsid8132030 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid8015483\charrsid8015483 \hich\af0\dbch\af11\loch\f0 DocumentProcessor
+\par }\pard \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\insrsid12468982 
+\par }}\dpx120\dpy960\dpxsize3360\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4999167 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 
+Composite}{\fs20\insrsid4999167 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 DocumentProcessor}{\fs20\insrsid12468982\charrsid4999167 
+\par }}\dpx120\dpy1440\dpxsize3360\dpysize408\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid6585698 \hich\af0\dbch\af11\loch\f0 Java Import/Export Processor}{
+\fs20\insrsid6585698\charrsid13198821 
+\par }}\dpx120\dpy1968\dpxsize3360\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0\dpgroup\dpcount6\dpx0\dpy3048\dpxsize1920\dpysize2520\dptxbx\dptxlrtb{\dptxbxtext\pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid5468238\charrsid4731966 \hich\af0\dbch\af11\loch\f0 Artifact}{\b\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 s}{\b\fs20\insrsid5468238\charrsid4731966 
+
+\par }{\insrsid5468238 
+\par }}\dpx0\dpy0\dpxsize1920\dpysize2520\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238\charrsid5468238 \hich\af0\dbch\af11\loch\f0 XSD
+
+\par }}\dpx120\dpy480\dpxsize1560\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 WSDL}{
+\fs20\insrsid5468238\charrsid5468238 
+\par }}\dpx120\dpy960\dpxsize1560\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238\charrsid5468238 \hich\af0\dbch\af11\loch\f0 
+SCDL
+\par }}\dpx120\dpy1440\dpxsize1560\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid5468238 \hich\af0\dbch\af11\loch\f0 Java Classes}{
+\fs20\insrsid5468238\charrsid13198821 
+\par }}\dpx120\dpy1920\dpxsize1560\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0\dpgroup\dpcount6\dpx4560\dpy3408\dpxsize3600\dpysize2520\dptxbx\dptxlrtb{\dptxbxtext\pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 Model Resolvers}{\b\fs20\insrsid2713663\charrsid4731966 
+\par }{\insrsid2713663 
+\par }}\dpx0\dpy0\dpxsize3600\dpysize2520\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663\charrsid5468238 \hich\af0\dbch\af11\loch\f0 XSD
+}{\fs20\insrsid548600 \hich\af0\dbch\af11\loch\f0  ModelResolver}{\fs20\insrsid2713663\charrsid5468238 
+\par }}\dpx203\dpy480\dpxsize3157\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 WSDL}{\fs20\insrsid548600 
+\hich\af0\dbch\af11\loch\f0  ModelResolver}{\fs20\insrsid2713663\charrsid5468238 
+\par }}\dpx203\dpy960\dpxsize3157\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5468238 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 
+Composite}{\fs20\insrsid15669620 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid4999167\charrsid4999167 \hich\af0\dbch\af11\loch\f0 ModelResolver}{\fs20\insrsid2713663\charrsid4999167 
+\par }}\dpx203\dpy1440\dpxsize3157\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid2713663 \hich\af0\dbch\af11\loch\f0 Java }{\fs20\insrsid15809868 
+\hich\af0\dbch\af11\loch\f0 Import/Export ModelResolver}{\fs20\insrsid2713663\charrsid13198821 
+\par }}\dpx203\dpy1920\dpxsize3157\dpysize360\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0\dpline\dpptx1440\dppty0\dpptx0\dppty600\dpastartsol\dpastartw2\dpastartl2\dpx1080\dpy2448\dpxsize1440\dpysize600\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpline\dpptx2520\dppty0\dpptx0\dppty2040\dpaendsol\dpaendw2\dpaendl2\dpx1920\dpy2208\dpxsize2520\dpysize2040\dplinew15\dplinecor0\dplinecog0\dplinecob0\dpline\dpptx840\dppty0\dpptx0\dppty840\dpastartsol\dpastartw2\dpastartl2
+\dpx6240\dpy2568\dpxsize840\dpysize840\dplinew15\dplinecor0\dplinecog0\dplinecob0\dpline\dpptx480\dppty0\dpptx0\dppty960\dpastartsol\dpastartw2\dpastartl2\dpx6000\dpy5928\dpxsize480\dpysize960\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpgroup\dpcount4\dpx2400\dpy6840\dpxsize3960\dpysize2520\dptxbx\dptxlrtb{\dptxbxtext\pard\plain \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\b\fs20\insrsid5724989 \hich\af0\dbch\af11\loch\f0 Domain: sca://1.1/domain/default}{\b\fs20\insrsid12280750\charrsid4731966 
+\par }{\insrsid12280750 
+\par }}\dpx0\dpy0\dpxsize3960\dpysize2520\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext\pard\plain 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid10355341 \hich\af0\dbch\af11\loch\f0 s}{
+\fs20\insrsid10355341\charrsid10355341 \hich\af0\dbch\af11\loch\f0 ca://1.1/domain/default/contribution1}{\fs20\insrsid6973915\charrsid10355341 
+\par }}\dpx180\dpy408\dpxsize3420\dpysize1920\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0\dptxbx\dptxlrtb{\dptxbxtext{\listtext\pard\plain
+\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}\pard\plain \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls10\adjustright\rin0\lin360\itap0\pararsid7348812 
+\fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fs20\insrsid3038408\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Contribution }{\fs20\insrsid7348812\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Deployable}{
+\fs20\insrsid7348812 \hich\af0\dbch\af11\loch\f0 s}{\fs20\insrsid10355341\charrsid3038408 
+\par {\listtext\pard\plain\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}{\fs20\insrsid3038408\charrsid3038408 \hich\af0\dbch\af11\loch\f0 Imports
+\par {\listtext\pard\plain\f3\fs20\insrsid3038408\charrsid3038408 \loch\af3\dbch\af11\hich\f3 \'b7\tab}\hich\af0\dbch\af11\loch\f0 Exports}{\fs20\insrsid3038408 
+\par {\listtext\pard\plain\f3\fs20\insrsid1127291 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}{\fs20\insrsid1127291 \loch\af0\dbch\af11\hich\f0 \'85\loch\f0 .}{\fs20\insrsid1127291\charrsid3038408 
+\par }\pard \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\insrsid3038408 
+\par }}\dpx348\dpy816\dpxsize3000\dpysize1320\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat1\dplinew15\dplinecor0\dplinecog0\dplinecob0
+\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0\dpendgroup\dpx0\dpy0\dpxsize0\dpysize0}}}}{\lang1024\langfe1024\noproof\insrsid10435185 
+\par }{\f1\fs20\insrsid539137 
+\par }{\f1\fs20\insrsid16724526 
+\par }{\f1\fs20\insrsid2235070 
+\par }{\f1\fs20\insrsid548764 
+\par }{\f1\fs20\insrsid672375 
+\par }{\f1\fs20\insrsid2235070 
+\par }{\b\f1\fs20\insrsid2822041 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par }{\b\f1\fs20\insrsid539137 
+\par 
+\par 
+\par }{\b\f1\fs20\insrsid5468238 
+\par 
+\par 
+\par 
+\par 
+\par }{\b\f1\fs20\insrsid6121198 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par }{\b\f1\fs20\insrsid6448318 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par 
+\par }\pard\plain \s16\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10161153 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {
+\fs21\insrsid10161153\charrsid6517470 \hich\af0\dbch\af11\loch\f0 The {\*\xmlopen\xmlns1{\factoidname place}}{\*\xmlopen\xmlns1{\factoidname State}}\hich\af0\dbch\af11\loch\f0 Tuscany{\*\xmlclose}{\*\xmlclose}
+ runtime provides a framework to support SCA contributions. The framework can be extended against the following two extension points:
+\par }{\b\fs21\insrsid4462937\charrsid6517470 \hich\af0\dbch\af11\loch\f0 ContributionScannerExtensionPoin}{\b\fs21\insrsid10161153\charrsid6517470 \hich\af0\dbch\af11\loch\f0 t:}{\fs21\insrsid10161153\charrsid6517470 \hich\af0\dbch\af11\loch\f0 
+ It accepts extensions that can handle\~different packaging\~format/archives s\hich\af0\dbch\af11\loch\f0 uch as a directory, a JAR, an OSGi bundle, an EAR, a WAR and a ZIP.\~
+\par }{\b\fs21\insrsid10161153\charrsid6517470 \hich\af0\dbch\af11\loch\f0 ArtifactProcessorExtensionPoint:}{\fs21\insrsid10161153\charrsid6517470 \hich\af0\dbch\af11\loch\f0  It accepts extensions that can handle specific types of artifacts}{
+\fs21\insrsid8475943\charrsid6517470 \hich\af0\dbch\af11\loch\f0  such as WSDL, XSD, composite and}{\fs21\insrsid16453325\charrsid6517470 \hich\af0\dbch\af11\loch\f0  J}{\fs21\insrsid8475943\charrsid6517470 \hich\af0\dbch\af11\loch\f0 ava classes.}{
+\fs21\insrsid10161153\charrsid6517470 
+\par }\pard\plain \ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11172638 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {
+\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 Contribution Scanner scans the contributi\hich\af0\dbch\af11\loch\f0 on being installed and generates a list of artifacts that needs to be processed. Currently there is}{
+\fs21\insrsid11425526\charrsid6517470 \hich\af0\dbch\af11\loch\f0  support for folder/file system, JAR and OSGi bundle c}{\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 
+ontribution packages. In order to be available to the contribution service, a }{\fs21\insrsid4027380\charrsid6517470 {\*\bkmkstart OLE_LINK1}\hich\af0\dbch\af11\loch\f0 contribution {\*\bkmkend OLE_LINK1}\hich\af0\dbch\af11\loch\f0 scanners}{
+\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0  needs to register itself with the }{\fs21\insrsid4027380\charrsid6517470 \hich\af0\dbch\af11\loch\f0 contribution scanner}{\fs21\insrsid11172638\charrsid6517470 
+\hich\af0\dbch\af11\loch\f0  extension.
+\par \hich\af0\dbch\af11\loch\f0 Artifact processors are used to process each artifact available on the contribution. In order to be available to the contribution service, a artifact process\hich\af0\dbch\af11\loch\f0 
+or needs to register itself with the artifact processor extension. An artifact processor will be called for each artifact in two phases:
+\par {\listtext\pard\plain\f3\fs21\insrsid11172638\charrsid6517470 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}\pard \ql \fi-360\li720\ri0\sb100\sa100\sbauto1\saauto1\widctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls8\adjustright\rin0\lin720\itap0\pararsid11566354 {\b\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 read }{\b\fs21\insrsid12792170\charrsid6517470 \hich\af0\dbch\af11\loch\f0 phase:}{
+\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0  This is where you read an artifact (a document, an XML element, classes etc.), populate a model represent\hich\af0\dbch\af11\loch\f0 
+ing the artifact and return it. The SCA contribution service calls ArtifactProcessor.read() on all artifacts that have an ArtifactProcessor registered for them. If your model points to other models, instead of trying to load these other models right away,
+\hich\af0\dbch\af11\loch\f0  \hich\af0\dbch\af11\loch\f0 
+you should just keep the information representing that reference, which you'll turn into a pointer to the referenced model in the resolve() phase. Note that you don't necessarily need to fully read and populate your model at this point, you can choose to 
+\hich\af0\dbch\af11\loch\f0 c\hich\af0\dbch\af11\loch\f0 omplete it later.
+\par {\listtext\pard\plain\f3\fs21\insrsid11172638\charrsid6517470 \loch\af3\dbch\af11\hich\f3 \'b7\tab}}{\b\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 resolve }{\b\fs21\insrsid12792170\charrsid6517470 \hich\af0\dbch\af11\loch\f0 phase:}{
+\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 
+ This phase gives you the opportunity to resolve references to other models (a WSDL, a class, another composite, a componentType). At this point, all models representing the artifacts in your SCA contribution have been rea\hich\af0\dbch\af11\loch\f0 
+d, registered in the contribution's ArtifactResolver, and are ready to be resolved.
+\par }\pard \ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11172638 {\fs21\insrsid11172638\charrsid6517470 \hich\af0\dbch\af11\loch\f0 
+All deployable composites should be now ready to get deployed to the SCA Domain
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12324527 {\b\f1\fs22\insrsid16464510\charrsid2313813 
+\par }{\b\fs22\insrsid2501940 
+\par }{\b\fs22\insrsid5794882 
+\par }{\b\fs22\insrsid12324527\charrsid2313813 \hich\af0\dbch\af11\loch\f0 Path Taken to }{\b\fs22\insrsid14830590\charrsid2313813 \hich\af0\dbch\af11\loch\f0 Read}{\b\fs22\insrsid12324527\charrsid2313813 \hich\af0\dbch\af11\loch\f0  the Contribution:}{
+\b\fs22\insrsid9665659\charrsid2313813 \hich\af0\dbch\af11\loch\f0  (2.x)}{\b\fs22\insrsid12324527\charrsid2313813 
+\par }{\f1\fs20\insrsid12324527 
+\par }{\b\fs20\insrsid12063004\charrsid2769575 \hich\af0\dbch\af11\loch\f0 Step 1:}{\fs20\insrsid12063004 \hich\af0\dbch\af11\loch\f0  Using the NodeContribution \hich\af0\dbch\af11\loch\f0 information, a new contribution}{\fs20\insrsid2769575 
+\hich\af0\dbch\af11\loch\f0  (i.e., ContributionImpl)}{\fs20\insrsid12063004 \hich\af0\dbch\af11\loch\f0  is loaded }{\fs20\insrsid13325517 \hich\af0\dbch\af11\loch\f0 by }{\fs20\insrsid8995845 \hich\af0\dbch\af11\loch\f0 scanning the list }{
+\fs20\insrsid4073862 \hich\af0\dbch\af11\loch\f0 of available}{\fs20\insrsid13325517 \hich\af0\dbch\af11\loch\f0  artifacts found in the contribution. The following classes and its methods are responsible for doing this job.}{\fs20\insrsid12063004 
+\par }{\fs20\insrsid13325517 
+\par }{\fs20\insrsid7109352 \hich\af0\dbch\af11\loch\f0 NodeImpl.start() line: 131}{\fs20\insrsid3482368\charrsid7109352 
+\par }{\fs20\insrsid12324527\charrsid6517470 \hich\af0\dbch\af11\loch\f0 NodeFactoryImpl.\hich\af0\dbch\af11\loch\f0 loadContributions(NodeConfiguration, ProcessorContext) line: 295
+\par \hich\af0\dbch\af11\loch\f0 DefaultDeployer(DeployerImpl).loadContribution(URI, URL, Monitor) line: 549
+\par \hich\af0\dbch\af11\loch\f0 DefaultURLArtifactProcessorExtensionPoint$LazyURLArtifactProcessor.read(URL, URI, URL, ProcessorContext) line: 288
+\par }{\fs20\lang1040\langfe1041\langnp1040\insrsid12324527\charrsid6517470 \hich\af0\dbch\af11\loch\f0 ContributionContentProcessor.read(URL, URI, URL, ProcessorContext) line: 135
+\par }{\fs20\insrsid12324527\charrsid6517470 \hich\af0\dbch\af11\loch\f0 JarContributionScanner.scan(Contribution) line: 70}{\fs20\insrsid12324527 
+\par }{\fs20\insrsid16266353 
+\par }{\b\fs20\insrsid16266353\charrsid16266353 \hich\af0\dbch\af11\loch\f0 Step 2: }{\b\fs20\insrsid9399793 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid12022509 \hich\af0\dbch\af11\loch\f0 After scanning the contribution for the list of artifacts}{
+\fs20\insrsid9399793\charrsid9399793 \hich\af0\dbch\af11\loch\f0 , the}{\fs20\insrsid12022509 \hich\af0\dbch\af11\loch\f0 se}{\fs20\insrsid9399793\charrsid9399793 \hich\af0\dbch\af11\loch\f0  individual artifacts identified}{\fs20\insrsid8396446 
+\hich\af0\dbch\af11\loch\f0  from the contributions are }{\fs20\insrsid9399793\charrsid9399793 \hich\af0\dbch\af11\loch\f0 read using their }{\fs20\insrsid7437856 \hich\af0\dbch\af11\loch\f0 corresponding}{\fs20\insrsid9399793\charrsid9399793 
+\hich\af0\dbch\af11\loch\f0  artifactProcessors}{\b\fs20\insrsid9399793 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid8748637\charrsid9051788 \hich\af0\dbch\af11\loch\f0 and artifact models are created at this point of time.}{
+\fs20\insrsid9270497\charrsid9051788 \hich\af0\dbch\af11\loch\f0  The below class and its method is responsible for doing this job.}{\b\f1\fs20\insrsid16266353\charrsid16266353 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9399793 {\fs20\insrsid9399793\charrsid9399793 
+\par }{\fs20\lang1040\langfe1041\langnp1040\insrsid9399793\charrsid6517470 \hich\af0\dbch\af11\loch\f0 ContributionContentProcessor.read(URL, URI, URL, Process\hich\af0\dbch\af11\loch\f0 orContext) line: 1}{\fs20\lang1040\langfe1041\langnp1040\insrsid9051788 
+\hich\af0\dbch\af11\loch\f0 51}{\fs20\lang1040\langfe1041\langnp1040\insrsid9399793\charrsid6517470 
+\par }\pard \ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11172638 {\lang1040\langfe1041\langnp1040\insrsid12324527\charrsid9399793 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14830590 {\b\fs22\insrsid14830590\charrsid14952839 \hich\af0\dbch\af11\loch\f0 Path Taken to Resolve the Contribution:}{\b\fs22\insrsid12090221\charrsid14952839 
+\hich\af0\dbch\af11\loch\f0  (2.x)}{\b\fs22\insrsid14830590\charrsid14952839 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\f1\fs20\insrsid10637518 
+\par }{\b\fs20\insrsid9915706\charrsid2769575 \hich\af0\dbch\af11\loch\f0 Step 1:}{\fs20\insrsid9915706 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid2441954 \hich\af0\dbch\af11\loch\f0 After loading / scanning the }{\fs20\insrsid1575154 
+\hich\af0\dbch\af11\loch\f0 contributions}{\fs20\insrsid9915706 \hich\af0\dbch\af11\loch\f0 , }{\fs20\insrsid9372065 \hich\af0\dbch\af11\loch\f0 now }{\fs20\insrsid2441954 \hich\af0\dbch\af11\loch\f0 the Node Manager }{\fs20\insrsid1575154 
+\hich\af0\dbch\af11\loch\f0 configure}{\fs20\insrsid9372065 \hich\af0\dbch\af11\loch\f0 s}{\fs20\insrsid2441954 \hich\af0\dbch\af11\loch\f0  the node with the }{\fs20\insrsid9372065 \hich\af0\dbch\af11\loch\f0 available contribution. This step involves }{
+\fs20\insrsid15012329 \hich\af0\dbch\af11\loch\f0 initiating the process of }{\fs20\insrsid9372065 \hich\af0\dbch\af11\loch\f0 resolving the various artifacts available in the contribution using their respective }{\fs20\insrsid1932963 
+\hich\af0\dbch\af11\loch\f0 ModelResolvers}{\fs20\insrsid9372065 \hich\af0\dbch\af11\loch\f0 . }{\fs20\insrsid2629112 \hich\af0\dbch\af11\loch\f0 The following classes and its methods are responsible for doing this job.}{\fs20\insrsid9915706 
+\par }{\f1\fs20\insrsid9915706 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid2960142 {\fs20\insrsid2960142\charrsid2960142 \hich\af0\dbch\af11\loch\f0 NodeImpl.start() line: 133}{\f1\fs20\insrsid2960142\charrsid5971993 \tab 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\fs20\insrsid2960142\charrsid2960142 \hich\af0\dbch\af11\loch\f0 NodeFactoryImpl.configureNode(NodeConfiguration, Lis\hich\af0\dbch\af11\loch\f0 
+t<Contribution>, ProcessorContext) line: 274}{\fs20\insrsid2960142 
+\par }{\fs20\insrsid4734635\charrsid2960142 \hich\af0\dbch\af11\loch\f0 DefaultDeployer(DeployerImpl).build(List<Contribution>, Map<QName,Li}{\fs20\insrsid4734635 \hich\af0\dbch\af11\loch\f0 st<String>>, Monitor) line: 440}{\fs20\insrsid2960142 
+\par }{\fs20\insrsid7217972\charrsid2960142 \hich\af0\dbch\af11\loch\f0 DefaultURLArtifactProcessorExtensionPoint$LazyURLArtifactProcessor.resolve(Object, ModelResolver, ProcessorCont\hich\af0\dbch\af11\loch\f0 ext) line: 305}{\f1\fs20\insrsid10637518 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid5971993 {\fs20\insrsid5971993\charrsid2960142 \hich\af0\dbch\af11\loch\f0 ContributionContentProcessor.resolve(Contribution, ModelResolver, ProcessorContext) line: }{
+\fs20\insrsid14892148 \hich\af0\dbch\af11\loch\f0 252}{\fs20\insrsid5971993\charrsid2960142 
+\par }{\fs20\insrsid5971993 
+\par }{\b\fs20\insrsid8091336 
+\par }{\b\fs20\insrsid4720541\charrsid2769575 \hich\af0\dbch\af11\loch\f0 Step }{\b\fs20\insrsid4720541 \hich\af0\dbch\af11\loch\f0 2: }{\fs20\insrsid14180275\charrsid1316508 \hich\af0\dbch\af11\loch\f0 
+In this step, the contribution artifacts are resolved using their registered ModelResolvers.}{\fs20\insrsid329786 \hich\af0\dbch\af11\loch\f0  Some examples of artifacts and their corresponding ModelResovlers are shown below}{\fs20\insrsid16519714 
+\loch\af0\dbch\af11\hich\f0 \'85\loch\f0 .}{\fs20\insrsid4720541 
+\par }{\fs20\insrsid16519714 
+\par }{\b\fs20\insrsid5580748 \hich\af0\dbch\af11\loch\f0 Artifacts\tab }{\b\fs20\insrsid5580748\charrsid5580748 \hich\af0\dbch\af11\loch\f0 ModelResolver
+\par }{\fs20\insrsid16278179 \hich\af0\dbch\af11\loch\f0 Java Classes \tab }{\fs20\insrsid16001292 \hich\af0\dbch\af11\loch\f0 - }{\fs20\insrsid16278179 \hich\af0\dbch\af11\loch\f0 ClassLoaderModelResolver}{\fs20\insrsid16519714 
+\par }{\fs20\insrsid16278179 \hich\af0\dbch\af11\loch\f0 XSD\tab \tab - XSDModelResolver
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\fs20\insrsid16278179 \hich\af0\dbch\af11\loch\f0 WSDL\tab \tab - WSDLModelResolver}{\f1\fs20\insrsid16650932 
+\par 
+\par }{\b\fs22\insrsid861443 
+\par }{\b\fs22\insrsid16650932\charrsid11304604 \hich\af0\dbch\af11\loch\f0 How 2.x is different from 1.x }{\b\fs22\insrsid10701367 \hich\af0\dbch\af11\loch\f0 in terms of Contribution ClassLoaders}{\b\fs22\insrsid16650932\charrsid11304604 
+\hich\af0\dbch\af11\loch\f0 :}{\b\fs22\insrsid16650932 
+\par }{\b\fs22\insrsid8078383 
+\par }{\b\fs21\insrsid3826780\charrsid11470771 \hich\af0\dbch\af11\loch\f0 In 1.x }{\b\fs21\insrsid2888904\charrsid11470771 \hich\af0\dbch\af11\loch\f0 code}{\b\fs21\insrsid2888904 \hich\af0\dbch\af11\loch\f0 :}{\b\fs21\insrsid3826780\charrsid11470771 
+\hich\af0\dbch\af11\loch\f0  }{\b\fs21\insrsid9188473\charrsid11470771 \hich\af0\dbch\af11\loch\f0  
+\par {\listtext\pard\plain\f3\fs20\insrsid9188473\charrsid9188473 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}\pard \ql \fi-360\li720\ri0\nowidctlpar\jclisttab\tx720\wrapdefault\faauto\ls11\rin0\lin720\itap0\pararsid11470771 {\fs20\insrsid9188473\charrsid9188473 
+\hich\af0\dbch\af11\loch\f0 A ContributionClassLoaderProvider is registered using ContributionClassLoaderProviderExtensionPoint, which provides the ContributionClassLoader for the contributions.}{\fs20\insrsid8078383 
+\par {\listtext\pard\plain\f3\fs20\insrsid11470771 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}\pard \ql \fi-360\li720\ri0\nowidctlpar\jclisttab\tx720\wrapdefault\faauto\ls11\rin0\lin720\itap0 {\fs20\insrsid11470771 \hich\af0\dbch\af11\loch\f0 A }{
+\fs20\insrsid11470771\charrsid11470771 \hich\af0\dbch\af11\loch\f0 ContributionClassLoader}{\fs20\insrsid11470771 \hich\af0\dbch\af11\loch\f0  instance is created for the contribution }{\fs20\insrsid1455334 \hich\af0\dbch\af11\loch\f0 
+by the provider, and this instance is set as a classloader in the ContributionImpl.}{\b\fs22\insrsid7209946\charrsid13830030 
+\par {\listtext\pard\plain\f3\fs20\insrsid1705583 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}{\fs20\insrsid1705583 \hich\af0\dbch\af11\loch\f0 For}{\fs20\insrsid13830030 \hich\af0\dbch\af11\loch\f0 
+ the Java Class artifacts, the ClassLoaderModelResolver uses the class loader instance available from the contribution }{\fs20\insrsid1705583 \hich\af0\dbch\af11\loch\f0 as the parent class loader while resolving}{\fs20\insrsid13830030 
+\hich\af0\dbch\af11\loch\f0  the Class References.}{\b\fs22\insrsid7209946 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\b\fs22\insrsid7209946 
+\par }{\b\fs21\insrsid7209946\charrsid11470771 \hich\af0\dbch\af11\loch\f0 In 2.x }{\b\fs21\insrsid2888904\charrsid11470771 \hich\af0\dbch\af11\loch\f0 code}{\b\fs21\insrsid2888904 \hich\af0\dbch\af11\loch\f0 :}{\b\fs21\insrsid7209946 
+\par {\listtext\pard\plain\f3\fs20\insrsid16719075 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}\pard \ql \fi-360\li720\ri0\nowidctlpar\jclisttab\tx720\wrapdefault\faauto\ls11\rin0\lin720\itap0\pararsid13396628 {\fs20\insrsid16719075 \hich\af0\dbch\af11\loch\f0 No }{
+\fs20\insrsid13396628\charrsid9188473 \hich\af0\dbch\af11\loch\f0 ContributionClassLoaderProvider }{\fs20\insrsid16719075 \hich\af0\dbch\af11\loch\f0 and C}{\fs20\insrsid13396628\charrsid9188473 \hich\af0\dbch\af11\loch\f0 
+ontributionClassLoaderProviderExtensionPoint}{\fs20\insrsid16719075 \hich\af0\dbch\af11\loch\f0  is used.}{\fs20\insrsid13396628 
+\par {\listtext\pard\plain\f3\fs20\insrsid2780748 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}{\fs20\insrsid2780748 \hich\af0\dbch\af11\loch\f0 T}{\fs20\insrsid13396628 \hich\af0\dbch\af11\loch\f0 he }{\fs20\insrsid6643333 \hich\af0\dbch\af11\loch\f0 
+classloader field in the }{\fs20\insrsid13396628 \hich\af0\dbch\af11\loch\f0 ContributionImpl}{\fs20\insrsid2780748 \hich\af0\dbch\af11\loch\f0  }{\fs20\insrsid6643333 \hich\af0\dbch\af11\loch\f0 is always null.}{\b\fs22\insrsid13396628\charrsid13830030 
+
+\par {\listtext\pard\plain\f3\fs20\insrsid6189819 \loch\af3\dbch\af11\hich\f3 \'2d\tab}}\pard \ql \fi-360\li720\ri0\nowidctlpar\jclisttab\tx720\wrapdefault\faauto\ls11\rin0\lin720\itap0\pararsid7549295 {\fs20\insrsid6189819 \hich\af0\dbch\af11\loch\f0 For}{
+\fs20\insrsid13396628 \hich\af0\dbch\af11\loch\f0  the Java Class artifacts, the ClassLoaderModelResolver uses the }{\fs20\insrsid6189819\charrsid6189819 \hich\af0\dbch\af11\loch\f0 Thread.currentThrea}{\fs20\insrsid6189819 \hich\af0\dbch\af11\loch\f0 
+d().getContextClassLoader() }{\fs20\insrsid5243868 \hich\af0\dbch\af11\loch\f0 as the parent class loader }{\fs20\insrsid13396628 \hich\af0\dbch\af11\loch\f0 to resolve the Class References.}{\b\fs22\insrsid7549295 
+\par }\pard \ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\b\fs21\insrsid13396628 
+\par }{\b\fs21\insrsid28757\charrsid11470771 
+\par }}
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg
new file mode 100644
index 0000000000..c11b718731
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg.jpeg
new file mode 100644
index 0000000000..b4847c822c
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png
new file mode 100644
index 0000000000..709eb07ac3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png.jpeg
new file mode 100644
index 0000000000..3678c735b7
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_modules.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg
new file mode 100644
index 0000000000..76f073c813
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg.jpeg
new file mode 100644
index 0000000000..2822e6c252
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png
new file mode 100644
index 0000000000..4c4a3e152d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png.jpeg
new file mode 100644
index 0000000000..f91d6a74a6
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.data/sca_java_deployment_overview.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-deployment.html b/site/trunk/site-publish/documentation-2x/sca-java-deployment.html
new file mode 100644
index 0000000000..819e47cc2c
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-deployment.html
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java Deployment : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Deployment">SCA Java Deployment</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Deployment">SCA Java Deployment</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java Deployment</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5965425">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5965425">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965425">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965425">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965425">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965425">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavaDeployment-Overview"></A>Overview</H1>
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-deployment.data/sca_java_deployment_overview.jpg" style="border: 0px solid black"></SPAN></P>
+
+
+<H1><A name="SCAJavaDeployment-DeployerImplementation"></A>Deployer Implementation</H1>
+
+<P>The Deployer is available in multiple modules in Tuscany Java SCA 2.x</P>
+
+<H2><A name="SCAJavaDeployment-ContributionModules"></A>Contribution Modules</H2>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-deployment.data/sca_java_deployment_modules.jpg" style="border: 0px solid black"></SPAN></P>
+
+<UL>
+	<LI><B>Deployer</B>
+	<UL>
+		<LI>Responsible to process contribution lifecycle</LI>
+	</UL>
+	</LI>
+	<LI><B>Contribution Extensions</B>
+	<UL>
+		<LI>Extension point to add imports/exports
+		<UL>
+			<LI>Currently available : namespace and java import/export</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI><B>Contribution Processors</B>
+	<UL>
+		<LI>Extension point to add contribution artifact processors</LI>
+	</UL>
+	</LI>
+	<LI><B>Contribution Scanners</B>
+	<UL>
+		<LI>Extension point to add package scanners to process contribution contents
+		<UL>
+			<LI>Currently available : directory, zip and jar</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI><B>Contribution Model Resolvers</B>
+	<UL>
+		<LI>Extension point to add artifact model resolvers</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="SCAJavaDeployment-Deployerlifecycle"></A>Deployer life cycle</H2>
+
+<UL>
+	<LI><B>Initialize</B>
+	<UL>
+		<LI>Load definitions.xml and store in a system contribution</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Load</B>
+	<UL>
+		<LI>Read contribution artifacts utilizing the Contribution Scanner</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Build</B>
+	<UL>
+		<LI>Pre-resolve the contribution artifacts</LI>
+		<LI>Build contribution dependencies by processing contribution imports/exports</LI>
+		<LI>Resolve contribution artifacts</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="SCAJavaDeployment-DeployerInterface"></A>Deployer Interface</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * A utility that provides system functions to handle Tuscany SCA application deployment
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Deployer <SPAN class="code-keyword">extends</SPAN> LifeCycleListener {
+    /**
+     * Attach a deployment composite to the given contribution 
+     * @param contribution The target contribution
+     * @param composite The deployment composite
+     * @param appending A flag to indicate <SPAN class="code-keyword">if</SPAN> existing deployable composites in the contribution should be appended or replaced
+     */
+    void attachDeploymentComposite(Contribution contribution, Composite composite, <SPAN class="code-object">boolean</SPAN> appending);
+
+    /**
+     * Configure a list of contributions to create a composite representing a view of the domain
+     * @param contributions
+     * @param bindingBaseURIs
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionResolveException
+     * @<SPAN class="code-keyword">throws</SPAN> CompositeBuilderException
+     */
+    Composite build(List&lt;Contribution&gt; contributions, Map&lt;QName, List&lt;<SPAN class="code-object">String</SPAN>&gt;&gt; bindingBaseURIs, Monitor monitor)
+        <SPAN class="code-keyword">throws</SPAN> ContributionResolveException, CompositeBuilderException;
+
+    /**
+     * Load an artifact from the given location
+     * @param uri
+     * @param location
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     */
+    Artifact loadArtifact(URI uri, URL location, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> ContributionReadException;
+
+    /**
+     * Load a contribution from the given location
+     * @param uri
+     * @param location
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     */
+    Contribution loadContribution(URI uri, URL location, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> ContributionReadException;
+
+    /**
+     * @param &lt;T&gt;
+     * @param uri
+     * @param location
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     */
+    &lt;T&gt; T loadDocument(URI uri, URL location, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> ContributionReadException;
+
+    /**
+     * @param &lt;T&gt;
+     * @param reader
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> XMLStreamException
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     */
+    &lt;T&gt; T loadXMLDocument(Reader reader, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> XMLStreamException, ContributionReadException;
+
+    /**
+     * @param &lt;T&gt;
+     * @param location
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> XMLStreamException
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     */
+    &lt;T&gt; T loadXMLDocument(URL location, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> XMLStreamException, ContributionReadException;
+
+    /**
+     * @param &lt;T&gt;
+     * @param reader
+     * @param monitor
+     * @<SPAN class="code-keyword">return</SPAN>
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionReadException
+     * @<SPAN class="code-keyword">throws</SPAN> XMLStreamException
+     */
+    &lt;T&gt; T loadXMLElement(XMLStreamReader reader, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> ContributionReadException, XMLStreamException;
+
+    /**
+     * Save the model as XML
+     * @param model
+     * @param writer
+     * @param monitor
+     * @<SPAN class="code-keyword">throws</SPAN> XMLStreamException
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionWriteException
+     */
+    void saveXMLDocument(<SPAN class="code-object">Object</SPAN> model, Writer writer, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> XMLStreamException,
+        ContributionWriteException;
+
+    /**
+     * Save the model as XML
+     * @param model
+     * @param writer
+     * @param monitor
+     * @<SPAN class="code-keyword">throws</SPAN> XMLStreamException
+     * @<SPAN class="code-keyword">throws</SPAN> ContributionWriteException
+     */
+    void saveXMLElement(<SPAN class="code-object">Object</SPAN> model, XMLStreamWriter writer, Monitor monitor) <SPAN class="code-keyword">throws</SPAN> XMLStreamException,
+        ContributionWriteException;
+
+    /**
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    <SPAN class="code-object">boolean</SPAN> isSchemaValidationEnabled();
+    /**
+     * @param schemaValidationEnabled
+     */
+    void setSchemaValidationEnabled(<SPAN class="code-object">boolean</SPAN> schemaValidationEnabled);
+    
+    /**
+     * 
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    Monitor createMonitor();
+    
+    /**
+     * Create an instance of {@link BuilderContext}
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    BuilderContext createBuilderContext();
+
+    /**
+     * Create an instance of {@link ProcessorContext}
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    ProcessorContext createProcessorContext();
+
+    /**
+     * Get the {@link ExtensionPointRegistry}
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    ExtensionPointRegistry getExtensionPointRegistry();
+    
+    /* 
+     * @see org.apache.tuscany.sca.core.LifeCycleListener#start()
+     */
+    void start();
+
+    /* 
+     * @see org.apache.tuscany.sca.core.LifeCycleListener#stop()
+     */
+    void stop();
+    
+}
+</PRE>
+</DIV></DIV>
+
+<H1><A name="SCAJavaDeployment-DeployingacontributionusingtheNodeAPI"></A>Deploying a contribution using the Node API</H1>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+/**
+ * This client program shows how to create an SCA runtime, start it,
+ * and locate and invoke a SCA component
+ */
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+
+        <SPAN class="code-object">String</SPAN> contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        Node node = NodeFactory.newInstance().createNode(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;calculator&quot;</SPAN>, contribution));
+
+        node.start();
+        
+        CalculatorService calculatorService = ((Client)node).getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+        
+        <SPAN class="code-comment">// Calculate
+</SPAN>        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 - 2=&quot;</SPAN> + calculatorService.subtract(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 * 2=&quot;</SPAN> + calculatorService.multiply(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 / 2=&quot;</SPAN> + calculatorService.divide(3, 2));
+
+        node.stop();
+    }
+
+}
+
+</PRE>
+</DIV></DIV> 
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java Deployment';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-development-guide.html b/site/trunk/site-publish/documentation-2x/sca-java-development-guide.html
new file mode 100644
index 0000000000..1eea6ce884
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-development-guide.html
@@ -0,0 +1,524 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java Development Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Development Guide">SCA Java Development Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Development Guide">SCA Java Development Guide</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java Development Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109132">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109132">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109132">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109132">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109132">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109132">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>This document is the development guideline for SCA Java 2.x project.</P>
+
+<UL>
+	<LI><A href="#SCAJavaDevelopmentGuide-GeneralGuide">General Guide</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-GettingSource">Getting Source code</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Setup">Setting up your development environment</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-IDE">Importing SCA modules into your Development IDE</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-CodingGuidelines">Coding Guidelines</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Testing">Testing</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-ClientApplications">Client Applications</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-MavenBuildStructure">Maven Build Structure</A></LI>
+	<LI><B>Development Hints</B>
+	<UL>
+		<LI><A href="#SCAJavaDevelopmentGuide-SamplesinEclipse">Importing existing Tuscany SCA projects into Eclipse</A></LI>
+		<LI><A href="#SCAJavaDevelopmentGuide-WebappinEclipse">Generating Eclipse WTP Web Projects for Webapp samples</A></LI>
+		<LI><A href="#SCAJavaDevelopmentGuide-Ant">Generating Dependencies for Ant in Samples</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopmentGuide-OSGiOverviewandApproach"></A>OSGi Overview and Approach</H3>
+
+<P><A href="http://people.apache.org/~lresende/presentations/felix%20goes%20to%20tuscany.pdf" class="external-link" rel="nofollow">OSGI &amp; Tuscany</A></P>
+
+<H3><A name="SCAJavaDevelopmentGuide-GeneralGuide"></A><A name="SCAJavaDevelopmentGuide-GeneralGuide"></A> General Guide</H3>
+
+<P>Welcome to the Tuscany SCA Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA.</LI>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>The Java SCA infrastructure should provide flexibility and choice. It should not dictate programming models but support many.</LI>
+	<LI>The Java SCA infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopmentGuide-Prerequisites"></A><A name="SCAJavaDevelopmentGuide-Prerequisites"></A> Prerequisites</H3>
+
+<P>Java SCA requires the following:</P>
+<UL>
+	<LI><A href="http://java.sun.com/javase/downloads/index.jsp" class="external-link" rel="nofollow">J2SE 1.6.0+)</A></LI>
+	<LI><A href="http://maven.apache.org/" class="external-link" rel="nofollow">Apache Maven (2.2.1+)</A></LI>
+	<LI><A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">Subversion (1.6+)</A> or <A href="http://tortoisesvn.tigris.org/" class="external-link" rel="nofollow">TortoiseSVN (1.6.x+)</A></LI>
+	<LI><A href="http://www.eclipse.org/downloads" class="external-link" rel="nofollow">Eclipse PDE (Ganymede ) </A></LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide-SettingupyourDevelopmentEnvironment"></A><A name="SCAJavaDevelopmentGuide-Setup"></A> Setting up your Development Environment</H3>
+
+<H4><A name="SCAJavaDevelopmentGuide-topdownbuild%28recommendedapproach%29"></A>top-down build (recommended approach)</H4>
+
+<P>Check out all of the java source code.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Building the SCA source code :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd trunk
+mvn -fae clean install
+</PRE>
+</DIV></DIV>
+<P>It should work even if you start with an empty Maven local repository, and it should always work, however when you are building for Tuscany for the first time there are a lot of dependencies which must be downloaded so the first build can take a long time and it may fail with problems retrieving the dependencies.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The trunk code sometimes has SNAPSHOT dependencies which can get out of date in your local repository so if you see odd build failures try updating the SNAPSHOT jars by using the &quot;-U&quot; parameter in the mvn command.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Once you have done a top-down build, and your local maven repository is populated, you can start using the maven off line option to speed up the build process by using the &quot;-o&quot; parameter in the mvn command.</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The SCA build consumes a good amount of memory, in case you are seeing issues during the build, set a MAVEN_OPTS environment variable to allocate more memory for the build process.
+
+<P> Windows : SET MAVEN_OPTS=&quot;-Xmx512m -XX:MaxPermSize=384m&quot;<BR>
+ Unix    : export MAVEN_OPTS=&quot;-Xmx512m -XX:MaxPermSize=384m&quot;</P></TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>If you are using MAC OS, please see 'Special instructions for MAC OS users' section below</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide-ImportingSCAmodulesintoyourDevelopmentIDE"></A><A name="SCAJavaDevelopmentGuide-IDE"></A>Importing SCA modules into your Development IDE</H3>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-UsingEclipse"></A>Using Eclipse</H4>
+
+<P>If this is the first time you are using your workspace with maven m2 local repository, you will need to tell your Eclipse workspace the location of the directory, and you can do this with the following command :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Declipse.workspace=[path-to-eclipse-workspace] eclipse:add-maven-repo
+</PRE>
+</DIV></DIV>
+<P>In order to generate the necessary project files to import the SCA modules to Eclipse, you can use the maven eclipse plugin</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<P>Now launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the project from SCA Modules into your Eclipse Workspace.</P>
+
+<H4><A name="SCAJavaDevelopmentGuide-UsingEclipsePDE"></A>Using Eclipse PDE</H4>
+
+<P>To help with development in an OSGi environment Tuscany also has a build profile to setup the Eclipse Plugin Development Environment:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -fae -Peclipse
+</PRE>
+</DIV></DIV>
+
+<P>Now set the &quot;Target Platform&quot; in your Eclipse IDE by following the steps below :</P>
+
+<UL>
+	<LI>Inside eclipse, select File-&gt;Open File&quot; and open &quot;distribution/all/target/features/tuscany.target&quot;
+	<UL>
+		<LI>click &quot;Set as target platform&quot; on the upper-right side of the overview window that opened</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Then as when using eclipse:eclipse launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the project from SCA Modules into your Eclipse Workspace.</P>
+
+<P>There are also some Tuscany Eclipse code templates available:<BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codestyle.xml" class="external-link" rel="nofollow">Eclipse Style Formatter </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codetemplates.xml" class="external-link" rel="nofollow">Eclipse Templates </A></P>
+
+<H4><A name="SCAJavaDevelopmentGuide-EclipseBuildTroubleshooting"></A><A name="SCAJavaDevelopmentGuide-EclipseBuildTroubleshooting"></A> Eclipse Build Troubleshooting</H4>
+
+<P>Sometimes a Maven build will work from the command line, yet the same component will not build in the Eclipse environment. Of course, developers try to prevent this from happening, but it does happen and makes for a valid Jira. In the meantime, here are some steps that might help correct build issues in the Eclipse environment:</P>
+
+<UL>
+	<LI><B>Missing classpath variables</B> - Sometimes Java build classpath variables are incorrect or missing, for instance &quot;Unbound classpath variable: 'M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar'&quot;. Add the classpath variable 'M2_REPOS' to your workspace. Window &gt; Preferences &gt; Java &gt; Build Path &gt; Classpath variables. Create variables for any missing variables and point them to the appropriate place in your file system. Do a complete rebuild.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Missing projects</B> - Sometimes developers add or remove project dependencies. These show up with error message &quot;The project cannot be built until build path errors are resolved&quot;. This is often a sign that your Eclipse workspace is out of sync with your local repository or the svn repository. The full remedy is to refresh your local repos (svn update), rebuild your local repos (mvn clean install -U), regenerate Eclipse projects (mvn -Declipse), reimport projects in Eclipse, and clean/rebuild your projects. You may be able to do less than this full refresh with simple changes, but the full refresh is often needed for major changes.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Project won't build</B> - Sometimes a particular project will not build despite repeated efforts. Consider if this project is necessary to the task at hand. You may be able to delete the problematic Eclipse project and continue with other work.</LI>
+</UL>
+
+
+
+<H3><A name="SCAJavaDevelopmentGuide-SpecialinstructionsforMACOSusers"></A><A name="SCAJavaDevelopmentGuide-MacOS"></A> Special instructions for MAC OS users</H3>
+
+<P>Some plugins used in the Tuscany build requires a explicit dependency on some classes from JDK tools.jar, which is in a different place in the MAC OS environment. </P>
+
+<P>We have created duplicate profiles in Tuscany to accommodate the most used user tasks</P>
+
+<UL>
+	<LI>Running a build : there is a default profile for the mac environment properly configuring the tools.jar property
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   mvn clean install
+</PRE>
+</DIV></DIV></LI>
+</UL>
+
+
+<UL>
+	<LI>Creating Eclipse IDE project files : there is a &quot;eclipse-mac&quot; profile
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   mvn -Peclipse-mac
+</PRE>
+</DIV></DIV></LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-Updateyourmavensettings.xml%28%25userhome%25%2F.m2%2Fsettings.xml%29"></A>Update your maven settings.xml (%user_home%/.m2/settings.xml)</H4>
+
+<P>Updating your settings.xml with proper property configuration will make all profiles work in a MAC OS environment.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;settings&gt;
+
+  &lt;profiles&gt;
+     &lt;profile&gt;
+        &lt;id&gt;mac-os-configuration&lt;/id&gt;
+        &lt;properties&gt;
+           &lt;tools.jar&gt;${java.home}/../Classes/classes.jar&lt;/tools.jar&gt;
+        &lt;/properties&gt;
+     &lt;/profile&gt;
+  &lt;/profiles&gt;
+  
+  &lt;activeProfiles&gt;
+    &lt;activeProfile&gt;mac-os-configuration&lt;/activeProfile&gt;
+  &lt;/activeProfiles&gt;
+
+&lt;/settings&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide-CodingGuidelines"></A><A name="SCAJavaDevelopmentGuide-CodingGuidelines"></A> Coding Guidelines</H3>
+
+<P>There are a few simple guidelines when developing for JAVA SCA:</P>
+<UL>
+	<LI>The basic coding style used is the described at <A href="http://java.sun.com/docs/codeconv/" class="external-link" rel="nofollow">Sun Java coding standards</A> but the main thing is to be consistent with the existing code you're updating, so for example, if you're updating a method that uses the braces on the same line style don't add code with the hanging braces style.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files (both source code files and resource files such as xml documents)</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<P>While Tuscany does not yet have an official style or template, here are some templates that folks have been using and have been checked into the build which are stored at <A href="https://svn.apache.org/repos/asf/tuscany/java/etc/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/java/etc/</A></P>
+
+<H4><A name="SCAJavaDevelopmentGuide-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, java/sca/module/implementation-java would be in package structure org.apache.tuscany.implementation.java.&#42;</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-Testing"></A><A name="SCAJavaDevelopmentGuide-Testing"></A> Testing</H3>
+
+<P>Tuscany uses plain junit test cases to perform unit and integration testing, below is an example that can also be used as a template for writing new test cases; it demonstrates how to bootstrap the Tuscany SCA runtime in your test case, and because they are based on junit, you can run it from your IDE of choice or from Maven.</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Note that we are using JUnit 4.2 code style in OSGI development stream</TD></TR></TABLE></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * Description of your test <SPAN class="code-keyword">case</SPAN> and necessary details you find necessary
+ */
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorTestCase {
+
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> CalculatorService calculatorService;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> NodeLauncher launcher;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Node node;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        CalculatorTestCase.calculatorService = calculatorService;
+    }
+    
+    
+    @BeforeClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void setUpBeforeClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        launcher = NodeLauncher.newInstance();
+        <SPAN class="code-object">String</SPAN> location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        node = launcher.createNode(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;test&quot;</SPAN>, location));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA Node API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + node.getClass().getClassLoader());
+        node.start();
+    }
+
+    @AfterClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void tearDownAfterClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-keyword">if</SPAN> (node != <SPAN class="code-keyword">null</SPAN>) {
+            node.stop();
+            node.destroy();
+        }
+        <SPAN class="code-keyword">if</SPAN> (launcher != <SPAN class="code-keyword">null</SPAN>) {
+            launcher.destroy();
+        }
+    }
+
+    @Test
+    <SPAN class="code-keyword">public</SPAN> void testCalculator() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-comment">// Calculate
+</SPAN>        assertEquals(calculatorService.add(3, 2), 5.0);
+        assertEquals(calculatorService.subtract(3, 2), 1.0);
+        assertEquals(calculatorService.multiply(3, 2), 6.0);
+        assertEquals(calculatorService.divide(3, 2), 1.5);
+    }
+}
+</PRE>
+</DIV></DIV>
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a &#42;*/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-ClientApplicationsasSCAComponents"></A><A name="SCAJavaDevelopmentGuide-ClientApplications"></A> Client Applications as SCA Components</H3>
+
+<P>Below is how you can build client applications as an SCA component.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    
+    <SPAN class="code-keyword">private</SPAN> CalculatorService calculatorService;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        <SPAN class="code-keyword">this</SPAN>.calculatorService = calculatorService;
+    }
+    
+    @Init
+    <SPAN class="code-keyword">public</SPAN> void calculate() {
+
+        <SPAN class="code-comment">// Calculate
+</SPAN>        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + print(Reference.class.getClassLoader()));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 - 2=&quot;</SPAN> + calculatorService.subtract(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 * 2=&quot;</SPAN> + calculatorService.multiply(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 / 2=&quot;</SPAN> + calculatorService.divide(3, 2));
+    }
+    
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> <SPAN class="code-object">String</SPAN> print(<SPAN class="code-object">ClassLoader</SPAN> cl) {
+        <SPAN class="code-object">StringBuffer</SPAN> buf = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">StringBuffer</SPAN>();
+        <SPAN class="code-keyword">for</SPAN> (; cl != <SPAN class="code-keyword">null</SPAN>;) {
+            buf.append(cl.toString());
+            buf.append(' ');
+            cl = cl.getParent();
+        }
+        <SPAN class="code-keyword">return</SPAN> buf.toString();
+    }
+
+}
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide-MavenBuildStructure"></A><A name="SCAJavaDevelopmentGuide-MavenBuildStructure"></A> Maven Build Structure</H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.sca</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn eclipse:eclipse</LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-Addinganewmoduleandnotreadytointegrate%3F"></A>Adding a new module and not ready to integrate?</H4>
+
+<P>'work-in-progress' modules can be worked on in the same source tree and yet not break the top-down build. You can do this by not listing your module(s) in java/sca/modules/pom.xml.</P>
+
+<H2><A name="SCAJavaDevelopmentGuide-DevelopmentHints"></A>Development Hints</H2>
+
+<H3><A name="SCAJavaDevelopmentGuide-ImportingexistingTuscanySCAprojectsintoEclipse"></A><A name="SCAJavaDevelopmentGuide-SamplesinEclipse"></A>Importing existing Tuscany SCA projects into Eclipse</H3>
+
+<P>This section has talked about how to get set up ready to develop Tuscany. If you need to import existing samples into Eclipse to work on there are some instructions <A href="http://tuscany.apache.org/import-existing-tuscany-sca-projects-into-eclipse.html" class="external-link" rel="nofollow">here</A>. These are instructions for 1.x but should work OK on 2.x. </P>
+
+<H3><A name="SCAJavaDevelopmentGuide-GeneratingEclipseWTPWebProjectsforWebappsamples"></A><A name="SCAJavaDevelopmentGuide-WebappinEclipse"></A> Generating Eclipse WTP Web Projects for Webapp samples</H3>
+
+<P>If you're using Eclipse WTP and want to get WTP Web Projects generated<BR>
+for our Webapp samples you can simply pass a &#45;Dwtpversion=1.5 option to<BR>
+the usual mvn eclipse:eclipse command, like this:<BR>
+mvn &#45;Dwtpversion=1.5 &#45;Peclipse eclipse:eclipse</P>
+
+<P>The magic &#45;Dwtpversion=1.5 option will add the WTP Web project nature to<BR>
+all the Eclipse projects with &lt;packaging&gt;war&lt;/packaging&gt; in their Maven<BR>
+pom.xml. You'll then be able to add these projects to a WTP Tomcat or<BR>
+Geronimo Server configuration, to publish and run them straight from<BR>
+your Eclipse workspace.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-GeneratingDependenciesforAntinSamples"></A><A name="SCAJavaDevelopmentGuide-Ant"></A> Generating Dependencies for Ant in Samples</H3>
+
+<P>Figuring out the package dependency to include in Ant build.xml can be a pain. Here is a quick<BR>
+script which works in Linux environment for war files.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+jar tvf sample-feed-aggregator-webapp.war | grep .jar | awk '{ printf <SPAN class="code-quote">&quot;%s\n&quot;</SPAN>, $8 }' |
+   sed -e <SPAN class="code-quote">&quot;s/WEB-INF\/lib\<SPAN class="code-comment">///&quot;</SPAN> | awk '{ printf <SPAN class="code-quote">&quot;&lt;include name=\&quot;</SPAN>%s\<SPAN class="code-quote">&quot;/&gt;\n&quot;</SPAN>, $1 }' | grep -v tuscany</SPAN>
+</PRE>
+</DIV></DIV>
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java Development Guide';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-extensions-guide.html b/site/trunk/site-publish/documentation-2x/sca-java-extensions-guide.html
new file mode 100644
index 0000000000..018b89bf96
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-extensions-guide.html
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java Extensions Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java Extensions Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964351">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964351">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964351">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964351">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964351">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964351">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavaExtensionsGuide-TuscanyExtensions"></A>Tuscany Extensions</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> OASIS Compliance </TH>
+<TH class="confluenceTh"> Status </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.composite&linkCreation=true&fromPageId=5964351" class="createlink">implementation.composite</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for SCA components implemented with SCA composites (Assembly spec) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationjava.html" title="SCA Java implementation.java">implementation.java</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> 80% pass </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for SCA components implemented with Java classes (Java CI spec) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationspring.html" title="SCA Java implementation.spring">implementation.spring</A> </TD>
+<TD class="confluenceTd"> 2.0-M3 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Support for Spring Framework </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationbpel.html" title="SCA Java implementation.bpel">implementation.bpel</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for components implemented in BPEL </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationosgi.html" title="SCA Java implementation.osgi">implementation.osgi</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for osgi </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Widget%20Implementation.widget&linkCreation=true&fromPageId=5964351" class="createlink">implementation.widget</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-implementationweb.html" title="SCA Java implementation.web">implementation.web</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Support JEE web apps as implementation types </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.sca&linkCreation=true&fromPageId=5964351" class="createlink">binding.sca</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> SCA default binding (Assembly spec) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingws.html" title="SCA Java binding.ws">binding.ws</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> SOAP/HTTP web services </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingrmi.html" title="SCA Java binding.rmi">binding.rmi</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The Java RMI protocol </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingjms.html" title="SCA Java binding.jms">binding.jms</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Asynchronous JMS messaging </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingejb.html" title="SCA Java binding.ejb">binding.ejb</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> EJB Binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindinghttp.html" title="SCA Java binding.http">binding.http</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> Supports binding of methods over standard Hyper Text Transfer Protocol (HTTP), allowing you to create, retrieve, update, delete items. Also supports conditional creates, retrieves, updates, and deletes using the ETag and LastModified caching protocol described in HTTP. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingrest.html" title="SCA Java binding.rest">binding.rest</A> </TD>
+<TD class="confluenceTd"> ? <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Work in Progress <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Supports RESTFull services <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.jsonp&linkCreation=true&fromPageId=5964351" class="createlink">binding.jsonp</A> </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> The JSON protocol over HTTP </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">binding.jsonrpc</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The JSON-RPC protocol </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-bindingatom.html" title="SCA Java binding.atom">binding.atom</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> supports Atom-publishing protocol, allowing you to create, retrieve, update, delete Atom entries </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding.comet </TD>
+<TD class="confluenceTd"> 2.0-Beta1 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Waiting for community feedback <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Support for communication between browser client and SCA components via Comet techniques <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding.websocket </TD>
+<TD class="confluenceTd"> 2.0-Beta3 </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Waiting for community feedback <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Support for communication between browser client and SCA components via websockets <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-axiom </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for AXIOM data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-jaxb </TD>
+<TD class="confluenceTd"> ? </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for JAXB data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-json </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Support for JSON data binding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Interfaces described with java interfaces </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-interfacewsdl.html" title="SCA Java interface.wsdl">interface.wsdl</A> </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> Interfaces described with WSDL definitions </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-jetty </TD>
+<TD class="confluenceTd"> 2.0-M2 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Jetty web container </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-definitionsxml.html" title="SCA Java definitions.xml">definitions.xml</A> </TD>
+<TD class="confluenceTd"> 2.0-M4 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Work in Progress </TD>
+<TD class="confluenceTd"> Defined intents, policy sets and binding defaults </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaExtensionsGuide-NonextensionOASISspecificationsupport"></A>Non-extension OASIS specification support</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> OASIS Compliance </TH>
+<TH class="confluenceTh"> Status </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Assembly </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> SCA Assembly specification </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Java CAA </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> </TD>
+<TD class="confluenceTd"> Stable </TD>
+<TD class="confluenceTd"> SCA Java Common Annotations and APIs specification </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Policy </TD>
+<TD class="confluenceTd"> 2.0-M1 </TD>
+<TD class="confluenceTd"> 50% passing </TD>
+<TD class="confluenceTd"> In pogress </TD>
+<TD class="confluenceTd"> SCA Policy specification </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-implementationjava.html" title="SCA Java implementation.java">SCA Java implementation.java</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-implementationspring.html" title="SCA Java implementation.spring">SCA Java implementation.spring</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-implementationbpel.html" title="SCA Java implementation.bpel">SCA Java implementation.bpel</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-implementationosgi.html" title="SCA Java implementation.osgi">SCA Java implementation.osgi</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-implementationweb.html" title="SCA Java implementation.web">SCA Java implementation.web</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-implementationwidget.html" title="SCA Java implementation.widget">SCA Java implementation.widget</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingws.html" title="SCA Java binding.ws">SCA Java binding.ws</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingrmi.html" title="SCA Java binding.rmi">SCA Java binding.rmi</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingjms.html" title="SCA Java binding.jms">SCA Java binding.jms</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingejb.html" title="SCA Java binding.ejb">SCA Java binding.ejb</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindinghttp.html" title="SCA Java binding.http">SCA Java binding.http</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingatom.html" title="SCA Java binding.atom">SCA Java binding.atom</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">SCA Java binding.jsonrpc</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindinghttp-security-policy-section.html" title="SCA Java binding.http security policy section">SCA Java binding.http security policy section</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-interfacewsdl.html" title="SCA Java interface.wsdl">SCA Java interface.wsdl</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-definitionsxml.html" title="SCA Java definitions.xml">SCA Java definitions.xml</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="sca-java-bindingrest.html" title="SCA Java binding.rest">SCA Java binding.rest</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java Extensions Guide';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationbpel.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationbpel.html
new file mode 100644
index 0000000000..1d824bb1af
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationbpel.html
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.bpel : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.bpel">SCA Java implementation.bpel</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.bpel">SCA Java implementation.bpel</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.bpel</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964933">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964933">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964933">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964933">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964933">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964933">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavaimplementation.bpel-Introduction"></A>Introduction</H3>
+
+<P>This is a initial WS-BPEL component implementation that allows SCA runtime to invoke WS-BPEL executable processes in a SCA composition.<BR>
+We are still working to finalize the Reference support, to allow your BPEL process to have partnerLinks pointing to SCA components.</P>
+
+<P>As for creating a SCA component, below is an sample SCDL</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//bpel&quot;</SPAN>
+</SPAN>    xmlns:hns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;bpel&quot;</SPAN>&gt;
+    
+    &lt;component name=<SPAN class="code-quote">&quot;BPELHelloWorldComponent&quot;</SPAN>&gt;
+        &lt;implementation.bpel process=<SPAN class="code-quote">&quot;hns:HelloWorld&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.bpel-WSBPELEngine"></A>WS-BPEL Engine</H3>
+
+<P>As for a WS-BPEL engine, we are using Apache ODE. In order to properly deploy a WS-BPEL process in ODE, a deployment descriptor like the one below should be suplied with your application :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;deploy xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.apache.org/ode/schemas/dd/2007/03&quot;</SPAN>
+</SPAN>	xmlns:tns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld&quot;</SPAN> 
+</SPAN>	xmlns:wns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;
+</SPAN>
+
+	&lt;process name=<SPAN class="code-quote">&quot;tns:HelloWorld&quot;</SPAN>&gt;
+		&lt;active&gt;<SPAN class="code-keyword">true</SPAN>&lt;/active&gt;
+		&lt;provide partnerLink=<SPAN class="code-quote">&quot;helloPartnerLink&quot;</SPAN>&gt;
+			&lt;service name=<SPAN class="code-quote">&quot;wns:HelloService&quot;</SPAN> port=<SPAN class="code-quote">&quot;HelloPort&quot;</SPAN>/&gt;
+		&lt;/provide&gt;
+	&lt;/process&gt;
+&lt;/deploy&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For more information on these deployment descriptors, see documentation on <A href="http://ode.apache.org/creating-a-process.html" class="external-link" rel="nofollow">Deploying a process in ODE</A></P>
+
+
+<H3><A name="SCAJavaimplementation.bpel-References"></A>References</H3>
+
+<P><A href="http://osoa.org/display/Main/SCA%20BPEL%20White%20Paper" class="external-link" rel="nofollow">SCA &amp; BPEL white paper </A></P>
+
+<P><A href="http://osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforBPEL_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Client Implementation Model for BPEL v1.00 </A></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.bpel';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationjava.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationjava.html
new file mode 100644
index 0000000000..5bf0190806
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationjava.html
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.java : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.java">SCA Java implementation.java</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.java">SCA Java implementation.java</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.java</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964926">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964926">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964926">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964926">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964926">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964926">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavaimplementation.java-%3Cimplementation.java%3E"></A>&lt;implementation.java&gt;</H3>
+
+
+<P>The Tuscany Java SCA runtime supports components implemented in Java by using the &lt;implementation.java&gt; SCDL extension.</P>
+
+<P>The Java component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.java class=<SPAN class="code-quote">&quot;NCName&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where the class attribute is the fully qualified name of the Java class of the implementation.</P>
+
+<P>The Java component implementtaion is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-java-annotations" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<H4><A name="SCAJavaimplementation.java-someexamples"></A>some examples</H4>
+
+<P>This example shows a simple composite with a component that uses &lt;implemantation.java&gt;:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>    targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;SampleComposite&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;SampleComponent&quot;</SPAN>&gt;
+       &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.SampleImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+    
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.java';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationosgi.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationosgi.html
new file mode 100644
index 0000000000..2d5f0d8b44
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationosgi.html
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.osgi : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.osgi">SCA Java implementation.osgi</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.osgi">SCA Java implementation.osgi</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.osgi</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964937">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964937">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964937">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964937">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964937">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964937">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavaimplementation.osgi-%3Cimplementation.osgi%3E"></A>&lt;implementation.osgi&gt;</H3>
+
+<P>Tuscany enables OSGi bundles to be used as the implementation of SCA components by using the &lt;implementation.osgi/&gt; SCDL extension. OSGi services registered in the OSGi service registry either using&nbsp;OSGi declarative services or &nbsp;through the OSGi procedural services API can be exposed as services of the SCA component.</P>
+
+<P>The OSGi component implementation SCDL has the following format:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;implementation.osgi
+        bundleSymbolicName=&quot;&quot;
+        [bundleVersion=&quot;&quot;]
+        [classes=&quot;&quot;]
+        [imports=&quot;&quot;]&gt;
+    &lt;properties service=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties reference=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties serviceCallback=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties referenceCallback=&quot;&quot;&gt;...&lt;/properties&gt;*
+&lt;/implementation.osgi&gt;
+</PRE>
+</DIV></DIV>
+<P>The bundle is identified by its symbolic name, which is used to locate the bundle in the SCA contribution. The version of the bundle can be optionally specified if multiple versions of the bundle are present in the contribution.</P>
+
+<P>The list of classes in the bundle which&nbsp;contain SCA annotations that should be processed by the SCA runtime can be specified in the classes attribute of &lt;implementation.osgi/&gt;. If this list is not provided, only the implementation classes of service instances will be scanned for SCA annotations.&nbsp;A list of&nbsp;dependent bundles can also be specified&nbsp;in the imports attribute. If provided, these bundles are installed and started before the implementation bundle.</P>
+
+<P>OSGi services registered in the OSGi registry can have properties associated with the service registration. These properties can be used to lookup services in the registry. The properties of services, references and callbacks associated with OSGi services can be optionally specified. These will be used to create the filter for locating these services in the OSGi registry.&nbsp;</P>
+
+<P>A component type file should be provided for SCA components using an OSGi bundle as its implementation. This file should have the same base name and location as the bundle.</P>
+
+<H4><A name="SCAJavaimplementation.osgi-Example%3A"></A>Example:</H4>
+
+<P>This example shows a simple composite with&nbsp;two components that use &lt;implementation.osgi/&gt;:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0
+</SPAN>    targetNamespace=http:<SPAN class="code-comment">//helloworld
+</SPAN>    name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldClient&quot;</SPAN>&gt;
+        &lt;implementation.osgi xmlns=http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0
+</SPAN>             bundleSymbolicName=<SPAN class="code-quote">&quot;helloworld.HelloWorldClient&quot;</SPAN>                   
+             bundleVersion=<SPAN class="code-quote">&quot;1.0.0&quot;</SPAN>&gt;
+            &lt;properties reference=<SPAN class="code-quote">&quot;helloWorldService&quot;</SPAN>&gt;
+                &lt;property name=<SPAN class="code-quote">&quot;language&quot;</SPAN>&gt;English&lt;/property&gt;
+            &lt;/properties&gt;
+        &lt;/implementation.osgi&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldService&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>/&gt;
+   &lt;/component&gt;
+   &lt;component name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+        &lt;implementation.osgi xmlns=http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0
+</SPAN>             bundleSymbolicName=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN>                         
+             bundleVersion=<SPAN class="code-quote">&quot;1.0.0&quot;</SPAN>&gt;
+            &lt;properties service=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+                &lt;property name=<SPAN class="code-quote">&quot;language&quot;</SPAN>&gt;English&lt;/property&gt;
+            &lt;/properties&gt;
+        &lt;/implementation.osgi&gt;
+      &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>This example shows two components which use OSGi implementation. Each component implementation is an OSGi bundle, and one of the services from&nbsp;each bundle is exposed through SCA. The bundles are identified using their symbolic name and version which are values of the manifest attributes Bundle-SymbolicName and Bundle-Version respectively in the bundle jar files. The bundle jar files can either be a contribution in the SCA domain, or contained in a contribution in the SCA domain.</P>
+
+<P>The properties specified for the reference of HelloWorldClient are used to lookup HelloWorldService in the OSGi registry. These properties should match the properties specified for the service of HelloWorldService.&nbsp;</P>
+
+<P>The OSGi bundles should register the services exposed through SCA when the bundle is activated. Services are registered using standard OSGi service registration mechanism. References should be looked up in the OSGi service registry using registry lookup. SCA runtime does not perform reference injection for OSGi-based component implementation. Reference lookup should always use the service registered with the highest ranking to ensure that SCA wiring and scope are maintained. When OSGi declarative services are used, service registration and reference binding are performed by the OSGi declarative services runtime. References from components using &lt;implementation.osgi/&gt; can be wired to non-OSGi services, and non-OSGi components can access OSGi services. For example, either of the two components in this example can use &lt;implementation.java/&gt; as their implementation.</P>
+
+<P>Default scope for OSGi-based components is COMPOSITE. For scopes other than composite scope, a service factory should be registered in the OSGi service registry. Service factories should also be used for OSGi services which are used in multiple SCA components with different component properties.</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.osgi';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.data/Spring Tuscany.pptx b/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.data/Spring Tuscany.pptx
new file mode 100644
index 0000000000..ce80319c20
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.data/Spring Tuscany.pptx
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.html
new file mode 100644
index 0000000000..50948d1cf4
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationspring.html
@@ -0,0 +1,461 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.spring : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.spring">SCA Java implementation.spring</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.spring">SCA Java implementation.spring</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.spring</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964931">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964931">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964931">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964931">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964931">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964931">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H2><A name="SCAJavaimplementation.spring-%3Cimplementation.spring%3E"></A>&lt;implementation.spring&gt;</H2>
+
+<P>The Tuscany Java SCA runtime supports components implemented with Spring Framework by using the &lt;implementation.spring&gt; SCDL extension.</P>
+
+<P>The <A href="http://www.osoa.org/download/attachments/35/SCA_SpringComponentImplementationSpecification-V100.pdf?version=1" class="external-link" rel="nofollow">Spring specification</A> defines how Spring and SCA work with one another. The Spring Component implementation is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-spring" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> In <A href="http://static.springframework.org/spring/docs/2.5.5/reference" class="external-link" rel="nofollow">Spring Framework</A> an ApplicationContext is the main interface to the Spring IoC container. It is used to look up objects. It can be viewed as the Java object representation of the application-Context.xml file that contains the bean definitions.</P>
+
+<P>The integration with Spring will be at the SCA Composite level, where a Spring application context provides a complete composite, exposing services and using references via SCA. This means that a Spring application context defines the internal structure of a SCA composite implementation.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Tuscany uses Spring Framework 3.0.x-RELEASE (requires Java 1.4+)</P>
+
+<H3><A name="SCAJavaimplementation.spring-HowSpringApplicationContextisusedasSCACompositeImplementation%3F"></A>How Spring Application Context is used as SCA Composite Implementation?</H3>
+
+<UL>
+	<LI>A Spring Application Context is used as an implementation within an SCA composite component.</LI>
+	<LI>A component that uses Spring for an implementation can wire SCA services and references without introducing SCA metadata into the Spring configuration.<BR>
+The Spring context knows very little about the SCA environment.</LI>
+	<LI>SCA runtime enforces SCA policies and Spring Application Context is unaware of it.</LI>
+	<LI>It should be possible to generate an SCA Composite from any Spring context and use that composite within an SCA assembly.<BR>
+<EM>This feature is under review by the OASIS Specs Team, yet to be implemented in Tuscany</EM></LI>
+</UL>
+
+
+<H3><A name="SCAJavaimplementation.spring-HowtoUseSpringComponentImplementation%3F"></A>How to Use Spring Component Implementation?</H3>
+
+<P>The Spring component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">   &lt;implementation.spring location=<SPAN class="code-quote">&quot;targetURI&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where the location attribute of that element specifies the target uri of an archive file or directory or the fully qualified path that contains the Spring application context files.</P>
+
+<P>An example of all the three ways of specifying the target uri in the location attribute is shown below</P>
+
+<P>a) Specifying Fully Qualified Path:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring/application-context.xml&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>b) Specifying a Directory:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Here the target uri specifies the resource as a directory named &quot;spring&quot;, where all the spring related files are available.</P>
+
+<P>c) Specifying an Archive file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring.jar&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Here the target uri specifies the resource as an archive file name &quot;spring.jar&quot;, where all the spring related files are available.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> In case of b) and c), If the resource identified by the location attribute is an archive file then the file META-INF/MANIFEST.MF is read from the archive. If the location URI identifies a directory, then META-INF/MANIFEST.MF must exist underneath that directory.</P>
+
+<P>If the manifest file contains a header &quot;Spring-Context&quot; of the format: <INS>Spring-Context ::= path ( ';' path )&#42;</INS></P>
+
+<P>Where path is a relative path with respect to the location URI, then the set of paths specified in the header identify the context configuration files. If there is no MANIFEST.MF file or no Spring-Context header within that file, then the default behavior is to build an application context using application-context.xml file in the META-INF/spring directory.</P>
+
+<H3><A name="SCAJavaimplementation.spring-HowSpringApplicationContextisAwareofBeansusedinSCAcomposition%3F"></A>How Spring Application Context is Aware of Beans used in SCA composition?</H3>
+
+<P>Your existing Spring Application context should define the <A href="http://www.springframework.org/schema/sca" class="external-link" rel="nofollow">http://www.springframework.org/schema/sca</A> namespace in order to make the Spring aware of the SCA related beans. This is shown below.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;beans xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.springframework.org/schema/beans&quot;</SPAN>
+</SPAN>       xmlns:xsi=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema-instance&quot;</SPAN>
+</SPAN>       xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.springframework.org/schema/sca&quot;</SPAN>
+</SPAN>       xsi:schemaLocation=&quot;
+       http:<SPAN class="code-comment">//www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+</SPAN>       http:<SPAN class="code-comment">//www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd&quot;&gt;
+</SPAN>
+    &lt;sca:service name=<SPAN class="code-quote">&quot;StockQuoteService&quot;</SPAN>
+        type=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN> target=<SPAN class="code-quote">&quot;StockQuoteServiceBean&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;StockQuoteServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteImpl&quot;</SPAN>&gt;
+    &lt;/bean&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.spring-HandlingmultipleSpringApplicationContexts"></A>Handling multiple Spring Application Contexts</H3>
+
+<P>Tuscany supports the following configurations to handle multiple Spring Application Context XML files.</P>
+
+<H4><A name="SCAJavaimplementation.spring-Using%3Cimport%3EElement%3A"></A>Using &lt;import&gt; Element:</H4>
+
+<P>Each import element points to an application context xml file.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;beans&gt;
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;services.xml&quot;</SPAN>/&gt;
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;resources/messageSource.xml&quot;</SPAN>/&gt;
+
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;/resources/themeSource.xml&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;bean1&quot;</SPAN> class=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;
+    &lt;bean id=<SPAN class="code-quote">&quot;bean2&quot;</SPAN> class=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaimplementation.spring-UsingClassPathXmlApplicationContextBeanDefinition%3A"></A>Using ClassPathXmlApplicationContext Bean Definition:</H4>
+
+<P>Each list value points to an application context xml file.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;bean id=<SPAN class="code-quote">&quot;beanRefFactory&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.springframework.context.support.ClassPathXmlApplicationContext&quot;</SPAN>&gt;
+    &lt;constructor-arg&gt;
+        &lt;list&gt;
+            &lt;value&gt;services.xml&lt;/value&gt;
+            &lt;value&gt;resources/messageSource.xml&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/constructor-arg&gt;
+&lt;/bean&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaimplementation.spring-SomeExamples%3A"></A>Some Examples:</H3>
+
+<H4><A name="SCAJavaimplementation.spring-SpringBigBankSample"></A>Spring BigBank Sample</H4>
+
+<P>The spring-bigbank sample demonstrates most of the functionality that is specified in the <A href="http://www.oasis-opencsa.org/sca-spring" class="external-link" rel="nofollow">specifications </A>.</P>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/simple-bigbank-spring/" class="external-link" rel="nofollow">simple-bigbank-spring </A> sample for a complete example.</P>
+
+<H4><A name="SCAJavaimplementation.spring-DirectuseofSCAreferenceswithinaSpringconfiguration"></A>Direct use of SCA references within a Spring configuration</H4>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-calculator/" class="external-link" rel="nofollow">spring-bigbank-calculator </A> sample for a complete example of using direct SCA references within Spring configuration.</P>
+
+<P>The properties like addService, subtractService, multiplyService and divideService defined in the Spring configuration as shown below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;beans&gt;
+
+    &lt;sca:service name=<SPAN class="code-quote">&quot;CalculatorService&quot;</SPAN>
+        type=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorService&quot;</SPAN> target=<SPAN class="code-quote">&quot;CalculatorServiceBean&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;CalculatorServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorServiceImpl&quot;</SPAN>&gt;
+        &lt;!-- Here are some implicit references - a property with a ref not satisifed within the
+         * Spring application context.
+         --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;addService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;divideService&quot;</SPAN>/&gt;
+    &lt;/bean&gt;
+
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<P>are the direct representation of the SCA references defined in the composite file.</P>
+
+<H4><A name="SCAJavaimplementation.spring-ExplicitdeclarationofSCArelatedbeansinsideaSpringApplicationContext"></A>Explicit declaration of SCA related beans inside a Spring Application Context</H4>
+
+<P>It is also possible to explicitly declare SCA-related beans inside a Spring configuration to proxy SCA references. The primary reason you may do this is to enable the Spring container to decorate the bean (using Spring AOP for example).</P>
+
+<P>The properties checkingAccountService, calculatorService and stockQuoteService defined in the Spring configuration as shown below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;beans&gt;
+   &lt;bean id=<SPAN class="code-quote">&quot;AccountServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.account.AccountServiceImpl&quot;</SPAN>&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN>/&gt;
+
+        &lt;!-- Here are some implicit references &amp; properties - a property with a ref not satisifed
+        * within the Spring application context.
+         --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;savingsAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;savingsAccountService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;stockAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;stockAccountService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;currency&quot;</SPAN> value=<SPAN class="code-quote">&quot;EURO&quot;</SPAN>/&gt;
+    &lt;/bean&gt;
+
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.account.checking.CheckingAccountService&quot;</SPAN>/&gt;
+
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorService&quot;</SPAN>/&gt;
+
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN>/&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<P>can be declared explicit as SCA beans in Spring Application Context using the &lt;sca:reference&gt; element.</P>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/simple-bigbank-spring/" class="external-link" rel="nofollow">simple-bigbank-spring </A> sample for a complete example of using explicit declaration of SCA related beans.</P>
+
+<H4><A name="SCAJavaimplementation.spring-UsingSCABindingsforSpringImplementation"></A>Using SCA Bindings for Spring Implementation</H4>
+
+<P>We know that a component that uses Spring for an implementation can wire SCA services and references without introducing SCA metadata into the Spring configuration. The Spring context knows very little about the SCA environment. Hence the SpringComponent implementation remains the same as shown from some of the examples above but different bindings are chosen at the SCA Composite level as shown below.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> All kind of bindings supported by SCA can be used for Spring Implementation as the bindings are independent of Spring context. Few examples can be seen below.</P>
+
+<H5><A name="SCAJavaimplementation.spring-WorkingwithSCAWebServicesBinding"></A>Working with SCA WebServices Binding</H5>
+
+<P>Declaring Service</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;composite name=<SPAN class="code-quote">&quot;StockQuote&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;StockQuoteService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;StockQuoteServiceComponent&quot;</SPAN>&gt;
+        &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN>/&gt;
+        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8081/services/StockQuoteWebService&quot;</SPAN>/&gt;
+</SPAN>    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;StockQuoteServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.spring location=<SPAN class="code-quote">&quot;META-INF/spring/StockQuoteService-context.xml&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Declaring Reference in a component which consumes the Service declared above</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;component name=<SPAN class="code-quote">&quot;AccountServiceComponent&quot;</SPAN>&gt;
+    &lt;implementation.spring location=<SPAN class="code-quote">&quot;spring-context/Account-spring-context.xml&quot;</SPAN>/&gt;
+
+    &lt;reference name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN>&gt;
+       &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8081/services/StockQuoteWebService&quot;</SPAN>/&gt;
+</SPAN>    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-stockquote/" class="external-link" rel="nofollow">spring-bigbank-stockquote </A> sample for a complete example of using SCA Web Service binding.</P>
+
+<H5><A name="SCAJavaimplementation.spring-WorkingwithSCARMIBinding"></A>Working with SCA RMI Binding</H5>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-calculator/" class="external-link" rel="nofollow">spring-bigbank-calculator </A> sample for a complete example of using SCA RMI binding.</P>
+
+<H3><A name="SCAJavaimplementation.spring-AccesstheSpringApplicationContextfromeverywhereinyourApplication"></A>Access the Spring-ApplicationContext from everywhere in your Application</H3>
+
+<P>Tuscany creates an custom Application context with an implementation logic for all SCA related beans like &lt;sca:service&gt;, &lt;sca:reference&gt; and &lt;sca:properties&gt; available in the Spring Application Context.</P>
+
+<P>To access the application context in your application we recommend to use the suggested approach in this article.<BR>
+<A href="http://blog.jdevelop.eu/2008/07/06/access-the-spring-applicationcontext-from-everywhere-in-your-application/" class="external-link" rel="nofollow">http://blog.jdevelop.eu/2008/07/06/access-the-spring-applicationcontext-from-everywhere-in-your-application/</A></P>
+
+
+<H3><A name="SCAJavaimplementation.spring-NonSupportedFeaturesinTuscany"></A>Non-Supported Features in Tuscany</H3>
+
+<P>Currently Tuscany does not support implicit SCA references and properties for scenario 1 &amp; 2 in spring context as shown below.</P>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario1%3AUsingimplicitSCAReferences%26PropertiesforConstructors"></A>Scenario 1: Using implicit SCA References &amp; Properties for Constructors</H5>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;constructor-arg&gt;&lt;ref bean=<SPAN class="code-quote">&quot;mySCAService1&quot;</SPAN>/&gt;&lt;/constructor-arg&gt;
+&lt;constructor-arg&gt;&lt;ref bean=<SPAN class="code-quote">&quot;mySCAService2&quot;</SPAN>/&gt;&lt;/constructor-arg&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the above scenario, particularly in cases where the spring bean has defined only one constructor, implicit references / properties can be supported when the contructor-arg element specifies the type of the SCA reference/property that its trying to consume by specifying a type attribute in the contructor-arg OR when the appropriate index attribute is specified in the constructor-arg element.</P>
+
+<P>In cases where the spring bean has defined multiple contructors, its mandatory that all the SCA references / properties used by the constructors should be defined explicitly. And when the constructor-arg uses SCA reference/property within collections, those should be defined explicitly.</P>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario2%3AUsingimplicitSCAReferences%26PropertiesinList%2CMapandSetofbeanproperties."></A>Scenario 2: Using implicit SCA References &amp; Properties in List, Map and Set of bean properties.</H5>
+
+<P>Using implicit SCA references and properties within collection as shown in the below code sample will not be supported by Tuscany. Instead we recommed to use explicit SCA references/properties in such cases.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;bean id=<SPAN class="code-quote">&quot;moreComplexObject&quot;</SPAN> class=<SPAN class="code-quote">&quot;example.ComplexObject&quot;</SPAN>&gt;
+  &lt;!-- results in a setSomeList(java.util.List) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someList&quot;</SPAN>&gt;
+    &lt;list&gt;
+        &lt;value&gt;a list element followed by a reference&lt;/value&gt;
+        &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService1&quot;</SPAN> /&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+  &lt;!-- results in a setSomeMap(java.util.Map) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someMap&quot;</SPAN>&gt;
+    &lt;map&gt;
+        &lt;entry&gt;
+            &lt;key&gt;
+                &lt;value&gt;an entry&lt;/value&gt;
+            &lt;/key&gt;
+            &lt;value&gt;just some string&lt;/value&gt;
+        &lt;/entry&gt;
+        &lt;entry&gt;
+            &lt;key&gt;
+                &lt;value&gt;a ref&lt;/value&gt;
+            &lt;/key&gt;
+            &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService2&quot;</SPAN> /&gt;
+        &lt;/entry&gt;
+    &lt;/map&gt;
+  &lt;/property&gt;
+  &lt;!-- results in a setSomeSet(java.util.Set) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someSet&quot;</SPAN>&gt;
+    &lt;set&gt;
+        &lt;value&gt;just some string&lt;/value&gt;
+        &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService3&quot;</SPAN> /&gt;
+    &lt;/set&gt;
+  &lt;/property&gt;
+&lt;/bean&gt;
+</PRE>
+</DIV></DIV>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario3%3AExposingSCAServicefromSpringBeanthatimplementsmultipleinterfaces."></A>Scenario 3: Exposing SCA Service from Spring Bean that implements multiple interfaces.</H5>
+
+<P>Raised as Specification Issue: <A href="http://www.osoa.org/jira/browse/JAVA-59" class="external-link" rel="nofollow">http://www.osoa.org/jira/browse/JAVA-59</A></P>
+
+
+<H3><A name="SCAJavaimplementation.spring-IntegrationwithSpringforWebApplications%28includingSpringMVC%29"></A>Integration with Spring for Web Applications (including Spring MVC)</H3>
+
+
+
+<P><A href="sca-java-implementationspring.data/Spring%20Tuscany.pptx">Presentation</A></P>
+
+
+<H3><A name="SCAJavaimplementation.spring-SpringSCANamespaceschema"></A>Spring SCA Namespace schema</H3>
+
+<P>The spring-sca.xsd can be found at the following location: <A href="http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd" class="external-link" rel="nofollow">http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd</A></P>
+
+
+<H3><A name="SCAJavaimplementation.spring-References"></A>References</H3>
+
+<P>Spring Framework - <A href="http://static.springframework.org/spring/docs/2.5.5/reference/index.html" class="external-link" rel="nofollow">http://static.springframework.org/spring/docs/2.5.5/reference/index.html</A></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.spring';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationweb.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationweb.html
new file mode 100644
index 0000000000..4c4911c090
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationweb.html
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.web : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.web">SCA Java implementation.web</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.web">SCA Java implementation.web</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.web</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964940">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964940">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964940">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964940">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964940">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964940">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavaimplementation.web-%3Cimplementation.web%3E"></A>&lt;implementation.web&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports components implemented as JEE web modules by using the &lt;implementation.web&gt; SCDL extension. Implementation.web is one of the SCA extensions being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-open.org/committees/download.php/28798/SCA_JAVAEE_Integration_V100.pdf" class="external-link" rel="nofollow">specification </A> document.</P>
+
+<P>The web component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.web web-uri=<SPAN class="code-quote">&quot;&lt;module name&gt;&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Implementation.web can be used by components such as Servlets, JSPs, and Web 2.0 style html pages. How it works depends on the way the Tuscany runtime is being used.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithServlets%2CFilters%2CandEventlisteners"></A>Using implementation.web with Servlets, Filters, and Event listeners</H4>
+
+<P>JEE Servlets, Filters, and Event listeners may acquire references to the services wired to a component which use implementation.web as shown in the following code snippets.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>/&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then when using a JEE container with SCA integration Servlets, Filters, and Event listeners can use annotations to acquire references to the services wired to the component as shown in the following Servlet code snippet (note the Servlet field name 'service' matches the reference name in the SCDL):</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class HelloworldServlet <SPAN class="code-keyword">extends</SPAN> HttpServlet {
+
+    @Reference
+    <SPAN class="code-keyword">protected</SPAN> HelloworldService service;
+
+  . . .
+}
+</PRE>
+</DIV></DIV>
+
+<P>When the container does not have SCA integration then injection via annotations does not work, so to work around this the services need to be manually got from the ComponentContext which may be obtained from the application context. This is shown in the following code snippet:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class HelloworldServlet <SPAN class="code-keyword">extends</SPAN> HttpServlet {
+
+    <SPAN class="code-keyword">public</SPAN> void init(ServletConfig config) {
+       ComponentContext context = (ComponentContext)config.getServletContext().getAttribute(<SPAN class="code-quote">&quot;org.osoa.sca.ComponentContext&quot;</SPAN>);
+       HelloworldService service = context .getService(HelloworldService.class, <SPAN class="code-quote">&quot;service&quot;</SPAN>);
+       . . .
+    }
+
+  . . .
+}
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/helloworld-servlet/" class="external-link" rel="nofollow">helloworld-servlet</A> sample for the complete code of the above Servlet example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithJSPs"></A>Using implementation.web with JSPs</H4>
+
+<P>A JSP tag library is available to expose SCA components in JSP pages. To use SCA references within a JSP use a taglib to include the SCA tags and define the reference field with the reference tag.  </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>/&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the .jsp file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;%@ taglib uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/sca/sca_jsp.tld&quot;</SPAN> prefix=<SPAN class="code-quote">&quot;sca&quot;</SPAN> %&gt;
+</SPAN>&lt;sca:reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> type=<SPAN class="code-quote">&quot;sample.HelloworldService&quot;</SPAN> /&gt;
+
+&lt;html&gt;
+  &lt;body &gt;
+    &lt;%= service.sayHello(<SPAN class="code-quote">&quot;world&quot;</SPAN>) %&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/helloworld-jsp/" class="external-link" rel="nofollow">helloworld-jsp</A> sample for the complete code of the above JSP example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithWeb2.0stylebrowserclients"></A>Using implementation.web with Web 2.0 style browser clients</H4>
+
+<P>Web 2.0 style pages can invoke SCA services by making RPC calls from the remote browser client to the service-side SCA service. To do this the HTML page includes Javascript code to import the SCA ComponentContext and then gets service proxys from that ComponentContext. The org.osoa.sca.componentContext.js script is generated by Tuscany when a component uses implementation.web.</P>
+
+<P>In the SCDL the reference needs to specify one of the Tuscany Web2.0 bindings such as binding.jsonrpc or binding.dwr. <BR>
+(TODO: could this be avoided - something like make binding.jsonrpc the default sca binding for web2.0 clients?) </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>&gt;
+      &lt;tuscany:binding.jsonrpc /&gt;
+   &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the html page:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+  &lt;head&gt;
+
+    &lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;org.osoa.sca.componentContext.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+    &lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+    
+       function callSayHello() {
+          componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHello(
+             document.getElementById('name').value, 
+             function(reply) {
+                document.getElementById('result').innerHTML=reply;
+             });
+       }
+
+    &lt;/script&gt;
+
+  &lt;/head&gt;
+  &lt;body &gt;
+
+    . . . 
+
+     &lt;input type=<SPAN class="code-quote">&quot;text&quot;</SPAN> id=<SPAN class="code-quote">&quot;name&quot;</SPAN> width=<SPAN class="code-quote">&quot;10&quot;</SPAN>&gt;
+
+     &lt;button name=<SPAN class="code-quote">&quot;submit&quot;</SPAN> onclick=<SPAN class="code-quote">&quot;callSayHello()&quot;</SPAN>&gt;Say hello&lt;/button&gt;
+
+     &lt;div id='result'&gt;&lt;/div&gt;
+
+    . . . 
+
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/samples/helloworld-web/" class="external-link" rel="nofollow">helloworld-web</A> sample for the complete code of the above example.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The following on Web 2.0 callbacks is not yet fully implemented, describing here to encourage feedback </P>
+
+<P>Tuscany Web 2.0 clients using implementation.web support SCA asynchronous callbacks using what is known as <A href="http://en.wikipedia.org/wiki/Comet_(programming)" class="external-link" rel="nofollow">Comet or Reverse Ajax</A>. The only Tuscany binding that currently supports this in binding.dwr.</P>
+
+<P>The following shows the previous sample changed to use callbacks to receive the replies. A callback binding is added to the reference in the SCDL and the callback function is defined as a seperate Javascript function defined by the client and attached to the service proxy object. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+    &lt;implementation.web web-uri=&quot;&quot;/&gt;
+    &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>&gt;
+        &lt;tuscany:binding.dwr /&gt;
+        &lt;callback&gt;
+            &lt;tuscany:binding.dwr /&gt;
+        &lt;/callback&gt;
+    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the html page:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+  &lt;head&gt;
+
+    &lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;org.osoa.sca.componentContext.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+    &lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+
+       componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHelloCallback = 
+          function(reply) {
+             document.getElementById('result').innerHTML=reply;
+          };
+    
+       function callSayHello() {
+          componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHello(document.getElementById('name').value);
+       }
+
+    &lt;/script&gt;
+
+  &lt;/head&gt;
+  &lt;body &gt;
+
+    . . . 
+
+     &lt;input type=<SPAN class="code-quote">&quot;text&quot;</SPAN> id=<SPAN class="code-quote">&quot;name&quot;</SPAN> width=<SPAN class="code-quote">&quot;10&quot;</SPAN>&gt;
+
+     &lt;button name=<SPAN class="code-quote">&quot;submit&quot;</SPAN> onclick=<SPAN class="code-quote">&quot;callSayHello()&quot;</SPAN>&gt;Say hello&lt;/button&gt;
+
+     &lt;div id='result'&gt;&lt;/div&gt;
+
+    . . . 
+
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/helloworld-web-callback/" class="external-link" rel="nofollow">helloworld-web-callback</A> sample for the complete code of the above example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanyruntimeembeddedwithinawebapp"></A>Using implementation.web with the Tuscany runtime embedded within a webapp</H4>
+
+<P>This is the style all the current Tuscany webapp samples use. When using implementation.web with the Tuscany runtime embedded within a webapp the implementation.web web-uri attribute is ignored.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanyruntimeintegratedintoaJEEserversuchasTomcatorGeronimo"></A>Using implementation.web with the Tuscany runtime integrated into a JEE server such as Tomcat or Geronimo</H4>
+
+<P>The only code that is currently working is some prototype code in the Tuscany runtime-tomcat module that supports injecting references into Servlets, Filters and Event listeners using the @Reference annotation.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanystandaloneruntime"></A>Using implementation.web with the Tuscany standalone runtime</H4>
+
+<P>Nothing implemented yet</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanydistributeddomainruntime"></A>Using implementation.web with the Tuscany distributed domain runtime</H4>
+
+<P>Nothing implemented yet</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.web';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-implementationwidget.html b/site/trunk/site-publish/documentation-2x/sca-java-implementationwidget.html
new file mode 100644
index 0000000000..58e98f3d3b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-implementationwidget.html
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java implementation.widget : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.widget">SCA Java implementation.widget</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.widget">SCA Java implementation.widget</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java implementation.widget</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964942">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964942">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964942">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964942">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964942">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964942">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SCAJavaimplementation.widget-Introduction"></A>Introduction</H3>
+
+<P>The Tuscany Widget Implementation extends the SCA programing model to HTML and/or Web 2.0 client applications.</P>
+
+
+<H3><A name="SCAJavaimplementation.widget-UsingImplementation.WidgettomodelyourWeb2.0component"></A>Using Implementation.Widget to model your Web 2.0 component</H3>
+
+<P>This component type allows you to model your HTML and/or Web 2.0 as an SCA component, the implementation artifact would be html resource that represents the application, and you can define SCA References, that would be wired to server side services.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite	xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>		xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>		targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN>			
+</SPAN>		name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		
+       &lt;component name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+           &lt;t:implementation.widget location=<SPAN class="code-quote">&quot;contents/store.html&quot;</SPAN>/&gt;
+           &lt;service name=<SPAN class="code-quote">&quot;Widget&quot;</SPAN>&gt;
+               &lt;t:binding.http/&gt; 
+           &lt;/service&gt;
+	   &lt;reference name=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> target=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+               &lt;t:binding.jsonrpc/&gt;
+	   &lt;/reference&gt;
+	   &lt;reference name=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+	       &lt;t:binding.atom/&gt;
+	   &lt;/reference&gt;
+        &lt;/component&gt;
+    
+        .....
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.widget-DefiningreferencesinHTMLresources"></A>Defining references in HTML resources</H3>
+
+<P>The widget implementation introduces SCA annotations to JavaScript code using the syntax below. These references will get properly introspected by the implementation.widget and wired to the proper server side services.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> catalog = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;catalog&quot;</SPAN>);
+
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> shoppingCart = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.widget-IncludinggeneratedJavaScriptclientproxy"></A>Including generated JavaScript client proxy</H3>
+
+<P>The client application will need to include a generated JavaScript that will contain the necessary client proxy used to access the server side services. The name of the generated JavaScript is the same as the HTML resource being specified as the implementation artifact.</P>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;!-- one js include per sca component --&gt;
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;store.js&quot;</SPAN>&gt;&lt;/script&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaimplementation.widget-Supportedbindingtypes"></A>Supported binding types</H3>
+
+<P>Currently, you can define references to remote services using the following bindings :</P>
+<UL>
+	<LI><A href="sca-java-bindingatom.html" title="SCA Java binding.atom">ATOM</A></LI>
+	<LI><A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">JSON-RPC</A></LI>
+	<LI><A href="sca-java-bindinghttp.html" title="SCA Java binding.http">HTTP</A></LI>
+</UL>
+
+
+<H3><A name="SCAJavaimplementation.widget-References"></A>References</H3>
+<P><A href="http://incubator.apache.org/tuscany/getting-started-with-tuscany.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/getting-started-with-tuscany.html</A></P>
+
+
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java implementation.widget';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-interfacewsdl.html b/site/trunk/site-publish/documentation-2x/sca-java-interfacewsdl.html
new file mode 100644
index 0000000000..7affdd61d2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-interfacewsdl.html
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java interface.wsdl : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java interface.wsdl">SCA Java interface.wsdl</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java-extensions-guide.html" title="SCA Java Extensions Guide">SCA Java Extensions Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java interface.wsdl">SCA Java interface.wsdl</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java interface.wsdl</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964972">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964972">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964972">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964972">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964972">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964972">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H3><A name="SCAJavainterface.wsdl-%3Cinterface.wsdl%3E"></A>&lt;interface.wsdl&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports interfaces that are described by Web Services Description Lanuage (WSDL) files. The files contain a description of the service interface, services, references, method requests and responses, and the data types. The implementation of this WSDL interface can be generated with the Java SDK tool <B>wsimport</B>. The <B>wsimport</B> tool generates a skeleton of the service interface, along with all associated request and response classes, and any complex data types passed on the interface. The user can augment the skeleton by putting implementation code in the approproate spot.</P>
+
+<P>The following snippet shows how the WSDL interface and the Java implementation are used in an SCA composite file and publicised as a component.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;OrderServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.example.orderservice.OrderServiceImpl&quot;</SPAN> /&gt;
+	    &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+	        &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/#wsdl.<SPAN class="code-keyword">interface</SPAN>(OrderService)&quot;</SPAN> /&gt;
+</SPAN>	        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/OrderService&quot;</SPAN>/&gt;
+</SPAN>	    &lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavainterface.wsdl-Examples"></A>Examples</H3>
+
+<P>This example shows a component with its interface described via WSDL. The web service binding defaults are used so the endpoint of the Web service will be <A href="http://localhost:8085/OrderService" class="external-link" rel="nofollow">http://localhost:8085/OrderService</A>. (Note that this full sample is available in Tuscany 1.x branch under the samples/holder-ws-service sample).</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//orderservice&quot;</SPAN>
+</SPAN>	xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//orderservice&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;orderws&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;OrderServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.example.orderservice.OrderServiceImpl&quot;</SPAN> /&gt;
+	    &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+	        &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/#wsdl.<SPAN class="code-keyword">interface</SPAN>(OrderService)&quot;</SPAN> /&gt;
+</SPAN>	        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/OrderService&quot;</SPAN>/&gt;
+</SPAN>	    &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>WSDL files can be generated with many tools and development environment plugins. This snippet shows a portion of the WSDL file that describes the business service data types and the assoicated method calls and responses:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;wsdl:portType name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+        &lt;wsdl:operation name=<SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>&gt;
+            &lt;wsdl:input message=<SPAN class="code-quote">&quot;tns:reviewOrderRequest&quot;</SPAN>/&gt;
+            &lt;wsdl:output message=<SPAN class="code-quote">&quot;tns:reviewOrderResponse&quot;</SPAN>/&gt;
+        &lt;/wsdl:operation&gt;
+    &lt;/wsdl:portType&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;reviewOrderRequest&quot;</SPAN>&gt;
+        &lt;wsdl:part element=<SPAN class="code-quote">&quot;tns:reviewOrder&quot;</SPAN> name=<SPAN class="code-quote">&quot;myParameters&quot;</SPAN>/&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>&gt;
+        &lt;wsdl:part element=<SPAN class="code-quote">&quot;tns:reviewOrderResponse&quot;</SPAN> name=<SPAN class="code-quote">&quot;myResult&quot;</SPAN>/&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:types&gt;
+        &lt;xsd:schema targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>&gt;
+</SPAN>            &lt;xsd:complexType name=<SPAN class="code-quote">&quot;order&quot;</SPAN>&gt;
+                &lt;xsd:sequence&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;customerId&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>    minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;status&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:status&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;total&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">double</SPAN>&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;orderId&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">int</SPAN>&quot;</SPAN> /&gt;
+                &lt;/xsd:sequence&gt;
+            &lt;/xsd:complexType&gt;
+
+            &lt;xsd:simpleType name=<SPAN class="code-quote">&quot;status&quot;</SPAN>&gt;
+                &lt;xsd:restriction base=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Created&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Submitted&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Approved&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Rejected&quot;</SPAN> /&gt;
+                &lt;/xsd:restriction&gt;
+            &lt;/xsd:simpleType&gt;
+
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:order&quot;</SPAN>
+                            minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> /&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:order&quot;</SPAN>
+                            minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> /&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+
+        &lt;/xsd:schema&gt;
+    &lt;/wsdl:types&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The Java implementation for this web service can be generated with the Java SDK tool <B>wsimport</B>. Full documentation is in the Java SDK JavaDocs, but basically one specifies the source WSDL and the output directory for generated files.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    wsimport -d orderservice -keep orderservice.wsdl
+</PRE>
+</DIV></DIV>
+
+<P>The generated implementation files can be augmented with code that operates on provided business objects.</P>
+
+<H3><A name="SCAJavainterface.wsdl-WebServicesHolderPattern"></A>Web Services Holder Pattern</H3>
+
+<P>A pattern known as the Web Services Holder Pattern is supported by Tuscany in the 1.5 and later releases. WSDL files support a parameter mode known as INOUT. The INOUT mode is used for service interface parameters that are passed into a business interface and returned<BR>
+on the same interface.</P>
+
+<P>The advantages of the INOUT mode are:</P>
+<UL>
+	<LI>supports a well known pattern of parameter pass by reference. Normally SCA parameters are always passed by value.</LI>
+	<LI>saves instantiation and initialization for large or complex objects.</LI>
+	<LI>simplifies the signature of business interfaces</LI>
+	<LI>saves the user the cost of boxing and returning multiple return objects.</LI>
+</UL>
+
+
+<P>The Holder pattern is created by the Java SDK wsimport tool whenever data type is both input and output to a given operation&gt;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+      &lt;xsd:element name=<SPAN class="code-quote">&quot;myOperation&quot;</SPAN>&gt;
+        &lt;xsd:complexType&gt;
+          &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:myDataType&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN>/&gt;
+          &lt;/xsd:sequence&gt;
+        &lt;/xsd:complexType&gt;
+      &lt;/xsd:element&gt;
+      &lt;xsd:element name=<SPAN class="code-quote">&quot;myOperationResponse&quot;</SPAN>&gt;
+        &lt;xsd:complexType&gt;
+          &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:myDataType&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN>/&gt;
+          &lt;/xsd:sequence&gt;
+        &lt;/xsd:complexType&gt;
+      &lt;/xsd:element&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The generated implemenation code contains annotations that mark the parameter data as an input output parameter. Also notice that the business object Order is passed in as a data type javax.xml.ws.Holder&lt;Order&gt;. This Holder class allows the input object to be returned as an output object, i.e. pass by reference.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    @WebMethod(action = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/reviewOrder&quot;</SPAN>)
+</SPAN>    @RequestWrapper(localName = <SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrder&quot;</SPAN>)
+</SPAN>    @ResponseWrapper(localName = <SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrderResponse&quot;</SPAN>)
+</SPAN>    <SPAN class="code-keyword">public</SPAN> void reviewOrder(
+        @WebParam(name = <SPAN class="code-quote">&quot;myData&quot;</SPAN>, targetNamespace = &quot;&quot;, mode = WebParam.Mode.INOUT)
+        javax.xml.ws.Holder&lt;Order&gt; myData);
+</PRE>
+</DIV></DIV>
+
+<P>The Java implemenation code can access the wrapped Holder object, perform updates on the object, and leave it in place to return the object as shown here with the Java object Order :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    @WebMethod(action = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/reviewOrder&quot;</SPAN>)
+</SPAN>    @RequestWrapper(localName = <SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrder&quot;</SPAN>)
+</SPAN>    @ResponseWrapper(localName = <SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrderResponse&quot;</SPAN>)
+</SPAN>    <SPAN class="code-keyword">public</SPAN> void reviewOrder(
+        @WebParam(name = <SPAN class="code-quote">&quot;myData&quot;</SPAN>, targetNamespace = &quot;&quot;, mode = WebParam.Mode.INOUT)
+        Holder&lt;Order&gt; myData) {
+        Order order = myData.value;
+        <SPAN class="code-object">double</SPAN> total = order.getTotal();
+        <SPAN class="code-keyword">if</SPAN> ( total &lt; 100.0 ) {
+            order.setStatus( Status.APPROVED );
+        }
+    }
+</PRE>
+</DIV></DIV>
+
+<P>Tuscany, as of version 1.5 supports this input/output Holder pattern. At this point there is a limitation of only one in/out parameter, and this is only supported on methods with void return types.</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java interface.wsdl';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png
new file mode 100644
index 0000000000..1f47db146a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png.jpeg
new file mode 100644
index 0000000000..e3bd257c92
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-builders.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png
new file mode 100644
index 0000000000..7369e70546
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png.jpeg
new file mode 100644
index 0000000000..2d2ab7e8ea
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-overview.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png
new file mode 100644
index 0000000000..dc6e373373
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png.jpeg
new file mode 100644
index 0000000000..e4630b0b5f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-domain-registry.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png
new file mode 100644
index 0000000000..3d4e2c9509
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png.jpeg
new file mode 100644
index 0000000000..2f60b2b09d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-build.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png
new file mode 100644
index 0000000000..e55da1b706
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png.jpeg
new file mode 100644
index 0000000000..71d7c00313
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-callback.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png
new file mode 100644
index 0000000000..3323bc1f3b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png.jpeg
new file mode 100644
index 0000000000..3e79ae12c6
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-endpoint-structure.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png
new file mode 100644
index 0000000000..0f1251b821
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png.jpeg
new file mode 100644
index 0000000000..1ba4b541e2
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-interface-contracts.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png
new file mode 100644
index 0000000000..7052a9be1d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png.jpeg
new file mode 100644
index 0000000000..ebc31a599d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-databinding.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png
new file mode 100644
index 0000000000..3b573540d3
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png.jpeg
new file mode 100644
index 0000000000..b25911389c
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-reference-interceptors.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png
new file mode 100644
index 0000000000..913361a706
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png.jpeg
new file mode 100644
index 0000000000..b44bc4c7d8
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-context.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png
new file mode 100644
index 0000000000..91950718ad
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png.jpeg
new file mode 100644
index 0000000000..55b08faa09
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-runtime-structure.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png
new file mode 100644
index 0000000000..b495ada823
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png.jpeg
new file mode 100644
index 0000000000..49bb3d22a0
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-databinding.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png
new file mode 100644
index 0000000000..bd6128d209
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png.jpeg b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png.jpeg
new file mode 100644
index 0000000000..b4a58af954
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.data/tuscany-service-interceptors.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.html b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.html
new file mode 100644
index 0000000000..9a2dc55c16
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-java-runtime-overview.html
@@ -0,0 +1,833 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>SCA Java Runtime Overview : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java Runtime Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964723">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964723">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavaRuntimeOverview-SoftwareOrganization"></A>Software Organization</H1>
+<H3><A name="SCAJavaRuntimeOverview-SourceCodeLocations"></A>Source Code Locations</H3>
+<P>If you take a Tuscany SCA Java source distribution or look in the Tuscany subversion repository (<A href="http://svn.apache.org/repos/asf/tuscany/java/sca/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/java/sca/</A>) you'll see the code layed out as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+BUILDING
+CHANGES
+LICENSE
+NOTICE
+README
+RELEASE_NOTES
+
+distribution           - the code that defines and build Tuscany distributions
+features               - Maven projects that collect together Tuscany modules 
+maven         
+  archetypes           - Maven archetypes <SPAN class="code-keyword">for</SPAN> creating Tuscany project templates
+  maven-tuscany-plugin - ???
+modules                - the source code <SPAN class="code-keyword">for</SPAN> the runtime and the SCA extensions
+samples                - project samples
+testing
+  itest                - project integration tests
+  compliance-tests     - OASIS compliance tests
+pom.xml  
+</PRE>
+</DIV></DIV>
+
+<P>There is some related source code  that's worth mentioning up front. Firstly the project Maven build relies on a set of Maven plugins that have been written specifically for Tuscany. They can also be found in the Tuscany subversion repository (<A href="http://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/</A>) and are as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+maven-bundle-plugin     - Creates Tuscany OSGi bundles based on the Tuscany modules and their dependencies
+                          also generates eclipse PDE projects <SPAN class="code-keyword">for</SPAN> Tuscany modules
+maven-eclipse-compiler  - Compiles using the Eclipse compiler and performs OSGi validation
+maven-java2wsdl-plugin  - TBD
+maven-osgi-junit        - Runs Junit tests in an OSGi environment
+maven-tuscany-plugin    - TBD
+maven-wsdl2java-plugin  - TBD
+</PRE>
+</DIV></DIV>
+
+<P>Secondly there are a set of tests that the OASIS SCA specifications define called otests. These test the Tuscany SCA runtime for compliance with the specifications. The tests themselves are stored in the OASIS subversion system (<A href="http://tools.oasis-open.org/version-control/browse/" class="external-link" rel="nofollow">http://tools.oasis-open.org/version-control/browse/</A>). Tuscany has a set of modules that retrieve these tests automatically and configure the Tuscany environment to run them (<A href="http://svn.apache.org/repos/asf/tuscany/otest/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/otest/</A>) as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+README
+build.xml                    - Ant utility script
+pom.xml
+sca-assembly                 - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-java-caa                 - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-java-ci                  - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-policy                   - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+tuscany-java-caa-test-runner - Java Common Annotations and APIs test runner
+tuscany-java-ci-test-runner  - Java Component Implementation test runner
+tuscany-policy-test-runner   - Policy test runner
+tuscany-test-runner          - Assembly test runner
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaRuntimeOverview-SCAJavaModules"></A>SCA Java Modules</H3>
+<P>All of the functional code in Tuscany Java SCA can be found under the modules directory. There are a lot of sub-directories here but they basically fall into one of two categories, core function or extensions. We are using the term extension here in the sense that the SCA Assembly specification talks about and extension model You always have to have the core functions but most of the extensions are optional (we say most here because without some of the basic extensions the runtime won't do anything)  Finding extension modules is easy. Modules that start with the following words are extensions.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+binding
+databinding
+implementation
+<SPAN class="code-keyword">interface</SPAN>
+policy
+</PRE>
+</DIV></DIV>
+
+<P>As you can see SCA extensions relate to the extensible parts of the SCA composite file. For example, if you want to use &lt;binding.jms/&gt; in you SCA composite files then you need to include the Tuscany modules for this extension in you installation. In this case that would mean the modules binding-jms and binding-jms-runtime. </P>
+
+<P>All of the other modules in the modules directory are core modules and are generally required to be present in you Tuscany runtime installation. The use of the word &quot;generally&quot; here sounds a bit vague. This is because the Tuscany runtime itself is based on an extensibility mechanism which means that many parts of the runtime (as well as the SCA extensions) are pluggable. In this way, for example, different hosting environments can be supported. Well talk about runtime extensibility further down this article but for the time being consider all core modules to be mandatory. </P>
+
+<H1><A name="SCAJavaRuntimeOverview-RuntimeBuildingBlocks"></A>Runtime Building Blocks</H1>
+
+<P>As you may have realized the Tuscany SCA Java runtime is just a Java program that, once started listens for incoming messages (via SCA component services) and, sometimes responds with outgoing messages (via SCA component references).</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-runtime-context.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The runtime then provides the context within which SCA composite applications run. If we crack open the Tuscany Runtime box we see the following structure.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-runtime-structure.png" style="border: 0px solid black"></SPAN></P>
+
+<P>We'll take a high level look at these different blocks in turn starting with Core.</P>
+
+<H2><A name="SCAJavaRuntimeOverview-TuscanyCore"></A>Tuscany Core</H2>
+<P>The Tuscany core is made up of several modules that provide basic runtime and extensibility support to the extensions that provide the real SCA functions. If you look in the modules directory of a Tuscany distribtuion (2.0-M4 at the time of writing - this list may change in subsequent releases) the modules that make up the Tuscany core are as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+assembly                - The in-memory model of an OASIS SCA composite application (sometimes called an assembly)
+assembly-xml            - The Tuscany processors that translate to and from XML and the in-memory model
+assembly-xsd            - The schema used to validate the contents of various SCA files, e.g. the composite file
+builder                 - <SPAN class="code-object">Process</SPAN> the in-memory model to build a complete SCA application representation
+common-java             - General Java utilities
+common-xml              - General XML utilities
+contribution            - Read and process SCA contributions
+core                    - The core Tuscany SCA Java runtime functions
+core-databinding        - The core databinding functions
+core-spi                - The Java interfaces that extension developers use to create and register extensions
+databinding             - Builds on the core databinding functions to provide features common to all databindings???
+deployment              - Loads the runtime and orchestrates the loading of SCA contributions 
+extensibility           - Reads META-INF/services files and manages Tuscany extensibility
+extensibility-equinox   - Manages Tuscany extensibility in an OSGi environment
+host-http               - Base interfaces <SPAN class="code-keyword">for</SPAN> providing integration with a servlet container
+<SPAN class="code-keyword">interface</SPAN>-java          - Java <SPAN class="code-keyword">interface</SPAN> model and instrospection
+<SPAN class="code-keyword">interface</SPAN>-java-jaxws    - <SPAN class="code-object">Process</SPAN> JAX-WS annotations from a Java <SPAN class="code-keyword">interface</SPAN>
+<SPAN class="code-keyword">interface</SPAN>-wsdl          - WSDL <SPAN class="code-keyword">interface</SPAN> model 
+launcher                - Command line Tuscany runtime launcher
+monitor                 - Collects errors as they occur in the Tuscany runtime
+node-api                - API <SPAN class="code-keyword">for</SPAN> accessing an embedded Tuscany node (A node loads/runs contributions)
+node-impl               - The JSE implementation <SPAN class="code-keyword">for</SPAN> the node API
+node-impl-osgi          - The OSGi implementation <SPAN class="code-keyword">for</SPAN> the node API ????
+node-launcher           - The JSE based command line launcher <SPAN class="code-keyword">for</SPAN> a Tuscany node
+node-launcher-equinox   - The OSGi based command line launcher <SPAN class="code-keyword">for</SPAN> a Tuscany node
+sca-api                 - The OASIS defined SCA API
+sca-client-impl         - The Tuscany implementation of the OASIS defined SCA client
+xsd                     - The in-memory model of an XSD file, along with the processors to read it
+</PRE>
+</DIV></DIV>
+
+<P>We have already said that there are a set of extensions that, while in theory they are are optional, are in practice required to do anything useful. These are are follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+binding-sca-runtime          - The implementation <SPAN class="code-keyword">for</SPAN> the local version of binding.sca
+binding-sca-axis2-runtime    - The implementation <SPAN class="code-keyword">for</SPAN> the remote version of binding.sca based on web services
+binding-ws                   - The in-memory model <SPAN class="code-keyword">for</SPAN> binding.ws 
+binding-ws-axis2             - TBD - should be called runtime
+binding-ws-axis2-policy      - TBD
+binding-ws-wsdlgen           - TBD
+databinding-axiom            - The databinding <SPAN class="code-keyword">for</SPAN> Axiom 
+databinding-jaxb             - The databinding <SPAN class="code-keyword">for</SPAN> JAXB
+databinding-jaxb-axiom       - TBD
+endpoint-tribes              - The distributed endpoint registry based on tribes
+host-jetty                   - Allows Jetty to be started automatically to support HTTP based bindings
+host-webapp                  - Allows Tuscany to be embedded in a WAR
+implementation-java          - The in-memory model <SPAN class="code-keyword">for</SPAN> implementation.java
+implementation-java-runtime  - The runtime artifacts <SPAN class="code-keyword">for</SPAN> implementation.java
+</PRE>
+</DIV></DIV>
+
+<P>The rest of the modules are optional and can be omitted. In practice the easiest way to get started is to keep all of the modules. By default this is what you get when you install the binding distribution. In the future you're free to remove the extensions you don't use to reduce the size of the installation. The Tuscany project may even make releases in the future that package sets of extensions targeted at particular types of application. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-TuscanySCAAPI"></A>Tuscany SCA API</H2>
+
+<P>The Tuscany SCA API is used by SCA applications to access various information from the runtime. It's not mandatory to use the API but it can be useful in some circumstances. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+launcher  
+  Tuscany API                          
+node-api   
+  Tuscany API             
+node-launcher           
+  Tuscany API
+node-launcher-equinox   
+  Tuscany API 
+sca-api    
+  OASIS API             
+sca-client-impl        
+  OASIS API
+</PRE>
+</DIV></DIV>
+
+<H2><A name="SCAJavaRuntimeOverview-TuscanySPI"></A>Tuscany SPI</H2>
+
+<P>The Tuscany SPI is generally used for building extensions. Extensions come in two flavours SCA extensions, like implementation and binding types, and Tuscany runtime extensions, like builders and binders. Both of these types of extension are discussed a little later in this article. The modules and module packages that describe the Tuscany SPI are as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+assembly    
+  org.apache.tuscany.sca.assembly
+  org.apache.tuscany.sca.definitions
+  org.apache.tuscany.sca.interfacedef
+  org.apache.tuscany.sca.policy
+assembly-xsd            
+  sca-core-1.1.xsd
+  sca-policy-1.1.xsd
+contribution        
+  org.apache.tuscany.sca.contribution
+  org.apache.tuscany.sca.contribution.java
+  org.apache.tuscany.sca.contribution.namespace
+  org.apache.tuscany.sca.contribution.processor
+  org.apache.tuscany.sca.contribution.resolver
+  org.apache.tuscany.sca.contribution.scanner
+core        
+  org.apache.tuscany.sca.core.assembly    
+  org.apache.tuscany.sca.core.context
+  org.apache.tuscany.sca.core.factory
+  org.apache.tuscany.sca.core.invocation
+  org.apache.tuscany.sca.core.scope
+core-databinding   
+  org.apache.tuscany.sca.core.databinding.processor
+core-spi (why not extension SPI?)
+  org.apache.tuscany.sca.context
+  org.apache.tuscany.sca.invocation
+  org.apache.tuscany.sca.provider
+  org.apache.tuscany.sca.runtime
+  org.apache.tuscany.sca.work
+databinding             
+  org.apache.tuscany.sca.databinding
+  org.apache.tuscany.sca.databinding.annotation
+  org.apache.tuscany.sca.databinding.javabeans
+  org.apache.tuscany.sca.databinding.util
+  org.apache.tuscany.sca.databinding.xml
+deployment            
+  org.apache.tuscany.sca.deployment
+extensibility  
+  org.apache.tuscany.sca.core
+  org.apache.tuscany.sca.extensibility            
+monitor   
+  org.apache.tuscany.sca.monitor              
+xsd                    
+  org.apache.tuscany.sca.xsd
+</PRE>
+</DIV></DIV>
+
+<P>More detail on extension points and SPIs can be found <A href="tuscany-2x-extensibility-and-spis.html" title="Tuscany 2.x Extensibility and SPIs">here </A></P>
+
+<H2><A name="SCAJavaRuntimeOverview-TuscanyRuntimeExtensibilityandExtensions"></A>Tuscany Runtime Extensibility and Extensions</H2>
+
+<P>As we've already mentioned the Tuscany core doesn't do much on it's own apart from providing basic features and support the plugging in of extensions which do the real work. Extensions come in two forms. Extension types defined by the OASIS SCA specifications and those that are particular to Tuscany. In the first category are the extension types defined by the OASIS Assembly specification:</P>
+
+<UL class="alternate" type="square">
+	<LI>interface</LI>
+	<LI>implementation</LI>
+	<LI>binding</LI>
+	<LI>import</LI>
+	<LI>export</LI>
+</UL>
+
+
+<P>The Tuscany runtime defines it's own extension types which exploit the core runtimes extensibility features</P>
+
+<UL class="alternate" type="square">
+	<LI>policy</LI>
+	<LI>databinding</LI>
+	<LI>contribution</LI>
+	<LI>host</LI>
+</UL>
+
+
+<P>The Tuscany extensibility framework is based on two simple ideas. Firstly that the Tuscany runtime provides extension points into which extension functions can be plugged. Secondly that the the Java META-INF/services mechanism provides a way for extension developers to register new extension functions with these extension points. </P>
+
+<P>The Tuscany extensibility framework exposes quite a few extension points, for example,(o.a.t.s = org.apache.tuscany) </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
+  org.apache.tuscany.sca.assembly.builder.BindingBuilder
+  org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+  org.apache.tuscany.sca.assembly.builder.ContractBuilder
+  org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+
+org.apache.tuscany.sca.core.FactoryExtensionPoint
+  org.apache.tuscany.sca.assembly.AssemblyFactory
+  org.apache.tuscany.sca.assembly.SCABindingFactory
+  org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+  org.apache.tuscany.sca.binding.comet.CometBindingFactory
+  org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+  org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+  org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+  org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
+  org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+  org.apache.tuscany.sca.binding.<SPAN class="code-keyword">rest</SPAN>.operationselector.jaxrs.JAXRSOperationSelectorFactory
+  org.apache.tuscany.sca.binding.<SPAN class="code-keyword">rest</SPAN>.operationselector.rpc.RPCOperationSelectorFactory
+  org.apache.tuscany.sca.binding.<SPAN class="code-keyword">rest</SPAN>.RESTBindingFactory
+  org.apache.tuscany.sca.binding.<SPAN class="code-keyword">rest</SPAN>.wireformat.json.JSONWireFormatFactory
+  org.apache.tuscany.sca.binding.<SPAN class="code-keyword">rest</SPAN>.wireformat.xml.XMLWireFormatFactory
+  org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
+  org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+  org.apache.tuscany.sca.contribution.ContributionFactory
+  org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+  org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+  org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
+  org.apache.tuscany.sca.definitions.DefinitionsFactory
+  org.apache.tuscany.sca.implementation.bpel.BPELFactory
+  org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+    org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
+    org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+  org.apache.tuscany.sca.implementation.jaxrs.JAXRSImplementationFactory
+  org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
+  org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+  org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+  org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+  org.apache.tuscany.sca.invocation.MessageFactory
+  org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
+  org.apache.tuscany.sca.policy.PolicyFactory
+
+org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+  org.apache.tuscany.sca.context.ComponentContextFactory
+  org.apache.tuscany.sca.context.PropertyValueFactory
+  org.apache.tuscany.sca.context.RequestContextFactory
+
+org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+  org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+
+org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+  org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
+
+org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+  org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+
+org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+  org.apache.tuscany.sca.contribution.processor.ValidationSchema
+
+org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+  org.apache.tuscany.sca.contribution.resolver.ModelResolver
+
+org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+
+org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+
+org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+  org.apache.tuscany.sca.core.ModuleActivator
+
+org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+  org.apache.tuscany.sca.databinding.DataBinding
+
+org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+
+org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+  org.apache.tuscany.sca.databinding.PullTransformer
+  org.apache.tuscany.sca.databinding.PushTransformer
+
+org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
+  org.apache.tuscany.sca.definitions.xml.Definitions
+
+org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+
+org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+  org.apache.tuscany.sca.host.http.ServletHost
+
+org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+
+org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+  org.apache.tuscany.sca.provider.BindingProviderFactory
+  org.apache.tuscany.sca.provider.ImplementationProviderFactory
+  org.apache.tuscany.sca.provider.PolicyProviderFactory
+  org.apache.tuscany.sca.provider.WireFormatProviderFactory
+  org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+
+org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
+  org.apache.tuscany.sca.runtime.DomainRegistryFactory
+
+org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+  org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+
+org.apache.tuscany.sca.core.UtilityExtensionPoint
+  org.apache.tuscany.sca.databinding.Mediator
+  org.apache.tuscany.sca.databinding.SimpleTypeMapper
+  org.apache.tuscany.sca.core.scope.ScopeRegistry
+  org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
+  org.apache.tuscany.sca.deployment.Deployer
+  org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
+  org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+  org.apache.tuscany.sca.monitor.MonitorFactory
+  org.apache.tuscany.sca.runtime.CompositeActivator
+  org.apache.tuscany.sca.runtime.EndpointReferenceBinder
+  org.apache.tuscany.sca.runtime.EndpointSerializer
+  org.apache.tuscany.sca.runtime.RuntimeProperties
+  org.apache.tuscany.sca.work.WorkScheduler
+
+org.apache.tuscany.sca.node.NodeFactory
+org.apache.tuscany.sca.xsd.XSDFactory
+</PRE>
+</DIV></DIV>
+
+<P>Extension points are usually used in groups. You have to populate the right extension points when implementing say an implementation or a binding extensions. The best way to get a grip on how this works is to look at existing extensions and see what they do. As an example, if you look at how the implementation.java extension registers an extension to read the &lt;implemenation.java/&gt; element from a composite file and turn it into an in-memory Java model you will see the following file:</P>
+
+<P>modules/implementation-java/src/main/resources/META-INF/services/o.a.t.s.contribution.processor.StAXArtifactProcessor</P>
+
+<P>Which contains a single line as follows:</P>
+
+<P>org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=<A href="http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation" class="external-link" rel="nofollow">http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation</A></P>
+
+<P>This tells the Tuscany runtime to register and extension in the StAXArtifactProcessorExtensionPoint with the follwing properties:</P>
+
+<UL class="alternate" type="square">
+	<LI>org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor
+	<UL class="alternate" type="square">
+		<LI>The name of the process that turns the XML &lt;implementation.java&gt; element into a Java model</LI>
+	</UL>
+	</LI>
+	<LI>qname=<A href="http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java" class="external-link" rel="nofollow">http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java</A>
+	<UL class="alternate" type="square">
+		<LI>The QName of the &lt;implementation.java/&gt; element to look for in incoming composite files</LI>
+	</UL>
+	</LI>
+	<LI>model=org.apache.tuscany.sca.implementation.java.JavaImplementation
+	<UL class="alternate" type="square">
+		<LI>The name of the Java model interface that will be used to represent the XML element in-memory.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>The full set of extension points required to represent the implementation.java extension is spread across the implemenation-java and implementation-java-runtime modules as follows:</P>
+
+<P>implementation-java</P>
+
+<UL class="alternate" type="square">
+	<LI>resources/META-INF/services/
+	<UL class="alternate" type="square">
+		<LI>o.a.t.s.contribution.processor.StAXArtifactProcessor    - Converts &lt;implementation.java/&gt; to/from JavaImplementation model</LI>
+		<LI>o.a.t.s.implementation.java.JavaImplementationFactory   - Creates JavaImplementation model objects</LI>
+		<LI>o.a.t.s.implementation.java.introspect.JavaClassVisitor - Registers visitors used to introspect Java classes</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>implementation-java-runtime</P>
+
+<UL class="alternate" type="square">
+	<LI>resources/META-INF/services/
+	<UL class="alternate" type="square">
+		<LI>o.a.t.s.context.PropertyValueFactory                    - ???</LI>
+		<LI>o.a.t.s.definitions.xml.Definitions                     - Registers a definitions.xml file for implementation.java</LI>
+		<LI>o.a.t.s.provider.ImplementationProviderFactory          - Creates a runtime provider for implementation.java</LI>
+		<LI>o.a.t.s.runtime.RuntimeWireProcessor                    - Registers a processor for endpoint and endpoint reference interceptor chains</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>All of these extension point entries come together at runtime to allow Tuscany to process implementation.java elements that appear in composite files. </P>
+
+<P>Most extension are packaged in a least two modules. For example the implementation.java extension is provided in the following modules:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+modules/implementation-java            - the implementation.java model classes and XML processor
+modules/implementation-java-runtime    - the runtime artifacts such as the runtime providers 
+</PRE>
+</DIV></DIV>
+
+<P>You will currently see extension that don't match this pattern. Often this is because the extension has been moved into 2.x from 1.x but has not been tidied up yet. </P>
+
+<P>More detail on extension points and SPIs can be found <A href="tuscany-2x-extensibility-and-spis.html" title="Tuscany 2.x Extensibility and SPIs">here </A></P>
+
+<H2><A name="SCAJavaRuntimeOverview-Runtimehostingandcontainers%2COSGi%2CJSE%2CWebappsetc."></A>Runtime hosting and containers, OSGi, JSE, Webapps etc.</H2>
+
+<P>The Tuscany runtime will work in the JSE environment and when deployed to an OSGi runtime like Felix or Equinox. Since 1.x we have been through an exercise of refactoring all of the runtime modules into OSGi bundles and providing consistent OSGi manifest files. See (<A href="http://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/OSGi%20Enablement%20for%20Tuscany%20Runtime" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/OSGi+Enablement+for+Tuscany+Runtime</A>) for more details on how we OSGi-igfied the Tuscany runtime. </P>
+
+<P>A launcher is provided to each environment. For JSE use the following class from modules/node-launcher:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.node.launcher.NodeLauncher
+</PRE>
+</DIV></DIV>
+
+<P>For in OSGi in the Equinoz framework use the following class from modules/node-launcher-equinox:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher
+</PRE>
+</DIV></DIV>
+
+<P>In both cases you use the launcher to create a node instance as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Node node = launcher.createNode(<SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;contrib1&quot;</SPAN>, <SPAN class="code-quote">&quot;./contrib1.jar&quot;</SPAN>),                    
+                                <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;contrib2&quot;</SPAN>, <SPAN class="code-quote">&quot;./contrib2.jar&quot;</SPAN>));
+node.start();
+</PRE>
+</DIV></DIV>
+
+<P>When you use the JSE launcher the runtime starts and creates a classpath to load the Tuscany runtime. It uses the following algorithm (coded in the NodeLauncherUtil.runtimeClassloader method) to create the classpath:</P>
+
+<UL class="alternate" type="square">
+	<LI>Check to see if the runtime has been added to the current classpath already. If it has don't do anything more</LI>
+	<LI>Determine where the launcher class was loaded from and load all the Tuscany classes from that location</LI>
+	<LI>Look for an environment variable called TUSCANY_HOME which should point to a distribution. Load jars from there and from lib and modules sub directories</LI>
+	<LI>Look for an environment variable called TUSCANY_PATCH which contains a list of Jars to load?</LI>
+</UL>
+
+
+<P>When you use the OSGI launcher the algorithm is similar but of course this time the Tuscany bundles are loaded into the OSGi framework. The node launcher starts up the Equinox framework and then goes looking for bundles to load using the following algorithm:</P>
+
+<UL class="alternate" type="square">
+	<LI>TBD</LI>
+</UL>
+
+
+<P>There is no single classpath that gives access to the Tuscany runtime. </P>
+
+<P>TODO what features of the OSGi integration do we need to cover in this overview?<BR>
+(In the OSGi runtime special processing is applied to collect together all the META-INF/services information so that it is all accessible without having to delve inside each bundle. See the runtime enviroments section for more information)</P>
+
+<P>You can of course use the launchers from the command line in various guises. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+TBD
+</PRE>
+</DIV></DIV>
+
+<P>TODO - what other ways are we actually going to support for starting the runtime?</P>
+
+
+<H1><A name="SCAJavaRuntimeOverview-SCADomainandNodes"></A>SCA Domain and Nodes</H1>
+
+<P>The design for the 2.x SCA domain is based on a registry that is accessible from all nodes that are running composites in the domain. There is also the intention to add a management mechanism to allow for central control of the nodes. This is not in place yet. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-domain-overview.png" style="border: 0px solid black"></SPAN></P>
+
+<P>It is out intention to bring the Domain Manager function over from the 1.x code base to provide a central place for adding contributions and assigning them to nodes. This time though it won't be mandatory to run a Domain Manager to have nodes run a distributed SCA application. If you are happy to configure nodes directly and start them individually you are able to do that. The domain manager will just be one of a number of applications that can sit on top of and exploit the distributed registry. </P>
+
+<P>The registry holds information that is common across the domain including:</P>
+
+<UL class="alternate" type="square">
+	<LI>available endpoints (the result of specifying a binding on a component services)</LI>
+	<LI>policy model</LI>
+	<LI>extension type model</LI>
+</UL>
+
+
+<P>The following diagram shows an example of domain data populating the registry and two nodes, in separate JVMs, running separate composites from the SCA application</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-domain-registry.png" style="border: 0px solid black"></SPAN></P>
+
+<P>With no domain manager each node is started with a set of contributions. A node reads the contributions and processes deployed composites ready to run. As part of this processing domain level information, such as deployed endpoints and available policies, is published to the registry for other nodes to find. When domain level information is required by a node, for example, when a component reference targets a service running on a different node in the domain, the information can be obtained by looking in the registry. </P>
+
+<P>If a domain manager is present it can pre-process all available contributions and pre-populate the registry as required. This is however not mandatory. </P>
+
+<H1><A name="SCAJavaRuntimeOverview-RuntimeLifecycle"></A>Runtime Lifecycle</H1>
+<H2><A name="SCAJavaRuntimeOverview-Create"></A>Create</H2>
+<P>Runtime creation is contrilled by the environment in which the runtime is being started. For example, if you are running Tuscany from the runtime then using the node launcher will start the runtime. Alternatively if you are deploying Tuscany embedded in a web app then the runtime will not be started until the WAR file is deployed. See the previous hosting section for more details. </P>
+<H2><A name="SCAJavaRuntimeOverview-Read"></A>Read</H2>
+<P>When a node is started and configured with the location of a contribution, for example, </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Node node = launcher.createNode(<SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;contrib1&quot;</SPAN>, <SPAN class="code-quote">&quot;./contrib1.jar&quot;</SPAN>),                    
+                                <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;contrib2&quot;</SPAN>, <SPAN class="code-quote">&quot;./contrib2.jar&quot;</SPAN>));
+</PRE>
+</DIV></DIV>
+
+<P>the node will look at each contribution and identify all of the aritifacts that it holds. Artifacts can be anything from XML, XSD, WSDL and Java .class files to the SCA .composite files. Once the node knows what artifacts are available in all of its input contributions it will read the composite files. It does this using the extension processors that are provided with each extension. The output of reading the composite file is an in-memory model of the SCA application. This model is used to configured the runtime in later phases. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-Resolve"></A>Resolve</H2>
+
+<P>The in-memory model that results from the read phase will contain a lot of unresolved references. For example, for a component that uses </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;implementation.java class=<SPAN class="code-quote">&quot;my.<SPAN class="code-keyword">package</SPAN>.MyClassImpl&quot;</SPAN>/&gt;
+</PRE>
+</DIV></DIV>
+<P>The model knows the name of the class file that will be used to implement the component but it doesn't actually have a reference to that real Java class. These references are resolved in the resolve phase. Again the extension processors are used and this time their resolve method looks through the available contributions, using the import/export relationships, to locate referenced artifacts. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-Build"></A>Build</H2>
+
+<P>Once we get to this stage we have an in-memory model that faithfully matches what was present in the .composite files that are deployed to the node. We now need to build the model to prepare it read for creating the runtime artifacts. There are a number of things that we need to do an primarily the process involves applying the SCA rules to calculate a complete model of the application based on the input composite files. The input composite files don't necessarily contain all of the right details in the right places, for example, imagine a Java component implementation as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Service(MyClass.class)
+class MyClassImpl <SPAN class="code-keyword">implements</SPAN> MyClass {
+  @Reference
+  <SPAN class="code-keyword">protected</SPAN> MyOtherClass myOtherClassReference;
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> doSomething(<SPAN class="code-object">String</SPAN> input){
+     <SPAN class="code-keyword">return</SPAN> myOtherClassReference.doSomething(input);
+  }
+}
+</PRE>
+</DIV></DIV>
+
+<P>We can define an SCA component as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;MyComponent&quot;</SPAN>&gt;
+    &lt;implementation.java class=<SPAN class="code-quote">&quot;my.<SPAN class="code-keyword">package</SPAN>.MyClassImpl&quot;</SPAN>/&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>We haven't said that this component defines any services or references but based on the component type implied by the MyClassImpl class we know that it really as a service called &quot;MyClass&quot; and a reference called &quot;myOtherClassReference&quot;. </P>
+
+<H4><A name="SCAJavaRuntimeOverview-Thebuildprocess"></A>The build process</H4>
+<P>The build process applies these kinds of rules and enhances the in-memory model with all of the implied information. </P>
+
+<P>The following diagram shows the basic process and the steps that form the process. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-builders.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The steps are as follows:</P>
+
+<OL>
+	<LI>Flatten includes - this copies all information from an included composite into the including composite.</LI>
+	<LI>Attach policies - policies that specify external attachment are applied to the model here</LI>
+	<LI>Calculate composite component types - the use of implementation.composite implies a hierarchical organization of composite and the components that use them as implementations. This step calculates the component type for a composite recursively so that the configuration of the component that the composite implements can be configured correctly</LI>
+	<LI>Binding specific building - Sometimes bindings have specific processing to do, for example, the web services binding created WSDL at this stage.</LI>
+	<LI>Construct endpoints - endpoints represent the service endpoints that components expose. They are the runtime representation of the service binding configuration.</LI>
+	<LI>Construct endpoint references - endpoint references represent the references that components expose. They are the runtime representation of the reference binding configuration.</LI>
+	<LI>Compute policy - all of the intents and policy sets should be applied in their correct locations by this stage. This processing computes the policy sets that actually applies and performs policy specific processing</LI>
+</OL>
+
+
+<P>The endpoints and endpoint references provide the runtime connection between the component implementations and the bindings protocols used when communicating with other components. The hold all of the message handling chains in the runtime. </P>
+
+<H4><A name="SCAJavaRuntimeOverview-EndpointsandEndpointReferences"></A>Endpoints and Endpoint References</H4>
+<P>The following diagram shows how enpoints and enpoint references relate to the model of the more recognizable component references and services. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-endpoint-structure.png" style="border: 0px solid black"></SPAN></P>
+
+<P>And endpoint maps to a service binding and an endpoint reference maps to a reference target (or a configured reference binding if one is present instead of a target).You will note that endpoints and endpoint references are used to represent callbacks too. An service that specifies a callback gives rise to one or more callback endpoint references. These sit behind the callback proxy at runtime. An endpoint reference that specifies a callback gives rise to a callback endpoint. This endpoint receives callback messages. </P>
+
+<P>Looking in more detail you can see that both endpoints and endpoint references hold the interceptor chains that proces references side (endpoint reference) and service side (endpoint) messages. At the end of the interceptor chain endpoint information is placed into the protocol message. The following diagram shows how the web service binding uses endpoint information in forward and callback messages. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-endpoint-callback.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The twist here is that while a forward Tuscany message has a from field that points to the source endpoint reference when this gets turned into a SOAP envelope the from field represents the callback endpoint if there is one. </P>
+
+<H4><A name="SCAJavaRuntimeOverview-Buildingendpointsandendpointreferences"></A>Building endpoints and endpoint references</H4>
+
+<P>The following diagram shows how endpoints and endpoint references are created and used at a very high level. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-endpoint-build.png" style="border: 0px solid black"></SPAN></P>
+
+<OL>
+	<LI>First endoints and endpoint references are created during the build phase. An endpoint is created for every service binding. Endpoint references are created for every reference target or configured binding. Reference targets are either explicit specified through the reference or the binding uri or are implicitly specified through the use of autowire. If the endpoint to which an endpoint reference is available locally at this point the the two are linked (or bound) together at this point. If the node is running in a distributed domain, endpoint references can be created at this point where the target endpoint is not bound because it's not running in the same node. These endpoint references will be boundat runtime when the first messages passes through the endpoint reference</LI>
+	<LI>Second, during the activation phase, all endpoints are added to the endpoint registry. In this way any node that has access to the endpoint registry can see the details of these endpoints</LI>
+	<LI>Lastly, on first use, endpoint references that remain unbound are bound using a pluggable binding algorithm which will usually involve looking up and endpoint in the registry.</LI>
+</OL>
+
+
+<H2><A name="SCAJavaRuntimeOverview-Activate"></A>Activate</H2>
+
+<P>At the activate stage the various extension providers are created as required. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-Start"></A>Start</H2>
+
+<P>During start the &quot;start&quot; operation is called on all active providers in order to perform any extension specific start processing. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-MessageProcessing"></A>Message Processing</H2>
+
+<H3><A name="SCAJavaRuntimeOverview-Referencesideoperationandbindingchains"></A>Reference side operation and binding chains</H3>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-reference-interceptors.png" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="SCAJavaRuntimeOverview-Servicesideoperationandbindingchains"></A>Service side operation and binding chains</H3>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-service-interceptors.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="SCAJavaRuntimeOverview-Stop"></A>Stop</H2>
+
+<P>During stop the &quot;stop&quot; operation is called on all started providers in order to perform any extension specific stop processing. </P>
+
+<H2><A name="SCAJavaRuntimeOverview-Deactivate"></A>Deactivate</H2>
+
+<P>During the deactivate stage the various parts of the runtime model are picked apart to allow for successful garbage collection.</P>
+
+<H1><A name="SCAJavaRuntimeOverview-Interfaces"></A>Interfaces </H1>
+
+<H2><A name="SCAJavaRuntimeOverview-Mappinginterfacestotheruntimemodel"></A>Mapping interfaces to the runtime model </H2>
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-interface-contracts.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="SCAJavaRuntimeOverview-Referencesideruntimeinterfacedrivendatabindingprocessing"></A>Reference side runtime interface driven databinding processing</H2>
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-reference-databinding.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="SCAJavaRuntimeOverview-Servicesideruntimeinterfacedrivendatabindingprocessing"></A>Service side runtime interface driven databinding processing</H2>
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-runtime-overview.data/tuscany-service-databinding.png" style="border: 0px solid black"></SPAN></P>
+
+
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="tuscany-2x-extensibility-and-spis.html" title="Tuscany 2.x Extensibility and SPIs">Tuscany 2.x Extensibility and SPIs</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="serialization-deserialization-of-endpoints-and-endpointreferences.html" title="Serialization Deserialization of Endpoints and EndpointReferences">Serialization Deserialization of Endpoints and EndpointReferences</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                          <A href="classloading.html" title="Classloading">Classloading</A>
+              <SPAN class="smalltext">(Apache Tuscany Docs 2.x)</SPAN>
+              <BR>
+                      </DIV>
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : SCA Java Runtime Overview';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/sca-overview.html b/site/trunk/site-publish/documentation-2x/sca-overview.html
new file mode 100644
index 0000000000..9dee1f9800
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/sca-overview.html
@@ -0,0 +1,221 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SCA Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Overview">SCA Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=109106">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109106">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 03, 2009
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <UL>
+	<LI><A href="#SCAOverview-whatisSCA" title="what is SCA on SCA Overview">What is SCA?</A></LI>
+	<LI><A href="#SCAOverview-scacomponent" title="sca component on SCA Overview">SCA Component</A></LI>
+	<LI><A href="#SCAOverview-scawire" title="sca wire on SCA Overview">SCA Wire</A></LI>
+	<LI><A href="#SCAOverview-scacomposite" title="sca composite on SCA Overview">SCA Composite</A></LI>
+	<LI><A href="#SCAOverview-scacontribution" title="sca contribution on SCA Overview">SCA Contribution</A></LI>
+	<LI><A href="#SCAOverview-scadomain" title="sca domain on SCA Overview">SCA Domain</A></LI>
+	<LI><A href="#SCAOverview-scabinding" title="sca binding on SCA Overview">SCA Binding</A></LI>
+	<LI><A href="#SCAOverview-scapolicy" title="sca policy on SCA Overview">SCA Policy</A></LI>
+</UL>
+
+
+<H2><A name="SCAOverview-WhatisSCA%3F"></A><A name="SCAOverview-whatisSCA"></A>What is SCA?</H2>
+<P>SCA is a standard programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Now let's talk about SCA building blocks and concepts.</P>
+
+<H2><A name="SCAOverview-SCAComponent"></A><A name="SCAOverview-scacomponent"></A>SCA Component</H2>
+
+<P>The basic building block for SCA is a component. It is the abstraction of a given business function. A component is described with the following attributes:</P>
+
+<UL>
+	<LI><B>Service:</B> Describes the functions that this type of component provides. A component can offer one ore more services. A service is an interface.</LI>
+	<LI><B>Reference:</B> This describes the dependencies this type of component has in order to function. A reference is an interface.</LI>
+	<LI><B>Property:</B> This defines configuration parameters that can controls how the business function can behave. For example, what currency to use for an account component.</LI>
+	<LI><B>Intent policies:</B> This describes assumptions on how the component will behave. There are two types of policies.
+	<UL>
+		<LI>Implementation policy- Impact the behavior of an implementation. For example, transaction, monitor and logging</LI>
+		<LI>Interaction policy - defines how the components behave with one another. For example, security.</LI>
+	</UL>
+	</LI>
+	<LI><B>Implementation:</B>  Every component has some implementation associated with it. This can be a new business logic or an existing one that is now being used in the assembly.  A business logic can handle different operations and some of which are exposed externally as callable services.  Component implementation can be in any technology, for example for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.</LI>
+</UL>
+
+
+<P>This is demonstrated below.<BR>
+<SPAN class="error">Unable to render embedded object: File (component.png) not found.</SPAN></P>
+
+<P>The implementation of a component can be in any language that is suitable for the user, for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.  </P>
+
+<H2><A name="SCAOverview-SCAWire"></A><A name="SCAOverview-scawire"></A>SCA Wire</H2>
+
+<P>As mentioned above, an SCA component may have zero or more references. Refrences in SCA define how SCA components invoke services. The relationship between a reference and a service is typically demonstrated through a line in a SCA diagrams and is referred to as a wire. </P>
+
+<P>The term wire can at the begining seem confusing because you may ask how a wire is realized. There is no physical definition for a wire, it is really derived from the relationship between a Service and its refrence(s) at runtime. This is realized through dependency injection in Tuscany. </P>
+
+
+<H2><A name="SCAOverview-SCAComposite"></A><A name="SCAOverview-scacomposite"></A>SCA Composite</H2>
+
+<P>An SCA composite consists of components, services, references, and wires that connect them. A composite is the unit of deployment for SCA.<BR>
+A composite can be viewed as a component whose implementation is not code but an aggregation of one or more components co-operating to provide higher level services. Think of composite as a solution, for example a credit check composite may consist of multiple components that together perform the credit checking work. A composite can also be used within a larger solution, for example credit check can be part of a order processing composite. A composite has the same charactersitics as a component. It provides Services, has References to other dependencies, and can be configured using Properties and can have intent policies in just the same way as an individual components can. In thise case, attributes of some of the components that are embedded in the composite get 'promoted' and becom the attribute of the composite. In the example below, you see a calculator composite which consists of 5 components, a calculator service has references to four components:Add, Subtract, Multiply and Divide.</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (calc.jpg) not found.</SPAN><BR>
+<IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The assembly or wiring is defined in .composite file through Service Component Definition Language (SCDL) that is in XML. For example, calculator.composite would define that calculator component references the other four components.</P>
+
+<H2><A name="SCAOverview-SCAContribution"></A><A name="SCAOverview-scacontribution"></A>SCA Contribution</H2>
+
+<P>The artifacts that make up a solution get packaged into what is called a contribution. A contribution can take a number of different forms.  For example, it could be a jar file, or it could be a directory tree on the file system. A contribution can contain composites, java classes, BPEL processes, XSD files, wsdl files, etc. An SCA application can be divided into multiple contributions with dependencies between them. In general, some services depend closely on other services and it makes sense to package them together.  If services are more independent it is best to package them separately so that they can be reused in different contexts. A contribution is a deployable unit. A solution may require multiple contributions that share artifacts and artifacts can be shared between (imported) between contributions.</P>
+
+<H2><A name="SCAOverview-SCADomain"></A><A name="SCAOverview-scadomain"></A>SCA Domain</H2>
+
+<P>Contribution packages get contributed to what is called SCA domain which is the scope of adminstration at runtime. An SCA Domain represents a complete runtime configuration, potentially distributed over a series of interconnected runtime nodes and is a logical view of the running applications or a coherent grouping of components that are working together. An SCA Domain typically represents an area of business functionality controlled by a single organization. For example, an SCA Domain may be the whole of a business, or it may be a department within a business.</P>
+
+<P>Therefore, an SCA domain consists of the definitions of composites, components, their implementations, <B>and the nodes</B> on which they run. Components deployed into a domain can directly wire to other components within the same domain. Communication with services outside of a domain is done through bindings. </P>
+
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services. However, during development one is not concerned with all this. The code is packaged and made available for deployment. Tuscany SCA Java supports contributions in the form of JAR or filesystem. </P>
+
+<P>Below is an example of domain with two contributions.<BR>
+<SPAN class="error">Unable to render embedded object: File (domain.jpg) not found.</SPAN></P>
+
+<H2><A name="SCAOverview-SCABinding"></A><A name="SCAOverview-scabinding"></A>SCA Binding</H2>
+<P>A binding is used as a means of communication between services and handles the protocols. It defines with what communication method a service can be accessed with or with what communication method it can will access other services.  There can be different types of bindings depending on technologies used to develop a solution. For example JMS binding, Webservices binding, Atom binding for web20 interaction, etc. </P>
+
+<P>Services can be configured with different bindings and there can be multiple bindings for a service.  Bindings for the services and references get defined declaratively in the .composite file. There is a default binding called binding.sca which when used leaves the choice of binding to the underlying infrastructure by default.</P>
+
+<P>The declarative bindings and the abstraction of protocols from business logic brings agility to SCA applications. This allows SCA applications to be purely focused on business logic and not be contaminated with protocol handling information. It also enables the SCA compositions to grow or change without code modification while also working with applications that are not enabled with SCA.</P>
+
+
+<H2><A name="SCAOverview-SCAPolicy"></A><A name="SCAOverview-scapolciy"></A>SCA Policy</H2>
+<P>An enterprise application requires control beyond the business functional capability which can include how security is handled in the enterprise or what transactional capability should be applied to services that are offered. SCA policies define the constraints or capabilities that get applied to services and their interaction. Two types of policies are defined in SCA.</P>
+<UL>
+	<LI>Interaction Policies - Define the policies that influence interaction of services for example whether authentication is required or not.</LI>
+	<LI>Implementation Policies - Define how the components behave at runtime for example whether it is transactional or not.</LI>
+</UL>
+
+
+<P>SCA mechanisms for defining policies such as intents and policySets can only be used in the context of a single domain. The fact that policies can be defined declaratively make applications adaptive to the environment that they get deployed into or to changes in the business requirements. <BR>
+For more information about policy check out the <SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf" title="Visit page outside Confluence" rel="nofollow">sca policy framework specification<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>version=1]</P>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg
new file mode 100644
index 0000000000..86f71af57d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg.jpeg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg.jpeg
new file mode 100644
index 0000000000..24f6df7f3f
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized Endpoint.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg
new file mode 100644
index 0000000000..1f589f5eda
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg.jpeg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg.jpeg
new file mode 100644
index 0000000000..dcd0fed30a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized EndpointReference.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg
new file mode 100644
index 0000000000..6a11db3be1
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg.jpeg b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg.jpeg
new file mode 100644
index 0000000000..319f579a11
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint and EndpointReference serialization.jpg.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.html b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.html
new file mode 100644
index 0000000000..090601fd0d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/serialization-deserialization-of-endpoints-and-endpointreferences.html
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Serialization Deserialization of Endpoints and EndpointReferences : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Serialization Deserialization of Endpoints and EndpointReferences">Serialization Deserialization of Endpoints and EndpointReferences</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Serialization Deserialization of Endpoints and EndpointReferences">Serialization Deserialization of Endpoints and EndpointReferences</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Serialization Deserialization of Endpoints and EndpointReferences</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=9012176">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=9012176">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=9012176">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=9012176">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=9012176">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=9012176">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SerializationDeserializationofEndpointsandEndpointReferences-SerializationDeserializationofEndpointsandEndpointReferences"></A>Serialization Deserialization of Endpoints and EndpointReferences</H1>
+<H2><A name="SerializationDeserializationofEndpointsandEndpointReferences-Asamplescenario"></A>A sample scenario</H2>
+<P><SPAN class="image-wrap" style=""><IMG src="serialization-deserialization-of-endpoints-and-endpointreferences.data/Endpoint%20and%20EndpointReference%20serialization.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Assuming we have two nodes (Node1, Node2) within an SCA domain. Node1 runs component1 which is wired to component2 on Node2. </P>
+
+<UL>
+	<LI>Propagate the endpoint descriptions via the domain registry
+	<UL>
+		<LI>Serialize the endpoints of component2 at Node2</LI>
+		<LI>Deserialize the endpoints at Node1</LI>
+		<LI>Bind the endpoint reference of component1 to the remote endpoints of component2</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Pass the ServiceReference from component1 to component2 via business methods
+	<UL>
+		<LI>Serialize the endpoint reference (for example, a reference to component3) known to component1 at Node1</LI>
+		<LI>Deserialize the endpoint reference at Node2</LI>
+		<LI>Bind the endpoint reference to the context of Node2/Component2</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class Component1Impl {
+  @Reference
+  ServiceReference&lt;Component3&gt; component3;
+
+  @Reference 
+  Component2 component2;
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> op1(...) {
+    <SPAN class="code-comment">// Pass a ServiceReference of component3 to component2
+</SPAN>    component2.op2(component3, ...);
+  }
+}
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class Component2Impl {
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> op2(ServiceReference&lt;Component3&gt; component3Ref, ...) {
+    ...
+    <SPAN class="code-comment">// Call component3 using the service reference
+</SPAN>    Component3 component3 = component3Ref.getService();
+    component3.op3(...);
+  }
+}
+</PRE>
+</DIV></DIV>
+
+<H2><A name="SerializationDeserializationofEndpointsandEndpointReferences-Whatinformationshouldbeserialized%3F"></A>What information should be serialized? </H2>
+
+<H3><A name="SerializationDeserializationofEndpointsandEndpointReferences-Endpointserialization"></A>Endpoint serialization </H3>
+<P>What information is needed on the consumer side?</P>
+<UL>
+	<LI>The protocol-specific endpoint address</LI>
+	<LI>The binding structural URI</LI>
+	<LI>The binding type</LI>
+	<LI>The intents and policySets</LI>
+</UL>
+
+
+<P>What information is not needed on the consumer side?</P>
+<UL>
+	<LI>The component implementation behind the endpoint</LI>
+</UL>
+
+
+<P>I'm not sure if the componentType of the owning component or interface contracts are needed. Interface validation against a remote endpoint can be one only if the interface contract for the endpoint is resolvable in the context of the consuming component. But it can be too restrictive as it breaks the promise of decoupling between the SCA reference and service.</P>
+
+<P>The current code serializes the endpoint as a composite/component/service/binding XML.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;...&quot;</SPAN> targetNamespace&gt;</SPAN>
+  <SPAN class="code-tag">&lt;component name=<SPAN class="code-quote">&quot;...&quot;</SPAN> uri=<SPAN class="code-quote">&quot;...&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;implementation.bpel process=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN> <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- This should be removed --&gt;</SPAN></SPAN>
+    <SPAN class="code-tag">&lt;service name=<SPAN class="code-quote">&quot;...&quot;</SPAN> requires=<SPAN class="code-quote">&quot;...&quot;</SPAN> policySets=<SPAN class="code-quote">&quot;...&quot;</SPAN>&gt;</SPAN>
+      <SPAN class="code-tag">&lt;interface.wsdl interface=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN> <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Is the interface needed? --&gt;</SPAN></SPAN>
+      <SPAN class="code-tag">&lt;binding.ws uri=<SPAN class="code-quote">&quot;...&quot;</SPAN>  requires=<SPAN class="code-quote">&quot;...&quot;</SPAN> policySets=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;/service&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+<SPAN class="code-tag">&lt;/composite&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SerializationDeserializationofEndpointsandEndpointReferences-Howtoresolvethedeserializedendpointinthecontextoftheconsumingcomponent%3F"></A>How to resolve the deserialized endpoint in the context of the consuming component?</H3>
+<P>We keep the XML document from the Java serialization and load the XML into a composite model to rebuild the endpoint in the context of the consuming component. The currect scheme of XML serialization probably contains too much information and some of them cannot be practically resolvable on the client side. For example, the target component implementation or interface contracts.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized%20Endpoint.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="SerializationDeserializationofEndpointsandEndpointReferences-EndpointReferenceserialization"></A>EndpointReference serialization </H3>
+<P>What information is needed on the consumer side?</P>
+<UL>
+	<LI>The binding structural URI</LI>
+	<LI>The binding type</LI>
+	<LI>The intents and policySets</LI>
+	<LI>The resolved target endpoint (including the endpoint address and/or structural URI)</LI>
+</UL>
+
+
+<P>What information is not needed on the consumer side?</P>
+<UL>
+	<LI>The component implementation behind the endpoint reference</LI>
+</UL>
+
+
+<P>I'm not sure if the componentType of the owning component or interface contracts are needed. Interface validation against a remote endpoint can be one only if the interface contract for the endpoint is resolvable in the context of the consuming component. But it can be too restrictive as it breaks the promise of decoupling between the SCA reference and service.</P>
+
+<P>The current code serializes the endpoint reference as a composite/component/reference/binding XML.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;endpointReference&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;...&quot;</SPAN>&gt;</SPAN>
+  <SPAN class="code-tag">&lt;component name=<SPAN class="code-quote">&quot;...&quot;</SPAN> uri=<SPAN class="code-quote">&quot;...&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN> <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- This should be removed --&gt;</SPAN></SPAN>
+    <SPAN class="code-tag">&lt;reference name=<SPAN class="code-quote">&quot;...&quot;</SPAN> requires=<SPAN class="code-quote">&quot;...&quot;</SPAN> policySets=<SPAN class="code-quote">&quot;...&quot;</SPAN> target=<SPAN class="code-quote">&quot;...&quot;</SPAN>&gt;</SPAN> <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- reference/@target and binding.ws/@uri are exclusive --&gt;</SPAN></SPAN>
+      <SPAN class="code-tag">&lt;interface.java interface=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN> <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Is the interface needed? --&gt;</SPAN></SPAN>
+      <SPAN class="code-tag">&lt;binding.ws uri=<SPAN class="code-quote">&quot;...&quot;</SPAN>  requires=<SPAN class="code-quote">&quot;...&quot;</SPAN> policySets=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;/reference&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+<SPAN class="code-tag">&lt;/composite&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SerializationDeserializationofEndpointsandEndpointReferences-Howtoresolvethedeserializedendpointreferenceinthecontextoftheconsumingcomponent%3F"></A>How to resolve the deserialized endpoint reference in the context of the consuming component?</H3>
+<P>We keep the XML document from the Java serialization and load the XML into a composite model to rebuild the endpoint in the context of the consuming component. The currect scheme of XML serialization probably contains too much information and some of them cannot be practically resolvable on the client side. For example, the target component implementation or interface contracts.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="serialization-deserialization-of-endpoints-and-endpointreferences.data/Deserialized%20EndpointReference.jpg" style="border: 0px solid black"></SPAN></P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Serialization Deserialization of Endpoints and EndpointReferences';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/setting-up-ssh.html b/site/trunk/site-publish/documentation-2x/setting-up-ssh.html
new file mode 100644
index 0000000000..154948bd8d
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/setting-up-ssh.html
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Setting up ssh : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Setting up ssh">Setting up ssh</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making Releases">Making Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Setting up ssh">Setting up ssh</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Setting up ssh</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791345">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791345">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791345">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791345">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791345">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=21791345">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=Menus&linkCreation=true&fromPageId=21791345" class="createlink">Menus</A></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Settingupssh-Setupmvntoworkwithyourapacheaccount"></A>Setup mvn to work with your apache account</H3>
+
+<H4><A name="Settingupssh-Generateanauthoriseddsa%2Frsakey"></A>Generate an authorised dsa/rsa key</H4>
+
+<P>Logon to <TT>minotaur.apache.org</TT> using your apache id and run:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ ssh-keygen -t dsa
+</PRE>
+</DIV></DIV>
+
+<P>Give it some file name eg <TT>mysshkey</TT> and a pass phrase. This should create two files, a private key and a public key (<TT>mysshkey</TT>, <TT>mysshkey.pub</TT>). Copy <TT>mysshkey.pub</TT> to <TT>~/.ssh/authorised_keys</TT>. (you may need to create the .ssh directory), and scp the private key to you local machine.</P>
+
+<P><B>OR</B></P>
+
+<P>Use <TT>ssh-keygen</TT> to create a SSH key locally using shell or cygwin:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ ssh-keygen -t rsa -b 4096
+</PRE>
+</DIV></DIV>
+
+<P>The keys will be saved in <TT><SUB>/.ssh/id_dsa</TT> (private) and <TT></SUB>/.ssh/id_dsa.pub</TT> (public).</P>
+
+<P><TT>scp</TT> your SSH public key <TT><SUB>/.ssh/id_dsa.pub</TT> created in last step to <TT></SUB>/id_dsa.pub</TT> on <TT>people.apache.org</TT>. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ scp ~/.ssh/id_dsa.pub &lt;your userid&gt;@people.apache.org:.
+</PRE>
+</DIV></DIV>
+
+<P>Login to people.apache.org</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ ssh &lt;your userid&gt;@people.apache.org
+</PRE>
+</DIV></DIV>
+
+<P>Create a <TT>~/.ssh</TT> folder in your home directory on <TT>people.apache.org</TT> and change its file mode to 700.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ mkdir ~/.ssh
+$ chmod 700 ~/.ssh
+</PRE>
+</DIV></DIV>
+
+<P>Move or append <TT><SUB>/id_dsa.pub</TT> to <TT></SUB>/.ssh/authorized_keys</TT> and change its file mode to 600.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+$ mv ~/id_dsa.pub ~/.ssh/authorized_keys
+$ chmod 600 ~/.ssh/authorized_keys
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Settingupssh-UpdateMavensettings"></A>Update Maven settings</H4>
+
+<P>At this point you should be able to ssh into <TT>people.apache.org</TT> without being prompted for a password.</P>
+
+<P>In your maven <TT>settings.xml</TT> file (located in the .m2 folder in your home dir, eg <TT>C:\Documents and Settings\ant\.m2</TT>) add servers for the servers you use and specify you apache id, the location of the ssh key you just scp'd and the pass phrase you used when creating that key, eg:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag">&lt;servers&gt;</SPAN>
+  <SPAN class="code-tag">&lt;server&gt;</SPAN>
+    <SPAN class="code-tag">&lt;id&gt;</SPAN>apache.incubator<SPAN class="code-tag">&lt;/id&gt;</SPAN>
+    <SPAN class="code-tag">&lt;username&gt;</SPAN>antelder<SPAN class="code-tag">&lt;/username&gt;</SPAN>
+    <SPAN class="code-tag">&lt;privateKey&gt;</SPAN>file-path-of-private-key<SPAN class="code-tag">&lt;/privateKey&gt;</SPAN>
+    <SPAN class="code-tag">&lt;passphrase&gt;</SPAN>xxx<SPAN class="code-tag">&lt;/passphrase&gt;</SPAN>
+    <SPAN class="code-tag">&lt;directoryPermissions&gt;</SPAN>775<SPAN class="code-tag">&lt;/directoryPermissions&gt;</SPAN>
+    <SPAN class="code-tag">&lt;filePermissions&gt;</SPAN>664<SPAN class="code-tag">&lt;/filePermissions&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/server&gt;</SPAN>
+  <SPAN class="code-tag">&lt;server&gt;</SPAN>
+    <SPAN class="code-tag">&lt;id&gt;</SPAN>me.people<SPAN class="code-tag">&lt;/id&gt;</SPAN>
+    <SPAN class="code-tag">&lt;username&gt;</SPAN>antelder<SPAN class="code-tag">&lt;/username&gt;</SPAN>
+    <SPAN class="code-tag">&lt;privateKey&gt;</SPAN>file-path-of-private-key<SPAN class="code-tag">&lt;/privateKey&gt;</SPAN>
+    <SPAN class="code-tag">&lt;passphrase&gt;</SPAN>xxx<SPAN class="code-tag">&lt;/passphrase&gt;</SPAN>
+    <SPAN class="code-tag">&lt;directoryPermissions&gt;</SPAN>775<SPAN class="code-tag">&lt;/directoryPermissions&gt;</SPAN>
+    <SPAN class="code-tag">&lt;filePermissions&gt;</SPAN>664<SPAN class="code-tag">&lt;/filePermissions&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/server&gt;</SPAN>
+  <SPAN class="code-tag">&lt;server&gt;</SPAN>
+    <SPAN class="code-tag">&lt;id&gt;</SPAN>apache.snapshots<SPAN class="code-tag">&lt;/id&gt;</SPAN>
+    <SPAN class="code-tag">&lt;username&gt;</SPAN>antelder<SPAN class="code-tag">&lt;/username&gt;</SPAN>
+    <SPAN class="code-tag">&lt;privateKey&gt;</SPAN>file-path-of-private-key<SPAN class="code-tag">&lt;/privateKey&gt;</SPAN>
+    <SPAN class="code-tag">&lt;passphrase&gt;</SPAN>xxx<SPAN class="code-tag">&lt;/passphrase&gt;</SPAN>
+    <SPAN class="code-tag">&lt;directoryPermissions&gt;</SPAN>775<SPAN class="code-tag">&lt;/directoryPermissions&gt;</SPAN>
+    <SPAN class="code-tag">&lt;filePermissions&gt;</SPAN>664<SPAN class="code-tag">&lt;/filePermissions&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/server&gt;</SPAN>
+  <SPAN class="code-tag">&lt;server&gt;</SPAN>
+    <SPAN class="code-tag">&lt;id&gt;</SPAN>apache.rsync<SPAN class="code-tag">&lt;/id&gt;</SPAN>
+    <SPAN class="code-tag">&lt;username&gt;</SPAN>antelder<SPAN class="code-tag">&lt;/username&gt;</SPAN>
+    <SPAN class="code-tag">&lt;privateKey&gt;</SPAN>file-path-of-private-key<SPAN class="code-tag">&lt;/privateKey&gt;</SPAN>
+    <SPAN class="code-tag">&lt;passphrase&gt;</SPAN>xxx<SPAN class="code-tag">&lt;/passphrase&gt;</SPAN>
+    <SPAN class="code-tag">&lt;directoryPermissions&gt;</SPAN>775<SPAN class="code-tag">&lt;/directoryPermissions&gt;</SPAN>
+    <SPAN class="code-tag">&lt;filePermissions&gt;</SPAN>664<SPAN class="code-tag">&lt;/filePermissions&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/server&gt;</SPAN>
+<SPAN class="code-tag">&lt;/servers&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Keep the ssh key and pass phrase safe and secure. Its a good idea to only add the key and passphrase to the settings.xml file while you're actually using it and delete form the file at other times. Also you MUST delete the private ssh key from your Apache directory once you've ftp'd it to your local machine.</P>
+
+
+</TD></TR></TBODY></TABLE>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Setting up ssh';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/treenavigation.html b/site/trunk/site-publish/documentation-2x/treenavigation.html
new file mode 100644
index 0000000000..235692eeb9
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/treenavigation.html
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>TreeNavigation : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="TreeNavigation">TreeNavigation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="TreeNavigation">TreeNavigation</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">TreeNavigation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109060">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109060">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109060">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109060">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109060">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=109060">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+              
+    
+
+<DIV class="plugin_pagetree">
+
+        
+        
+    <UL class="plugin_pagetree_children_list plugin_pagetree_children_list_noleftspace">
+        <DIV class="plugin_pagetree_children">
+        </DIV>
+    </UL>
+
+    <FIELDSET class="hidden">
+        <INPUT type="hidden" name="treeId" value="">
+        <INPUT type="hidden" name="treeRequestId" value="/confluence/plugins/pagetree/naturalchildren.action?decorator=none&excerpt=false&sort=position&reverse=false&disableLinks=false">
+        <INPUT type="hidden" name="treePageId" value="">
+
+        <INPUT type="hidden" name="noRoot" value="false">
+        <INPUT type="hidden" name="rootPageId" value="108808">
+
+        <INPUT type="hidden" name="rootPage" value="">
+        <INPUT type="hidden" name="startDepth" value="0">
+        <INPUT type="hidden" name="spaceKey" value="TUSCANYxDOCx2x">
+
+        <INPUT type="hidden" name="i18n-pagetree.loading" value="Loading...">
+        <INPUT type="hidden" name="i18n-pagetree.error.permission" value="Unable to load page tree. It seems that you do not have permission to view the root page.">
+        <INPUT type="hidden" name="i18n-pagetree.eeror.general" value="There was a problem retrieving the page tree. Please check the server log file for more information.">
+        <INPUT type="hidden" name="loginUrl" value="/confluence/login.action?os_destination=%2Fadmin%2Fautoexport%2Frebuild-start.action">
+
+                <FIELDSET class="hidden">
+                            <INPUT type="hidden" name="ancestorId" value="108808">
+                    </FIELDSET>
+    </FIELDSET>
+</DIV>
+
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : TreeNavigation';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.data/Tuscany 2.x Extensibility and SPIs.ppt b/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.data/Tuscany 2.x Extensibility and SPIs.ppt
new file mode 100644
index 0000000000..3f395de8d5
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.data/Tuscany 2.x Extensibility and SPIs.ppt
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.html b/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.html
new file mode 100644
index 0000000000..e0327332c1
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-2x-extensibility-and-spis.html
@@ -0,0 +1,1467 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Tuscany 2.x Extensibility and SPIs : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany 2.x Extensibility and SPIs">Tuscany 2.x Extensibility and SPIs</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="sca-java-runtime-overview.html" title="SCA Java Runtime Overview">SCA Java Runtime Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany 2.x Extensibility and SPIs">Tuscany 2.x Extensibility and SPIs</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany 2.x Extensibility and SPIs</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8552667">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8552667">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=8552667">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=8552667">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=8552667">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=8552667">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P><A name="Tuscany2.xExtensibilityandSPIs-spis"></A></P>
+
+<H1><A name="Tuscany2.xExtensibilityandSPIs-Tuscany2.xExtensibilityandSPIs.pptTuscany2.xExtensibilityandSPIs.ppt"></A><A href="tuscany-2x-extensibility-and-spis.data/Tuscany%202.x%20Extensibility%20and%20SPIs.ppt">Tuscany 2.x Extensibility and SPIs.ppt</A></H1>
+
+<H1><A name="Tuscany2.xExtensibilityandSPIs-SPI%2FAPIChangeHistory"></A>SPI/API Change History</H1>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> SVN Diff </TH>
+<TH class="confluenceTh"> JIRA </TH>
+<TH class="confluenceTh"> Change </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://svn.apache.org/viewvc?view=revision&revision=901126" class="external-link" rel="nofollow">901126</A> </TD>
+<TD class="confluenceTd"> N/A </TD>
+<TD class="confluenceTd"> New client API from spec </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="Tuscany2.xExtensibilityandSPIs-CoreSPIs"></A>Core SPIs</H1>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Exported Packages </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly" class="external-link" rel="nofollow">assembly</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly</LI>
+	<LI>org.apache.tuscany.sca.assembly.builder</LI>
+	<LI>org.apache.tuscany.sca.assembly.impl</LI>
+	<LI>org.apache.tuscany.sca.definitions</LI>
+	<LI>org.apache.tuscany.sca.definitions.util</LI>
+	<LI>org.apache.tuscany.sca.interfacedef</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.impl</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.util</LI>
+	<LI>org.apache.tuscany.sca.policy</LI>
+	<LI>org.apache.tuscany.sca.policy.impl</LI>
+	<LI>org.apache.tuscany.sca.policy.util</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly-xml" class="external-link" rel="nofollow">assembly-xml</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.xml</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml</LI>
+	<LI>org.apache.tuscany.sca.policy.xml</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly-xsd" class="external-link" rel="nofollow">assembly-xsd</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.xsd</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution" class="external-link" rel="nofollow">contribution</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.scanner</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor</LI>
+	<LI>org.apache.tuscany.sca.contribution</LI>
+	<LI>org.apache.tuscany.sca.contribution.namespace</LI>
+	<LI>org.apache.tuscany.sca.contribution.java</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core" class="external-link" rel="nofollow">core</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.core.assembly</LI>
+	<LI>org.apache.tuscany.sca.core.assembly.impl</LI>
+	<LI>org.apache.tuscany.sca.core.context</LI>
+	<LI>org.apache.tuscany.sca.core.factory</LI>
+	<LI>org.apache.tuscany.sca.core.invocation</LI>
+	<LI>org.apache.tuscany.sca.core.scope</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core-databinding" class="external-link" rel="nofollow">core-databinding</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.core.databinding.processor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core-spi" class="external-link" rel="nofollow">core-spi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.context</LI>
+	<LI>org.apache.tuscany.sca.invocation</LI>
+	<LI>org.apache.tuscany.sca.management</LI>
+	<LI>org.apache.tuscany.sca.provider</LI>
+	<LI>org.apache.tuscany.sca.runtime</LI>
+	<LI>org.apache.tuscany.sca.work</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/data-api" class="external-link" rel="nofollow">data-api</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.data.collection</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding" class="external-link" rel="nofollow">databinding</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding</LI>
+	<LI>org.apache.tuscany.sca.databinding.xml</LI>
+	<LI>org.apache.tuscany.sca.databinding.impl</LI>
+	<LI>org.apache.tuscany.sca.databinding.util</LI>
+	<LI>org.apache.tuscany.sca.databinding.annotation</LI>
+	<LI>org.apache.tuscany.sca.databinding.javabeans</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/deployment" class="external-link" rel="nofollow">deployment</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.deployment</LI>
+	<LI>org.apache.tuscany.sca.deployment.impl</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/extensibility" class="external-link" rel="nofollow">extensibility</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.core</LI>
+	<LI>org.apache.tuscany.sca.extensibility</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/launcher" class="external-link" rel="nofollow">launcher</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.launcher</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/monitor" class="external-link" rel="nofollow">monitor</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.monitor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-api" class="external-link" rel="nofollow">node-api</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.node</LI>
+	<LI>org.apache.tuscany.sca.node.configuration</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/sca-api" class="external-link" rel="nofollow">sca-api</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.oasisopen.sca</LI>
+	<LI>org.oasisopen.sca.annotation</LI>
+	<LI>org.oasisopen.sca.client</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/xsd" class="external-link" rel="nofollow">xsd</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.xsd</LI>
+	<LI>org.apache.tuscany.sca.xsd.xml</LI>
+</UL>
+</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><A name="Tuscany2.xExtensibilityandSPIs-extensions"></A></P>
+
+<H1><A name="Tuscany2.xExtensibilityandSPIs-ExtensionPoints"></A>ExtensionPoints </H1>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Modules </TH>
+<TH class="confluenceTh"> Declared ExtensionPoints </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly" class="external-link" rel="nofollow">assembly</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.AssemblyFactory</LI>
+	<LI>org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.assembly.EndpointFactory</LI>
+	<LI>org.apache.tuscany.sca.assembly.SCABindingFactory</LI>
+	<LI>org.apache.tuscany.sca.definitions.DefinitionsFactory</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.InterfaceContractMapper</LI>
+	<LI>org.apache.tuscany.sca.policy.PolicyFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly-xml" class="external-link" rel="nofollow">assembly-xml</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/assembly-xsd" class="external-link" rel="nofollow">assembly-xsd</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.ValidationSchema</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/builder" class="external-link" rel="nofollow">builder</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.builder.CompositeBuilder</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution" class="external-link" rel="nofollow">contribution</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.ContributionFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.java.JavaImportExportFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core" class="external-link" rel="nofollow">core</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.AssemblyFactory</LI>
+	<LI>org.apache.tuscany.sca.context.ComponentContextFactory</LI>
+	<LI>org.apache.tuscany.sca.context.RequestContextFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.core.scope.ScopeRegistry</LI>
+	<LI>org.apache.tuscany.sca.invocation.MessageFactory</LI>
+	<LI>org.apache.tuscany.sca.runtime.CompositeActivator</LI>
+	<LI>org.apache.tuscany.sca.runtime.DomainRegistryFactory</LI>
+	<LI>org.apache.tuscany.sca.runtime.EndpointReferenceBinder</LI>
+	<LI>org.apache.tuscany.sca.runtime.EndpointRegistry</LI>
+	<LI>org.apache.tuscany.sca.runtime.EndpointSerializer</LI>
+	<LI>org.apache.tuscany.sca.work.WorkScheduler</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core-databinding" class="external-link" rel="nofollow">core-databinding</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor</LI>
+	<LI>org.apache.tuscany.sca.runtime.RuntimeWireProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/core-spi" class="external-link" rel="nofollow">core-spi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.context.ContextFactoryExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding" class="external-link" rel="nofollow">databinding</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.DataBinding</LI>
+	<LI>org.apache.tuscany.sca.databinding.DataBindingExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.databinding.Mediator</LI>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+	<LI>org.apache.tuscany.sca.databinding.PushTransformer</LI>
+	<LI>org.apache.tuscany.sca.databinding.SimpleTypeMapper</LI>
+	<LI>org.apache.tuscany.sca.databinding.TransformerExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/deployment" class="external-link" rel="nofollow">deployment</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.deployment.Deployer</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/extensibility" class="external-link" rel="nofollow">extensibility</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.core.FactoryExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.core.UtilityExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/monitor" class="external-link" rel="nofollow">monitor</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.monitor.MonitorFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/xsd" class="external-link" rel="nofollow">xsd</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.xsd.XSDFactory</LI>
+</UL>
+</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="Tuscany2.xExtensibilityandSPIs-TechnologySpecifics%28Doweneedthishere%3F%29"></A>Technology Specifics (Do we need this here?)</H1>
+
+<H2><A name="Tuscany2.xExtensibilityandSPIs-SPIs"></A>SPIs</H2>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Exported Packages </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom" class="external-link" rel="nofollow">binding-atom</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.atom</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom-js-dojo" class="external-link" rel="nofollow">binding-atom-js-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.atom.js.dojo</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime" class="external-link" rel="nofollow">binding-atom-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.atom.collection</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ejb" class="external-link" rel="nofollow">binding-ejb</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ejb</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-http" class="external-link" rel="nofollow">binding-http</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.http</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jms" class="external-link" rel="nofollow">binding-jms</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jms</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.operationselector</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.policy</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.policy.authentication.token</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.policy.header</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.wireformat</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonp" class="external-link" rel="nofollow">binding-jsonp</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jsonp</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc" class="external-link" rel="nofollow">binding-jsonrpc</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jsonrpc</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo" class="external-link" rel="nofollow">binding-jsonrpc-js-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jsonrpc.js.dojo</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-rmi" class="external-link" rel="nofollow">binding-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.rmi</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime" class="external-link" rel="nofollow">binding-sca-axis2-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.sca.axis2</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi" class="external-link" rel="nofollow">binding-sca-runtime-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.sca.rmi</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws" class="external-link" rel="nofollow">binding-ws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ws</LI>
+	<LI>org.apache.tuscany.sca.binding.ws.addressing</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-axis2" class="external-link" rel="nofollow">binding-ws-axis2</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ws.axis2</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-axis2-policy" class="external-link" rel="nofollow">binding-ws-axis2-policy</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token</LI>
+	<LI>org.apache.tuscany.sca.binding.ws.axis2.policy.configuration</LI>
+	<LI>org.apache.tuscany.sca.binding.ws.axis2.policy.header</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen" class="external-link" rel="nofollow">binding-ws-wsdlgen</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ws.wsdlgen</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/common-java" class="external-link" rel="nofollow">common-java</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.common.java.classloader</LI>
+	<LI>org.apache.tuscany.sca.common.java.collection</LI>
+	<LI>org.apache.tuscany.sca.common.java.io</LI>
+	<LI>org.apache.tuscany.sca.common.java.reflection</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/common-xml" class="external-link" rel="nofollow">common-xml</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.common.xml</LI>
+	<LI>org.apache.tuscany.sca.common.xml.dom</LI>
+	<LI>org.apache.tuscany.sca.common.xml.sax</LI>
+	<LI>org.apache.tuscany.sca.common.xml.stax</LI>
+	<LI>org.apache.tuscany.sca.common.xml.stax.reader</LI>
+	<LI>org.apache.tuscany.sca.common.xml.xpath</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution-osgi" class="external-link" rel="nofollow">contribution-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.osgi</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-axiom" class="external-link" rel="nofollow">databinding-axiom</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.axiom</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb" class="external-link" rel="nofollow">databinding-jaxb</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.jaxb</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-json" class="external-link" rel="nofollow">databinding-json</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.json</LI>
+	<LI>org.apache.tuscany.sca.databinding.json.axiom</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes" class="external-link" rel="nofollow">endpoint-tribes</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.endpoint.tribes</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/extensibility-equinox" class="external-link" rel="nofollow">extensibility-equinox</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.extensibility.equinox</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-http" class="external-link" rel="nofollow">host-http</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.http</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-rmi" class="external-link" rel="nofollow">host-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.rmi</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-webapp" class="external-link" rel="nofollow">host-webapp</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.webapp</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-bpel" class="external-link" rel="nofollow">implementation-bpel</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.bpel</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-java" class="external-link" rel="nofollow">implementation-java</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.java</LI>
+	<LI>org.apache.tuscany.sca.implementation.java.introspect</LI>
+	<LI>org.apache.tuscany.sca.implementation.java.introspect.impl</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime" class="external-link" rel="nofollow">implementation-java-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.java.context</LI>
+	<LI>org.apache.tuscany.sca.implementation.java.injection</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-osgi" class="external-link" rel="nofollow">implementation-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.osgi</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-spring" class="external-link" rel="nofollow">implementation-spring</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.spring</LI>
+	<LI>org.apache.tuscany.sca.implementation.spring.introspect</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-web" class="external-link" rel="nofollow">implementation-web</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.web</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-web-runtime" class="external-link" rel="nofollow">implementation-web-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.web.runtime.utils</LI>
+	<LI>org.apache.tuscany.sca.implementation.web.runtime</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-widget" class="external-link" rel="nofollow">implementation-widget</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.widget</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime" class="external-link" rel="nofollow">implementation-widget-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.implementation.widget.provider</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-java" class="external-link" rel="nofollow">interface-java</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.interfacedef.java.impl</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java.introspect</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws" class="external-link" rel="nofollow">interface-java-jaxws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.interfacedef.java.jaxws</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-wsdl" class="external-link" rel="nofollow">interface-wsdl</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.interfacedef.wsdl</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox" class="external-link" rel="nofollow">node-launcher-equinox</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.node.equinox.launcher</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/policy-security" class="external-link" rel="nofollow">policy-security</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.policy.authorization</LI>
+	<LI>org.apache.tuscany.sca.policy.security.jaas</LI>
+	<LI>org.apache.tuscany.sca.policy.authentication.basic</LI>
+	<LI>org.apache.tuscany.sca.policy.security</LI>
+	<LI>org.apache.tuscany.sca.policy.identity</LI>
+	<LI>org.apache.tuscany.sca.policy.authentication.token</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/policy-xml-ws" class="external-link" rel="nofollow">policy-xml-ws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.policy.xml.ws</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/web-javascript" class="external-link" rel="nofollow">web-javascript</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.web.javascript</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-impl" class="external-link" rel="nofollow">node-impl</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.node.impl</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi" class="external-link" rel="nofollow">node-impl-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.osgi.remoteserviceadmin</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-launcher" class="external-link" rel="nofollow">node-launcher</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.node.launcher</LI>
+</UL>
+</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="Tuscany2.xExtensibilityandSPIs-Extensions"></A>Extensions</H2>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Modules </TH>
+<TH class="confluenceTh"> Declared ExtensionPoints/Extensions </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom" class="external-link" rel="nofollow">binding-atom</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.atom.AtomBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom-js-dojo" class="external-link" rel="nofollow">binding-atom-js-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime" class="external-link" rel="nofollow">binding-atom-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ejb" class="external-link" rel="nofollow">binding-ejb</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ejb.EJBBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime" class="external-link" rel="nofollow">binding-ejb-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-http" class="external-link" rel="nofollow">binding-http</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.http.HTTPBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-http-runtime" class="external-link" rel="nofollow">binding-http-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jms" class="external-link" rel="nofollow">binding-jms</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.provider.SCADefinitionsProvider</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime" class="external-link" rel="nofollow">binding-jms-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+	<LI>org.apache.tuscany.sca.provider.OperationSelectorProviderFactory</LI>
+	<LI>org.apache.tuscany.sca.provider.PolicyProviderFactory</LI>
+	<LI>org.apache.tuscany.sca.provider.WireFormatProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonp" class="external-link" rel="nofollow">binding-jsonp</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.ValidationSchema</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime" class="external-link" rel="nofollow">binding-jsonp-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc" class="external-link" rel="nofollow">binding-jsonrpc</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo" class="external-link" rel="nofollow">binding-jsonrpc-js-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime" class="external-link" rel="nofollow">binding-jsonrpc-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-rmi" class="external-link" rel="nofollow">binding-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.rmi.RMIBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime" class="external-link" rel="nofollow">binding-rmi-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime" class="external-link" rel="nofollow">binding-sca-axis2-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime" class="external-link" rel="nofollow">binding-sca-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi" class="external-link" rel="nofollow">binding-sca-runtime-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws" class="external-link" rel="nofollow">binding-ws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-axis2" class="external-link" rel="nofollow">binding-ws-axis2</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.BindingProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-axis2-policy" class="external-link" rel="nofollow">binding-ws-axis2-policy</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.provider.PolicyProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen" class="external-link" rel="nofollow">binding-ws-wsdlgen</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.builder.BindingBuilder</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/contribution-osgi" class="external-link" rel="nofollow">contribution-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.contribution.scanner.ContributionScanner</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-axiom" class="external-link" rel="nofollow">databinding-axiom</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.DataBinding</LI>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb" class="external-link" rel="nofollow">databinding-jaxb</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.DataBinding</LI>
+	<LI>org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom" class="external-link" rel="nofollow">databinding-jaxb-axiom</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/databinding-json" class="external-link" rel="nofollow">databinding-json</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.databinding.DataBinding</LI>
+	<LI>org.apache.tuscany.sca.databinding.PullTransformer</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/domain-node" class="external-link" rel="nofollow">domain-node</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/endpoint-dht" class="external-link" rel="nofollow">endpoint-dht</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.runtime.EndpointRegistry</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes" class="external-link" rel="nofollow">endpoint-tribes</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.runtime.EndpointRegistry</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper" class="external-link" rel="nofollow">endpoint-zookeeper</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.runtime.EndpointRegistry</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-http" class="external-link" rel="nofollow">host-http</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.http.ServletHostExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-jetty" class="external-link" rel="nofollow">host-jetty</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.http.ServletHost</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-jetty7" class="external-link" rel="nofollow">host-jetty7</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.http.ServletHost</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-rmi" class="external-link" rel="nofollow">host-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/host-webapp" class="external-link" rel="nofollow">host-webapp</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.host.http.ServletHost</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-bpel" class="external-link" rel="nofollow">implementation-bpel</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.implementation.bpel.BPELFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime" class="external-link" rel="nofollow">implementation-bpel-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-java" class="external-link" rel="nofollow">implementation-java</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor</LI>
+	<LI>org.apache.tuscany.sca.implementation.java.JavaImplementationFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime" class="external-link" rel="nofollow">implementation-java-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.context.PropertyValueFactory</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+	<LI>org.apache.tuscany.sca.runtime.RuntimeWireProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-osgi" class="external-link" rel="nofollow">implementation-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory</LI>
+	<LI>org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-osgi-runtime" class="external-link" rel="nofollow">implementation-osgi-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-spring" class="external-link" rel="nofollow">implementation-spring</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.builder.ImplementationBuilder</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-web" class="external-link" rel="nofollow">implementation-web</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.builder.ImplementationBuilder</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.implementation.web.WebImplementationFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-web-client" class="external-link" rel="nofollow">implementation-web-client</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-web-runtime" class="external-link" rel="nofollow">implementation-web-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-widget" class="external-link" rel="nofollow">implementation-widget</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime" class="external-link" rel="nofollow">implementation-widget-runtime</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.provider.ImplementationProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo" class="external-link" rel="nofollow">implementation-widget-runtime-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-java" class="external-link" rel="nofollow">interface-java</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws" class="external-link" rel="nofollow">interface-java-jaxws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.interfacedef.FaultExceptionMapper</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/interface-wsdl" class="external-link" rel="nofollow">interface-wsdl</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.contribution.resolver.ModelResolver</LI>
+	<LI>org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-impl" class="external-link" rel="nofollow">node-impl</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory</LI>
+	<LI>org.apache.tuscany.sca.node.NodeFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi" class="external-link" rel="nofollow">node-impl-osgi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.node.NodeFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/policy-logging" class="external-link" rel="nofollow">policy-logging</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.assembly.builder.PolicyBuilder</LI>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.PolicyProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/policy-security" class="external-link" rel="nofollow">policy-security</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+	<LI>org.apache.tuscany.sca.definitions.xml.Definitions</LI>
+	<LI>org.apache.tuscany.sca.provider.PolicyProviderFactory</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/policy-xml-ws" class="external-link" rel="nofollow">policy-xml-ws</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/sca-client-impl" class="external-link" rel="nofollow">sca-client-impl</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/sca-client-rmi" class="external-link" rel="nofollow">sca-client-rmi</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/web-javascript" class="external-link" rel="nofollow">web-javascript</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint</LI>
+	<LI>org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo" class="external-link" rel="nofollow">web-javascript-dojo</A> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline">
+<UL>
+	<LI>org.apache.tuscany.sca.core.ModuleActivator</LI>
+</UL>
+</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Tuscany 2.x Extensibility and SPIs';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-maven-archetypes.html b/site/trunk/site-publish/documentation-2x/tuscany-maven-archetypes.html
new file mode 100644
index 0000000000..ae0f54d03a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-maven-archetypes.html
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Tuscany Maven Archetypes : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Maven Archetypes">Tuscany Maven Archetypes</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Maven Archetypes">Tuscany Maven Archetypes</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany Maven Archetypes</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329557">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329557">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329557">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329557">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329557">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329557">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H1><A name="TuscanyMavenArchetypes-TuscanyMavenArchetypes"></A>Tuscany Maven Archetypes</H1>
+
+<P>Tuscany provides some <A href="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html" class="external-link" rel="nofollow">Maven archetypes </A> to make it easy to get going using Tuscany. Maven archetypes provide a simple way to create a project thats configured with exactly what you need to develop your application. You don't need to download, install, or pre-configure Tuscany or your environment, thats all done for you automatically, all you need pre-installed is Maven and Java.</P>
+
+<P>To give it a try run the following command:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn archetype:generate -DarchetypeCatalog=http:<SPAN class="code-comment">//tuscany.apache.org</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>That will list out the available archetypes and ask you to choose which one you want:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Choose archetype:
+1: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-jar (Create an SCA contribution JAR)
+</SPAN>2: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart (Create a Tuscany SCA and JSP project)
+</SPAN>3: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-stripes (Create a Tuscany SCA and Stripes Web Framework project)
+</SPAN>4: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-jsf (Create a Tuscany SCA and JSF project)
+</SPAN>Choose a number:  (1/2/3/4):
+</PRE>
+</DIV></DIV>
+
+<P>You are then prompted to answer several questions about the project such as the Maven group and artifact IDs, Java package names etc. Some of those will show default values before the prompt so you can just hit enter to take the default. Thats it, and then the Maven project is created in a folder in the current directory named after the artifactid you entered.</P>
+
+<P>The following shows the console session for creating an SCA contribution JAR:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Choose a number:  (1/2/3/4): 4
+Define value <SPAN class="code-keyword">for</SPAN> groupId: : org.myco.sca.test
+Define value <SPAN class="code-keyword">for</SPAN> artifactId: : scatest
+Define value <SPAN class="code-keyword">for</SPAN> version:  1.0-SNAPSHOT: :
+Define value <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">package</SPAN>:  org.myco.sca.test: :
+Confirm properties configuration:
+groupId: org.myco.sca.test
+artifactId: scatest
+version: 1.0-SNAPSHOT
+<SPAN class="code-keyword">package</SPAN>: org.myco.sca.test
+ Y: :
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 1 minute 15 seconds
+[INFO] Finished at: Tue Mar 31 15:08:45 BST 2009
+[INFO] Final Memory: 8M/14M
+[INFO] ------------------------------------------------------------------------
+</PRE>
+</DIV></DIV>
+
+<P>That will create a Maven project in a folder named scatest with the following directory structure and files:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scatest\pom.xml
+scatest\src\main\java\org\myco\sca\test\HelloworldImpl.java
+scatest\src\main\java\org\myco\sca\test\HelloworldService.java
+scatest\src\main\resources\helloworld.composite
+scatest\src\main\resources\META-INF\sca-contribution.xml
+</PRE>
+</DIV></DIV>
+
+<P>When using one of the archetypes which create webapp projects the pom.xml is configured with the maven Jetty plugin so you can run the webapp right away without needing to install the WAR file into an appserver by using the command &quot;mvn jetty:run&quot;. The following shows an examaple of this using the tuscany-quickstart archetype:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&gt; mvn archetype:generate -DarchetypeCatalog=http:<SPAN class="code-comment">//tuscany.apache.org
+</SPAN>[INFO] Scanning <SPAN class="code-keyword">for</SPAN> projects...
+. . .
+Choose archetype:
+1: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-jar (Create an SCA JAR contribution project)
+</SPAN>2: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-zip (Create an SCA ZIP contribution project)
+</SPAN>3: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart (Create a simple SCA webapp project)
+</SPAN>4: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-jsf (Create a Webapp using SCA and JSF)
+</SPAN>5: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-stripes (Create a Webapp using SCA and the Stripes Web Framework)
+</SPAN>Choose a number:  (1/2/3/4/5): 3
+Define value <SPAN class="code-keyword">for</SPAN> groupId: : mygroup
+Define value <SPAN class="code-keyword">for</SPAN> artifactId: : mytest
+Define value <SPAN class="code-keyword">for</SPAN> version:  1.0-SNAPSHOT: :
+Define value <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">package</SPAN>:  mygroup: :
+Confirm properties configuration:
+groupId: mygroup
+artifactId: mytest
+version: 1.0-SNAPSHOT
+<SPAN class="code-keyword">package</SPAN>: mygroup
+ Y: :
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+
+&gt; cd mytest
+&gt; mvn jetty:run
+. . .
+[INFO] Started Jetty Server
+</PRE>
+</DIV></DIV> 
+
+<P>The webapp runs at the context path of the artifact name on port 8080 so on a web browser go to <A href="http://localhost:8080/mytest/" class="external-link" rel="nofollow">http://localhost:8080/mytest/</A> and you should see a page showing:</P>
+
+<P>Calling HelloworldService sayHello(&quot;world&quot;) returns:<BR>
+Hello world </P>
+
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Tuscany Maven Archetypes';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png
new file mode 100644
index 0000000000..644078c126
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png.jpeg b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png.jpeg
new file mode 100644
index 0000000000..b44bc4c7d8
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-context.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png
new file mode 100644
index 0000000000..968d460f81
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png.jpeg b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png.jpeg
new file mode 100644
index 0000000000..55b08faa09
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.data/tuscany-runtime-structure.png.jpeg
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.html b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.html
new file mode 100644
index 0000000000..17d511af69
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-runtime-overview.html
@@ -0,0 +1,224 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany Runtime Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="development-guides.html" title="Development Guides">Development Guides</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Runtime Overview">Tuscany Runtime Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany Runtime Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964723">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964723">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5964723">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=slaws">Simon Laws</A>, last edited by <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=slaws">Simon Laws</A> on Nov 13, 2009
+                      &nbsp;(<A class="noprint" href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=5964723&originalId=5964756">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="TuscanyRuntimeOverview-SoftwareOrganization"></A>Software Organization</H1>
+<H3><A name="TuscanyRuntimeOverview-SourceCodeLocations"></A>Source Code Locations</H3>
+<P>If you take a Tuscany SCA Java source distribution or look in the Tuscany subversion repository (<A href="http://svn.apache.org/repos/asf/tuscany/java/sca/" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/java/sca/</A>) you'll see the code layed out as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+BUILDING
+CHANGES
+LICENSE
+NOTICE
+README
+RELEASE_NOTES
+archetypes    - Maven archetypes <SPAN class="code-keyword">for</SPAN> creating Tuscany project templates
+distribution  - the code that defines and build Tuscany distributions
+features      - Maven projects that collect together Tuscany features 
+itest         - project integration tests
+modules       - the source code <SPAN class="code-keyword">for</SPAN> the runtime and the SCA extensions
+pom.xml       
+samples       - project samples
+shades        - TBD
+</PRE>
+</DIV></DIV>
+
+<P>There is some related source code  that's worth mentioning up front. Firstly the project Maven build relies on a set of Maven plugins that have been written specifically for Tuscany. They can also be found in the Tuscany subversion repository (<A href="http://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/</A>) and are as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+maven-bundle-plugin     - Creates Tuscany OSGi bundles based on the Tuscany modules and their dependencies
+                          also generates eclipse PDE projects <SPAN class="code-keyword">for</SPAN> Tuscany modules
+maven-eclipse-compiler  - Compiles using the Eclipse compiler and performs OSGi validation
+maven-java2wsdl-plugin  - TBD
+maven-osgi-junit        - Runs Junit tests in an OSGi environment
+maven-tuscany-plugin    - TBD
+maven-wsdl2java-plugin  - TBD
+</PRE>
+</DIV></DIV>
+
+<P>Secondly there are a set of tests that the OASIS SCA specifications define called otests. These test the Tuscany SCA runtime for compliance with the specifications. The tests themselves are stored in the OASIS subversion system (<A href="http://tools.oasis-open.org/version-control/browse/" rel="nofollow">http://tools.oasis-open.org/version-control/browse/</A>). Tuscany has a set of modules that retrieve these tests automatically and configure the Tuscany environment to run them (<A href="http://svn.apache.org/repos/asf/tuscany/otest/" rel="nofollow">http://svn.apache.org/repos/asf/tuscany/otest/</A>) as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+README
+build.xml                    - Ant utility script
+pom.xml
+sca-assembly                 - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-java-caa                 - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-java-ci                  - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+sca-policy                   - Generated automatically by svn externals when you check <SPAN class="code-keyword">this</SPAN> directory out
+tuscany-java-caa-test-runner - Java Common Annotations and APIs test runner
+tuscany-java-ci-test-runner  - Java Component Implementation test runner
+tuscany-policy-test-runner   - Policy test runner
+tuscany-test-runner          - Assembly test runner
+</PRE>
+</DIV></DIV>
+
+<H3><A name="TuscanyRuntimeOverview-SCAJavaModules"></A>SCA Java Modules</H3>
+<P>All of the functional code in Tuscany Java SCA can be found under the modules directory. There are a lot of sub-directories here but they basically fall into one of two categories, core function or extensions. We are using the term extension here in the sense that the SCA Assembly specification talks about and extension model You always have to have the core functions but most of the extensions are optional (we say most here because without some of the basic extensions the runtime won't do anything)  Finding extension modules is easy. Modules that start with the following words are extensions.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+binding
+databinding
+implementation
+<SPAN class="code-keyword">interface</SPAN>
+policy
+</PRE>
+</DIV></DIV>
+
+<P>As you can see SCA extensions relate to the extensible parts of the SCA composite file. For example, if you want to use &lt;binding.jms/&gt; in you SCA composite files then you need to include the Tuscany modules for this extension in you installation. In this case that would mean the modules binding-jms and binding-jms-runtime. <BR>
+All of the other modules in the modules directory are core modules and are generally required to be present in you Tuscany runtime installation. The use of the word &quot;generally&quot; here sounds a bit vague. This is because the Tuscany runtime itself is based on an extensibility mechanism which means that many parts of the runtime (as well as the SCA extensions) are pluggable. In this way, for example, different hosting environments can be supported. Well talk about runtime extensibility further down this article but for the time being consider all core modules to be mandatory. </P>
+
+<H1><A name="TuscanyRuntimeOverview-RuntimeBuildingBlocks"></A>Runtime Building Blocks</H1>
+
+<P>As you may have realized the Tuscany SCA Java runtime is just a Java program that, once started listens for incoming messages (via SCA component services) and, sometimes responds with outgoing messages (via SCA component references).</P>
+
+<P><IMG src="tuscany-runtime-overview.data/tuscany-runtime-context.png" align="absmiddle" border="0"></P>
+
+<P>The runtime then provides the context within which SCA composite applications run. If we crack open the Tuscany Runtime box we see the following structure.</P>
+
+<P><IMG src="tuscany-runtime-overview.data/tuscany-runtime-structure.png" align="absmiddle" border="0"></P>
+
+<P>We'll take a high level look at these different blocks in turn starting with Core.</P>
+
+<H1><A name="TuscanyRuntimeOverview-TuscanyCore"></A>Tuscany Core</H1>
+<H2><A name="TuscanyRuntimeOverview-OSGiandJSE"></A>OSGi and JSE</H2>
+<P>The Tuscany runtime will work in the JSE environment and when deployed to an OSGi runtime like Felix or Equinox. Since 1.x we have been through an exercise of refactoring all of the runtime modules in OSGi bundles and providing consistent OSGi manifest files. See (???) for more details on how we OSGi-igfied the Tuscany runtime. </P>
+
+<H2><A name="TuscanyRuntimeOverview-RuntimeExtensibility"></A>Runtime Extensibility</H2>
+<H2><A name="TuscanyRuntimeOverview-RuntimeModularity"></A>Runtime Modularity</H2>
+<H1><A name="TuscanyRuntimeOverview-TuscanySPI"></A>Tuscany SPI</H1>
+
+<H1><A name="TuscanyRuntimeOverview-SCAExtensions"></A>SCA Extensions</H1>
+
+<H1><A name="TuscanyRuntimeOverview-TuscanyAPI"></A>Tuscany API</H1>
+
+<H1><A name="TuscanyRuntimeOverview-TuscanyHosting"></A>Tuscany Hosting</H1>
+<H1><A name="TuscanyRuntimeOverview-RuntimeFeatures"></A>Runtime Features</H1>
+<H1><A name="TuscanyRuntimeOverview-DomainandNodes"></A>Domain and Nodes</H1>
+<H1><A name="TuscanyRuntimeOverview-RuntimeLifecycle"></A>Runtime Lifecycle</H1>
+<H2><A name="TuscanyRuntimeOverview-Read"></A>Read</H2>
+<H2><A name="TuscanyRuntimeOverview-Resolve"></A>Resolve</H2>
+<H2><A name="TuscanyRuntimeOverview-Build"></A>Build</H2>
+<H2><A name="TuscanyRuntimeOverview-Activate"></A>Activate</H2>
+<H2><A name="TuscanyRuntimeOverview-Start"></A>Start</H2>
+<H2><A name="TuscanyRuntimeOverview-Stop"></A>Stop</H2>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.10.3 Build: 1519 Apr 15, 2009)
+      <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0.beta1)
+    </DIV>
+  </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/tuscany-tomcat-distribution.html b/site/trunk/site-publish/documentation-2x/tuscany-tomcat-distribution.html
new file mode 100644
index 0000000000..de9658782b
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/tuscany-tomcat-distribution.html
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>Tuscany Tomcat Distribution : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Tomcat Distribution">Tuscany Tomcat Distribution</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Tomcat Distribution">Tuscany Tomcat Distribution</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany Tomcat Distribution</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329563">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329563">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329563">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329563">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329563">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=2329563">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<H1><A name="TuscanyTomcatDistribution-TuscanyTomcatDistribution"></A>Tuscany Tomcat Distribution</H1>
+
+<P>Tuscany includes a tuscany.war distribution for SCA-enabling <A href="http://tomcat.apache.org/" class="external-link" rel="nofollow">Apache Tomcat</A>, find it at the <A href="http://tuscany.apache.org/sca-java-2x-releases.html" class="external-link" rel="nofollow">Tuscany download page</A>. </P>
+
+<P>There are several advantages with using an SCA-enabled Tomcat:</P>
+<UL class="alternate" type="square">
+	<LI>Individual Web Applications do not need to include any Tuscany jars or Tuscany configuration in the web.xml.</LI>
+	<LI>Other SCA contribution formats such as jar or zip files can be deployed to Tomcat.</LI>
+	<LI>An SCA domain can be used to support SCA wiring accross Web Applications and contributions</LI>
+</UL>
+
+
+<P>Updating Tomcat to use the tuscany.way distribution is really simple - deploy the tuscany.war to Tomcat, go to the <A href="http://localhost:8080/tuscany" class="external-link" rel="nofollow">Tuscany admin application</A>, click on install, and thats it. On a restart of Tomcat it can now run SCA contributions and SCA enabled Web applications. </P>
+
+<P>The initial release of the tuscany.war in 2.0 M3 includes support for SCA-enabled Web applications as well as SCA contributions deployed to a directory named &quot;sca-contributions&quot; in the Tomcat top-level directory, and a single Tomcat instance wide SCA domain. Upcoming releases will enhance the domain support to allow multiple SCA domains and domains spanning more than a single Tomcat instance.</P>
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : Tuscany Tomcat Distribution';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation-2x/user-reference.html b/site/trunk/site-publish/documentation-2x/user-reference.html
new file mode 100644
index 0000000000..f32d0da77a
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/user-reference.html
@@ -0,0 +1,349 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+
+        <TITLE>User Reference : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANYxDOCx2x&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964351">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="User Reference">User Reference</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <H3><A name="UserReference-ImplementationTypes"></A><A name="UserReference-ImplementationTypes"></A>Implementation Types</H3>
+
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.java&linkCreation=true&fromPageId=5964351" class="createlink">implementation.java</A></TD>
+<TD class="confluenceTd">2.x-M1</TD>
+<TD class="confluenceTd">Support for SCA components implemented with Java classes</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.spring&linkCreation=true&fromPageId=5964351" class="createlink">implementation.spring</A></TD>
+<TD class="confluenceTd">2.x-M3</TD>
+<TD class="confluenceTd">Support for Spring Framework</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.bpel&linkCreation=true&fromPageId=5964351" class="createlink">implementation.bpel</A></TD>
+<TD class="confluenceTd">2.x-M1</TD>
+<TD class="confluenceTd">Support for components implemented in BPEL</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.osgi&linkCreation=true&fromPageId=5964351" class="createlink">implementation.osgi</A></TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">Support for osgi</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20implementation.web&linkCreation=true&fromPageId=5964351" class="createlink">implementation.web</A></TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">Support JEE web apps as implementation types</TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="UserReference-ProtocolBindings"></A><A name="UserReference-ProtocolBindings"></A>Protocol Bindings</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.ws&linkCreation=true&fromPageId=5964351" class="createlink">binding.ws</A></TD>
+<TD class="confluenceTd">2.0-M1</TD>
+<TD class="confluenceTd">SOAP/HTTP web services</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.rmi&linkCreation=true&fromPageId=5964351" class="createlink">binding.rmi</A></TD>
+<TD class="confluenceTd">2.0-M1</TD>
+<TD class="confluenceTd">The Java RMI protocol</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.jms&linkCreation=true&fromPageId=5964351" class="createlink">binding.jms</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Asynchronous JMS messaging</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.ejb&linkCreation=true&fromPageId=5964351" class="createlink">binding.ejb</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">EJB Binding</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.http&linkCreation=true&fromPageId=5964351" class="createlink">binding.http</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Supports binding of methods over standard Hyper Text Transfer Protocol (HTTP), allowing you to create, retrieve, update, delete items. Also supports conditional creates, retrieves, updates, and deletes using the ETag and LastModified caching protocol described in HTTP.</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.jsonp&linkCreation=true&fromPageId=5964351" class="createlink">binding.jsonp</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">The JSON protocol over HTTP</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.jsonrpc&linkCreation=true&fromPageId=5964351" class="createlink">binding.jsonrpc</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">The JSON-RPC protocol</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20binding.atom&linkCreation=true&fromPageId=5964351" class="createlink">binding.atom</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">supports Atom-publishing protocol, allowing you to create, retrieve, update, delete Atom entries</TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="UserReference-DataBindings"></A><A name="UserReference-DataBindings"></A>Data Bindings</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd">databinding-axiom</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Support for AXIOM data binding</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">databinding-jaxb</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Support for JAXB data binding</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">databinding-json</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Support for JSON data binding</TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="UserReference-Interfaces"></A><A name="UserReference-Interfaces"></A>Interfaces</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd">interface-java</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Interfaces described with java interfaces</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20interface.wsdl&linkCreation=true&fromPageId=5964351" class="createlink">interface.wsdl</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Interfaces described with WSDL definitions</TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="UserReference-Hosts"></A><A name="UserReference-Hosts"></A>Hosts</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd">http-jetty</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">The integration between Tuscany and the Jetty web container</TD>
+</TR>
+</TBODY></TABLE>
+
+
+<H3><A name="UserReference-Policy"></A><A name="UserReference-Policy"></A>Policy</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Release Introduced </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&title=SCA%20Java%20definitions.xml&linkCreation=true&fromPageId=5964351" class="createlink">definitions.xml</A></TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Defined intents, policy sets and binding defaults</TD>
+</TR>
+</TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/documentation-2x/webnavigation.html b/site/trunk/site-publish/documentation-2x/webnavigation.html
new file mode 100644
index 0000000000..1576901066
--- /dev/null
+++ b/site/trunk/site-publish/documentation-2x/webnavigation.html
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANYxDOCx2x/$images/favicon.ico">   
+        <TITLE>WebNavigation : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+   <STYLE>
+    .spacetree * ul {
+       padding-left:0px;
+       margin-left: 0px;
+    }
+    .spacetree * li {
+       margin-left: 5px;
+       padding-left:5px;
+    }
+   </STYLE>
+
+    <BODY onload="init()">
+            <!-- topNav -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+          <A href="https://cwiki.apache.org/geronimo"> Home</A> &gt;&nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="WebNavigation">WebNavigation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="index.html" title="Apache Tuscany Docs 2.x">Apache Tuscany Docs 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="WebNavigation">WebNavigation</A>
+            </TD>
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+            <A href="http://tuscany.apache.org/">Tuscany Home</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD valign="top" align="left" width="22%" bgcolor="#F9F9F9" class="noprint">
+                        <DIV class="tabletitle">Table of Contents</DIV>
+        <DIV class="spacetree">
+            
+            
+            </DIV>
+                </TD>
+                <TD align="left" valign="top" width="78%">
+                        <!-- pageContent -->
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany Docs 2.x</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">WebNavigation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5965035">
+            <IMG src="http://geronimo.apache.org/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5965035">Edit Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">
+            <IMG src="http://geronimo.apache.org/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANYxDOCx2x">Browse Space</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965035">
+            <IMG src="http://geronimo.apache.org/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965035">Add Page</A>
+          &nbsp;
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965035">
+            <IMG src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANYxDOCx2x&fromPageId=5965035">Add News</A>
+<!-- -->	 
+        </DIV>
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+        </DIV>
+
+              </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <!-- footer -->
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" class="footer">
+            &nbsp;&nbsp;
+            <IMG src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious">
+            <A href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</A>
+            &nbsp;&nbsp;
+            <IMG src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!">
+            <A href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)+'&topic=programming');">Digg this</A>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.2 Documentation : WebNavigation';
+              digg_topic = 'programming';
+            </script>
+            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+            -->
+            &nbsp;&nbsp;
+          </TD>
+          <TD align="right" valign="middle" class="footer">
+            <A href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</A>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &copy; 2003-2010, The Apache Software Foundation, Licensed under <A href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</A>&nbsp;&nbsp;
+          </TD>
+        </TR>
+    </TABLE> 
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/documentation.html b/site/trunk/site-publish/documentation.html
new file mode 100644
index 0000000000..307dc85268
--- /dev/null
+++ b/site/trunk/site-publish/documentation.html
@@ -0,0 +1,89 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Documentation : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47709">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="sca.html" title="SCA">SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Documentation">Documentation</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="Documentation-BasicGuides"></A>Basic Guides</H4>
+
+<P><A href="sca-jumpstart.html" title="SCA Jumpstart">5 Minute Jump-Start</A> <BR>
+Getting Started<BR>
+<A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+Developer Guide</P>
+
+<H4><A name="Documentation-RuntimeGuides"></A>Runtime Guides</H4>
+
+<P>Standalone <BR>
+Servlet Container<BR>
+iTest</P>
+
+<H4><A name="Documentation-ExtensionGuides"></A>Extension Guides</H4>
+
+<P>Spring Guide<BR>
+JPA Guide</P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+<H3><A name="Documentation-JavaSCADocumentation"></A>Java SCA Documentation</H3>
+
+<P>Documentation is a bit light at the moment <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P></TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/events.html b/site/trunk/site-publish/events.html
new file mode 100644
index 0000000000..982beeae85
--- /dev/null
+++ b/site/trunk/site-publish/events.html
@@ -0,0 +1,153 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Events : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47610">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Events">Events</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Events-UpcomingEvents"></A>Upcoming Events</H3>
+
+<P><B>July 23-27 2007 - <SPAN class="nobr"><A href="http://conferences.oreillynet.com/cs/os2007/view/e_sess/14724" title="Visit page outside Confluence" rel="nofollow">OSCON<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, Portland, Oregon</B><BR>
+Patrick Leonard, VP Product Development, Rogue Wave Software will host a BoF around &quot;The Current State of the Tuscany Project and Future Direction for Java, C++ and Other Supported Programming Languages&quot;</P>
+
+<P><B>June 25-27 2007 -</B> <B><SPAN class="nobr"><A href="http://www.soaeosconference.sys-con.com/general/session07.htm?id=33" title="Visit page outside Confluence" rel="nofollow"><B>SOA World</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, New York</B><BR>
+Simon Laws will be presenting 'Building SOA applications using Apache Tuscany' and 'PHP SCA @ Your Service'.</P>
+
+<P><B>June 11-14 2007 -</B> <SPAN class="nobr"><A href="http://sigmod07.riit.tsinghua.edu.cn/" title="Visit page outside Confluence" rel="nofollow"><B>ACM SIGMOD/PODS 2007 Conference</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>*, Beijing, China*<BR>
+Raymond Feng will be presenting. Presentation co-authored by Luciano Resende.</P>
+
+<P><B>June 21-22 2007 -</B> <B><SPAN class="nobr"><A href="http://www.oss.org.cn/index.php?option=com_content&task=view&id=625&Itemid=67" title="Visit page outside Confluence" rel="nofollow"><B>2007 Open Source China Open Source World Summit</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, GuangZhou, China</B><BR>
+Raymond Feng will be presenting.</P>
+
+<H2><A name="Events-PastReleases"></A>Past Releases</H2>
+
+<UL>
+	<LI>May 8 2007 - Tuscany Java SDO Beta1 released</LI>
+	<LI>May 2 2007 - Tuscany Native SCA and SDO C+&#43; M3 released</LI>
+	<LI>December 22 2006 - Tuscany Java SCA M2 released</LI>
+	<LI>November 20 2006 - Tuscany Java DAS M2 released</LI>
+	<LI>November 14 2006 - Tuscany Java SDO M2 released</LI>
+	<LI>November 3 2006 - Tuscany Nattive SCA and SDO C+&#43; M2 released</LI>
+</UL>
+
+
+<H3><A name="Events-PastNewsandEvents"></A>Past News and Events</H3>
+
+<P><B>May 8-11 2007 - JavaOne, San Francisco</B></P>
+
+<P>A BOF on SCA will be presented entitled &quot;Building Composite Services Applications&quot;. Many of Tuscany community members will also be attending JavaOne.</P>
+
+<P><B>May 16-18, 2007 -</B> <B><SPAN class="nobr"><A href="http://hades.phparch.com/ceres/public/tek/page/index.php/schedule" title="Visit page outside Confluence" rel="nofollow"><B>PHP Tek</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, Chicago, Ill.</B><BR>
+Caroline Maynard, Tuscany user through PHP project will present 'Services Made Simple with PHP' on May 16th, tack 2.</P>
+
+<P><B>March 21-23 2007 - Serverside Symposium, Las Vegas</B><BR>
+Tuscany Committers Jeremy Boynes, Meeraj Kunnumpurath, and Jim Marino will be presenting at the Las Vegas Serverside Symposium on the Java SCA project. For information, see <SPAN class="nobr"><A href="http://javasymposium.techtarget.com/lasvegas/index.html" title="Visit page outside Confluence" rel="nofollow">http://javasymposium.techtarget.com/lasvegas/index.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P><B>December 11-15 2006 - JavaPolis 2006 - Belgium</B><BR>
+Tuscany Committer Andy Borley presented &quot;Apache Tuscany - Not The Same Old Architecture&quot;. See the presentation <SPAN class="nobr"><A href="http://www.bejug.org/confluenceBeJUG/display/PARLEYS/Apache%20Tuscany%20-%20Not%20the%20Same%20Old%20Architecture?showComments=true" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/explicit-createupdatedelete.html b/site/trunk/site-publish/explicit-createupdatedelete.html
new file mode 100644
index 0000000000..cb0ae43549
--- /dev/null
+++ b/site/trunk/site-publish/explicit-createupdatedelete.html
@@ -0,0 +1,147 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Explicit CREATE,UPDATE,DELETE</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53940">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Explicit CREATE,UPDATE,DELETE">Explicit CREATE,UPDATE,DELETE</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ExplicitCREATE%2CUPDATE%2CDELETE-ExplicitCreate%2CUpdate%2CDelete"></A>Explicit Create,Update,Delete</H1>
+<P>The RDB DAS provides a simple, command-oriented approach for CUD operations.</P>
+
+<P>The Commands can be explicit INSERT, UPDATE , DELETE SQL statements like</P>
+<UL>
+	<LI>INSERT INTO TableName (col1, col2,...) values (val1, val2,...);</LI>
+	<LI>DELETE FROM TableName where col1=? and col2=?...</LI>
+	<LI>UPDATE TableName set col1=val1, col2=val2...where col1=?...<BR>
+With this approach, the Command is directly used by the JDBC's PreparedStamement. This approach avoids use of SDO capabilities.</LI>
+</UL>
+
+
+<P>Below is example config. </P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xmlns=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt; 
+
+    &lt;Command name=&quot;insert customer&quot;    
+    SQL=&quot;insert into CUSTOMER (ID, LASTNAME, ADDRESS) values (?, ?, ?)&quot;
+    kind=&quot;Insert&quot;&gt;
+    &lt;/Command&gt;   
+    
+    &lt;Command name=&quot;delete customer&quot;    
+	SQL=&quot;delete from CUSTOMER where ID = ?&quot;
+    kind=&quot;Delete&quot;&gt;
+    &lt;/Command&gt;
+
+    &lt;Command name=&quot;update customer&quot;
+        SQL=&quot;update CUSTOMER set LASTNAME = 'Pavick' where ID = ?&quot;
+        kind=&quot;Update&quot;&gt;
+    &lt;/Command&gt;  
+
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Another way to perform the same operations is through use of SDO DataObjects. For this, the root DataObject needs to be formed either in static (DataObjectModel) or dynamic way (using Database Query's  ResultSetMetaData). With the root DataObject in place, it uses, SDO APIs for DataObject and ChangeSummary to perform create, delete, update. For more details check (<A href="http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithBasicCrud" class="external-link" rel="nofollow">WorkingWithBasicCrud</A>). </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/explicit-resultset-shape-definition.html b/site/trunk/site-publish/explicit-resultset-shape-definition.html
new file mode 100644
index 0000000000..b194a81d25
--- /dev/null
+++ b/site/trunk/site-publish/explicit-resultset-shape-definition.html
@@ -0,0 +1,157 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Explicit ResultSet shape definition</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53832">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Explicit ResultSet shape definition">Explicit ResultSet shape definition</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ExplicitResultSetshapedefinition-ExplicitResultSetshapedefinition"></A>Explicit ResultSet shape definition</H1>
+
+<P>The RDB DAS provides the ability to specify format(shape) of the ResultSet. This is necessary when the JDBC driver in use does not provide adequate support for ResultSetMetaData. Also, we expect that specifying the result set shape will increase the performance. The following is the provision in RDB DAS config to specify result set shape:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;xsd:complexType name=&quot;Command&quot;&gt;
+   &lt;xsd:sequence&gt;
+     ....
+      &lt;xsd:element  maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;
+            name=&quot;ResultDescriptor&quot;  type=&quot;config:ResultDescriptor&quot;/&gt;
+   &lt;/xsd:sequence&gt;
+   ....
+&lt;/xsd:complexType&gt;
+
+&lt;xsd:complexType name=&quot;ResultDescriptor&quot;&gt;
+   &lt;xsd:attribute name=&quot;columnIndex&quot; type=&quot;xsd:int&quot; default=&quot;-1&quot;/&gt;
+   &lt;xsd:attribute name=&quot;columnName&quot; type=&quot;xsd:string&quot;/&gt;
+   &lt;xsd:attribute name=&quot;tableName&quot; type=&quot;xsd:string&quot;/&gt;
+   &lt;xsd:attribute name=&quot;schemaName&quot; type=&quot;xsd:string&quot;/&gt;
+   &lt;xsd:attribute name=&quot;columnType&quot; type=&quot;xsd:string&quot;/&gt;
+&lt;/xsd:complexType&gt;
+...
+</PRE>
+</DIV></DIV>
+<P>The following is an example config file that defines a result set shape: :</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xmlns=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+  &lt;Command name=&quot;literal&quot; SQL=&quot;Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer&quot; kind=&quot;Select&quot;&gt;
+     &lt;ResultDescriptor columnName=&quot;ID&quot; tableName=&quot;CUSTOMER&quot;
+         columnType=&quot;commonj.sdo.Long&quot;/&gt;
+     &lt;ResultDescriptor columnName=&quot;LASTNAME&quot; tableName=&quot;CUSTOMER&quot;
+         columnType=&quot;commonj.sdo.String&quot;/&gt;
+     &lt;ResultDescriptor columnName=&quot;ADDRESS&quot; tableName=&quot;CUSTOMER&quot;
+        columnType=&quot;commonj.sdo.String&quot;/&gt;
+  &lt;/Command&gt;
+   &lt;Table tableName=&quot;CUSTOMER&quot;&gt;        &lt;Column columnName=&quot;ID&quot; converterClassName=&quot;org.apache.tuscany.das.rdb.test.mappings.StringToLongConverter&quot;/&gt;
+   &lt;/Table&gt;
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+
+<H1><A name="ExplicitResultSetshapedefinition-ResultDescriptoronDynamicCommands"></A>Result Descriptor on Dynamic Commands</H1>
+
+<P>Allow passing ResultDescriptor to Dynamic Commands. i.e. Command x = das.createCommand(&quot;y&quot;);<BR>
+x can have set/get of single/list of ResultDescriptors. Useful for databases like Oracle<BR>
+which require user to pass ResultDescriptor and for cases when the commands are created dynamically<BR>
+using createCommand()</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/feature-areas-and-what-folks-are-working-on.html b/site/trunk/site-publish/feature-areas-and-what-folks-are-working-on.html
new file mode 100644
index 0000000000..23fa140ee5
--- /dev/null
+++ b/site/trunk/site-publish/feature-areas-and-what-folks-are-working-on.html
@@ -0,0 +1,1877 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Feature areas and what folks are working on</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43438">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Feature areas and what folks are working on">Feature areas and what folks are working on</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This table is an attempt to capture the various requirements that I've gathered from browsing the SCA specs and discussions on the Tuscany dev list, and the work in-progress in the community.</P>
+
+<P>We are hoping that it will help organize our requirements and discuss how we want to stage their implementation over our next milestones. It should also help new contributors understand who is working on what, and grab areas that need work.</P>
+
+<P>The table is under construction. We are inviting everybody in our community to come help build that page with the requirements that they are aware of, and the features that they are interested in.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Feature area <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Milestone <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> People working on it <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Comments / description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Status </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Assembly PM spec</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complex properties <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Venkat </TD>
+<TD class="confluenceTd"> Add support to SCDL parsers, builders and factory configuration. Integrate with data bindings. </TD>
+<TD class="confluenceTd"> This has been completed and checked into the sca-java-integration branch. <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Pass by-value / by-reference </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Venkat </TD>
+<TD class="confluenceTd"> Initial implementation almost in? Some cleanup necessary? Need to understand how to clone/copy data with different databindings, SDO, JAX-WS, and POJOs. Understand how to handle pointers across multiple parameters when copying. </TD>
+<TD class="confluenceTd"> Has now been improved for performance to skip copying when the source or target is a ServiceBinding or ReferenceBinding </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multiplicity </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support multiplicity constraints on references. Support multiple wires. Handle overrides. Investigate how to handle binding selection. Support for callbacks. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Naming constraints in a composite <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Luciano (Tuscany-914) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Validate that service/reference/component names are unique inside a composite. Check the presence of SCDL includes. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multi-valued properties </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Venkat </TD>
+<TD class="confluenceTd"> Add support to SCDL parsers, builders and factory configuration. Integrate with data bindings. </TD>
+<TD class="confluenceTd"> This has been implemented and checked into the sca-java-integration branch. This impl. assumes that if a property is of simple type and has multiple values, then each value is defined in the scdl within an enclosing element who name is 'value'. e.g. &lt;value&gt;Some String Value&lt;/value&gt;. <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WSDL 2.0 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support for WSDL 2.0 accross the board, runtime, WSDL/Java tools and WS binding. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Operation overloading (simple exact matching) </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Rick </TD>
+<TD class="confluenceTd"> Change runtime service contract hashmap and invocation handling/dispatching. Adjust extensions to this. Match identical methods on ends of a wire. </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Operation overloading (complete support) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Match and wire compatible methods, factor in different databindings, WSDL wrapping/unwrapping, and match invocation and actual parameters to a compatible method. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ComponentType side files <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Partial support already in. Need to define overriding strategy when implementation and componentType metadata overlap. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for SCA contribution <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Raymond, Luciano </TD>
+<TD class="confluenceTd"> Generic handling of SCA contributions and base plugin mechanism for loading/scanning artifacts. Allow a contribution and artifacts in it to be addressed by URI. Do not assume a fixed default.scdl file. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> The following is a summary of what's available for the contribution service: <BR class="atl-forced-newline">
+&#45; Contribution Model <BR class="atl-forced-newline">
+&#45; Processing jar and folder based contributions <BR class="atl-forced-newline">
+&#45; Artifact loader WSDL, XSD, SCDL/Composite, Java/Class, sca-contribution.xml <BR class="atl-forced-newline">
+&#45; Contribution repository <BR class="atl-forced-newline">
+&#45; Contribution Service (add to SCA Domain using Assembly services) <BR class="atl-forced-newline">
+&#45; Integration with SCAMiniRuntime, unit test cases, and integration tests cases <BR class="atl-forced-newline">
+&#45; Very initial artifact addressing/resolving integrated into Assembly services <BR class="atl-forced-newline">
+&#45; Support for loading sca-contribution.xml <BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+<A href="deployment.html" title="Deployment">Design Draft</A><BR class="atl-forced-newline">
+<BR class="atl-forced-newline">
+Look for the following jira issues to see what's still not available in the contribution services : TUSCANY-1158, TUSCANY-1159, TUSCANY-1160, TUSCANY-1161, TUSCANY-1162, TUSCANY-1163 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Filesystem based SCA contributions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond, Luciano </TD>
+<TD class="confluenceTd"> Support free-form folder structure in a contribution. Support multiple SCDLs per contribution. Scan for SCDL and other artifacts under an SCA contribution. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Completed and available in the sca-java-integration branch. <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JAR based SCA contributions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Raymond, Luciano </TD>
+<TD class="confluenceTd"> Support JAR contribution structure. Support multiple SCDLs per contribution. Scan for SCDL and other artifacts under an SCA contribution. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Completed and available in the sca-java-integration branch. <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA includes <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> This does not seem complete, verify, in particular wiring across includes and support for nested includes. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Composite resolution (no recursion) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Luciano </TD>
+<TD class="confluenceTd"> Register composites and find them by Qname within a contribution. Support references across contributions in domain level includes. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Composite resolution (recursive composition) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolve composites with nested composites. Support full recursion. Current support needs to be fixed, as each reference to a composite gets it reloaded/redefined. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> XML property configuration in side files <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Properties configured in an external XML file. Resolve the file location, load it. See if loading and xpath reference mechanism needs to be adjusted for this. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ref/Service/Property config override (no recursion) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support overriding of services/references/properties. Investigate overrides combined with multiplicity. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ref/Service/Property config override (recursive) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support overriding of services/references/properties in nested composites. Handle multiple overrides. Support additions vs overrides in the case of bindings. Investigate overrides combined with multiplicity. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Wiring with service/reference bindings <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support binding URIs. Then configuration of binding URI with wires. Then propagation of binding info from a service to a reference wired to it. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Support for WS binding mainly completed determining the URI from all the combinations described in the assembly and WS binding specs. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="businessexceptions.html" title="BusinessExceptions">Support for business exceptions</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Rick, Raymond </TD>
+<TD class="confluenceTd"> Distinguish handling of runtime exceptions vs business exceptions. Add support to invocation/dispatching mechanism + POJO implementations, bindings and databinding. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> We added the support for intra-composite and inter-composite over binding.axis2. Please see the <A href="businessexceptions.html" title="BusinessExceptions">Design Draft</A>. There are a few itest cases you can play with.
+<UL>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions" class="external-link" rel="nofollow">Exceptions test</A></LI>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding" class="external-link" rel="nofollow">Cross biniding test</A></LI>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws" class="external-link" rel="nofollow">WebService binding test</A></LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Context info in error reports <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Across the board, need to provide application level context data (composite, component, service, reference etc.) with errors, to allow an app developer to understand what's wrong in his application. Without that he's left having to understand all the underlying middleware. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Minimum SCDL extensibility (non SCA namespaces) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support additional bindings, implementation types, interface types, and policies from diff namespaces. Should already work for bindings and implementations. Need to check policies and interface types. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complete SCDL extensibility as defined by the XSD <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Will need changes to a number of loaders and builders. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for xsi:type in addition to global elements <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Changes to most loaders or improvements to LoaderRegistry. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for various ordering of SCDL elements <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Simon </TD>
+<TD class="confluenceTd"> Loaders depend on a specific order of elements in the SCDL files. Supporting other possible sequences will require changes in the loaders logic. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire - local <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Adjust to the spec, which now defines this at the assembly level, independent of the Java C&amp;I. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire - domain level <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support autowire in a domain, including components services and references, policy intents and compatible bindings. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire extension point <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Plugin mechanism to allow different autowire algorithms to be plugged in <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL validation, semantic constraints (obvious cases) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Only support the obvious/main semantic constraints. Separate tool to perform semantic validation of an assembly. Also needs to be invoked as part of deployment and/or loading at runtime. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL validation, semantic constraints (complete) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Complete support for the spec. Separate tool to perform semantic validation of an assembly. Also needs to be invoked as part of deployment and/or loading at runtime. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Implementation / component matching <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Make sure that an implementation matches the component that uses it. For example enforce wiring of required references. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Callback support </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Ignacio </TD>
+<TD class="confluenceTd"> Combinations of sync and async. Determine which binding to use for a callback invocation. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Configured implementations <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Configuration of component implementations in .componentType files or inlined in implementations (spec issue 8) and in component declarations. Resolve/merge when overlap between the three. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Promotion of Ref/ Services/ Properties (no recursion) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> New promotion mechanism for services/references/properties. Service/reference/property definition on components. Handle promotion of already wired services and references. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Promotion of Ref/ Services/ Properties (recursive) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> New promotion mechanism for services/references/properties. Service/reference/property definition on components. Handle promotion of already wired services and references. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multiple bindings on services and refs </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Basic support for multiple bindings is in. See how configuration overriding works with multiple bindings. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ability to use and alter SCDL model at deployment <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Sebastien </TD>
+<TD class="confluenceTd"> Add missing relationships to the SCDL logical model, independent of runtime context. Allow deployment tools to alter the model and write it back to XML. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Interchangeability of Java and WSDL </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Ant, Rick </TD>
+<TD class="confluenceTd"> Build ServiceContract representation from Java or WSDL. Needs more work to understand combinations of SDO/JAXB/POJOs and wrapped/unwrapped. Add logic to wiring framework to match WSDL portTypes and Java interfaces. </TD>
+<TD class="confluenceTd"> Support for using interface.java or interface.wsdl interchangably completed. See TUSCANY-1111 for some limitations, mainly due to limitations of the databinding framework. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Document limitations and deviations from the spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Review the spec and document Tuscany limitations and differences with the SCA assembly spec. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Java C&amp;I spec</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Derive service name from interface name <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Clarify with specification, is the service name the fully qualified class name, the class name without the package name, or are we adding a service name attribute to the @Service annotation <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Injection of multivalued properties </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond </TD>
+<TD class="confluenceTd"> Map multi-valued properties to java.util.Collection or []. </TD>
+<TD class="confluenceTd"> Supported by sca-java-integration branch now. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Injection of references with multiplicity 0..n <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond </TD>
+<TD class="confluenceTd"> Map references with Multiplicity to java.util.Collection or []. </TD>
+<TD class="confluenceTd"> Supported by sca-java-integration branch now. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Required properties <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Validation that required properties are configured <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Service references (minimum) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Minimum implementation of Service references supporting setCallback/getCallback. Local usage only with no serialization of the reference. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Service references (complete support) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Complete support for the Service reference programming model, including the ability to pass Service References around, serialize them, then use them to perform invocations outside of the context where they were initially obtained. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Conversational <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Not sure what's missing. Check the spec against the runtime to assess what's remaining first. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WSDL2Java / Java2WSDL / SDO - simple cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Command line tooling. Support wrapped/non-wrapped patterns, multiple parts/message, nested complex types, faults/Exceptions. Generation of SCA annotations in interfaces. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WSDL2Java / Java2WSDL / JAX-WS <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Command line tooling. Wrap/integrate the JAX-WS tooling. Customize it to generate SCA annotations in interfaces? Investigate how the runtime could reuse the JAX-WS WSDL/Java mapping logic as well, since it'll need to know the mapping rules as well. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> @Autowire <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Adjust to what the latest spec, maybe a little different from the current Tuscany support. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Configured implementations </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support for Java annotations allowing configuration of a POJO (services, references, bindings and properties) without SCDL. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA as a wrapper over JAX-WS async <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Allow cast of an SCA proxy to a JAX-WS API to support the JAX-WS async programming model. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ability to run with Java 2 security enabled <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> This is not just related to the Java C&amp;I. Need to go over the runtime code and wrap sections of code that access resources, threads, classloaders etc in doPrivileged blocks to allow the runtime to work in an environment with Java 2 security enabled. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Document limitations and deviations from the spec </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Review the spec and document Tuscany limitations and differences with the SCA Java C&amp;I spec. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Conversational PM</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Core support </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Ignacio, looking for volunteer to take over </TD>
+<TD class="confluenceTd"> Lifecycle in. Persistence of conversation state in. Needs to support tran/recovery. Also need some redesign to avoid having to send/receive a routing path and play nicely with bindings. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integration with bindings </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Plugin mechanism to allow a binding to declare conv capability and support conversational. Maybe define a &quot;conversational policy intent&quot; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS binding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Rick </TD>
+<TD class="confluenceTd"> Map conversational to the correct MEPs. Investigate how to flow conversation id. Use WS-addressing, message-id, relates-to etc. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS-binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Need to understand how/if conversational means anything to the JMS binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Check the EJB binding spec to understand what needs to be done here <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Investigate if it makes sense to support conversational with this binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Understand how a concrete binding will be selected depending on conversational requirements (may fold into some policy intent work) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> REST binding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Investigate if it makes sense to support conversational with this binding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> HTTP Session support <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Persist session scope and conversational state with the HTTP session? <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Non-blocking PM</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Core support </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Ignacio, looking for volunteer to take over </TD>
+<TD class="confluenceTd"> No support for async over sync yet (see spec issue) but everything else seems to be there. I am concerned with how we represent callbacks and how their info flows between remote components </TD>
+<TD class="confluenceTd"> Async one-way and with callback work. Integration tests in the sca-java-integration branch are successful. We'll need to revisit later how to represent callback endpoints when flowing over bindings, in particular the Web Service and JMS bindings. <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integration with bindings </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Plugin mechanism to allow a binding to declare support for async and callback, MEPs and/or polling. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS binding (short term/sync MEP) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Ignacio, looking for volunteer to take over </TD>
+<TD class="confluenceTd"> Dispatch call to a thread and continue to use a sync MEP. Will not support unsolicited callbacks. Issue: WSDL representation of callback vs Axis2 client and sync MEP. </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS binding (real async MEP) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Use an async MEP and WS-addressing and callbacks. Also investigate what needs to be done w.r.t security on the callbacks. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Sync up with the latest JMS binding spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Do we need to support this? We support async invocation of POJOs, but people know that EJBs are synchronous. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Used in AJAX apps which are based on async exchanges. So the JSON-RPC binding should support the non-blocking PM and callbacks. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> REST binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Not sure if there is a requirement at all for real CRUD REST. There may be a requirement for activity based XML/HTTP services, similar to the WS binding requirement. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Understand how a concrete binding will be selected depending on non-blocking invocation requirements. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SCA default binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Client side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Server side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Selection of concrete binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Based on policy intents, capabilities of the installed runtime, and where the target service is deployed. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;JMS binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Adjust to latest SCDL spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support for the latest SCDL syntax. Support for JMS in a JMS managed environment. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS data binding support <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support data bindings as defined in the JMS binding spec. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integrate with Tuscany data bindings <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Integrate with Tuscany databinding framework. Support sending/receiving JAXB or SDO objects through JMS. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>WS binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Adjust to latest SCDL spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> A few changes to adjust to the latest WS binding spec. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Configuration of WSDL2Java mapping <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Related to the Java / WSDL story. Use the SDO based and JAX-WS Java / WSDL generators to produce WSDL? Apply the corresponding mapping in the runtime as well. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Handling of faults <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support faults at least with SDO and JAX-WS. Support other data bindings available through the data binding framework. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for attachements <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for RPC encoded <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Working without WSDL <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Implement the JAX-WS defaults in the absence of a WSDL definition. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for wrapped/non-wrapped <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support for JAX-WS wrap/unwrap patterns. Apply the same principles with SDO and other data bindings. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for SOAP headers <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Investigate how/if SOAP headers should be exposed to a client and target service. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>EJB binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Under IP-CLEARANCE process. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Client side </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Server side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Generate of EJB &quot;wrapper&quot; code and EJB DD? <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Geronimo integration </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Generate Geronimo specific artifacts, and/or tighter integration with the Geronimo runtime, potentially avoiding any code generation. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>REST binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Resource interface and PM <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Define a new component interface type for CRUD operations on a resource <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Client side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Mapping to HTTP verbs on the client side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Server side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Dispatching of HTTP verbs to a component on the server side <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Activity style interactions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Not real REST, similar to the WS binding but with plain XML / HTTP <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for HTTP headers <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support for last-modified, etags and other HTTP headers <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;JSON-RPC binding</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <B>&nbsp;</B> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for references </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Currently only supports services. Needs to add client side support as well. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integrate with latest toolkits </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Integrate with latest JSON toolkits, initial integration was done some time ago, we need to refresh it. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complete support for JSON spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Check what's missing in the current runtime <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Data binding support</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> We have made quite a few improvements in this area in the sca-java-integration branch.
+<UL>
+	<LI>Added introspection of java interfaces to recognize known types for various databindings</LI>
+	<LI>Improved SDO and JAXB handling</LI>
+	<LI>Support for exception transformations accross databindings</LI>
+	<LI>Added JavaBean2StAX transformation</LI>
+	<LI>Improved StAX related transformations</LI>
+	<LI>Added more itest cases</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SDO and JAXB <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Support conversions between SDO and JAXB <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> AXIOM support <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support conversion from/to AXIOM <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL annotations <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Define SCDL annotations to configure data bindings. Needs to be pluggable, maybe change at some point to use Intents <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Add more transformers and perf optimizations <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> The databinding framework approach will perform only if we have enough transformers to reduce the number of conversions going from one format to another. </TD>
+<TD class="confluenceTd"> Added the SDO &#45;-&gt; AXIOM&nbsp; transformer using OMDataSource </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Policy Intent framework</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL and core support, model, loaders, builders <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Intent determination algorithm <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Wire matching </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binding / container configuration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Transaction policy</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL model, loaders, builders <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Runtime interceptors <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Transaction service integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integration with bindings <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS-binding support for transactions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS-binding support for transactions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB binding support for transactions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding support for transactions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Security policy</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL model, loaders, builders <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Runtime interceptors <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Authentication / autorization service integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integration with bindings <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS-binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS-binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> REST binding support for security <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Reliability policy</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL model, loaders, builders <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Runtime interceptors <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS-binding support for reliability <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS-binding support for reliability <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding support for reliability <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Modular build</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Extensions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Refactor extensions to improve our build system and allow the various parts of the project to be built independently <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Refactor samples to improve our build system and allow the various parts of the project to be built independently </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Integration tests <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Refactor integration tests to improve our build system and allow the various parts of the project to be built independently </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Packaging / deployment</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA domain repository / metadata <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond, Sebastien <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Define services to add/remove composites and maintain a logical SCA domain level composite. Needs to be pluggable. Support domain base URI and base URI for each binding scheme. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Deployment of SCA contributions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond, Luciano <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Define services to add/remove SCA contributions to the SCA domain. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Artifact addressing, resolving, loading <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond, Luciano <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Plugin mechanism to handle addressing of artifacts within contributions, resolution within a contribution, conflicts between contributed artifacts and externally referenced artifacts (WSDL and XSD for example) <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Deployment extensions <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Raymond, Luciano <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Plugin mechanism to allow an extension to contribute to deployment as well. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany classloading infrastructure <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support classloaders per SCA contribution. Isolate the application artifacts from the Tuscany runtime artifacts. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> OSGI classloader integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Administration</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMX support <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Basic services start/stop etc. Need to assess what's in the current code base. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Diagnostic / event logging <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Go through the kernel code and add event logging plug points. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Monitoring / instrumentation <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Go through the kernel code and add monitoring plug points. Add monitor plug points on composite, component start/stop, service invocation etc. and make sure that they are given enough context. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Core start/stop/query admin services <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Basic core services to start/stop/query running components. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Scenarios</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Nested composition <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Domain level wiring <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Domain wiring across runtimes <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Mixing runtimes in a composite <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Web application integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Mediation / routing <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Web 2.0 application <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Adjust Bigbank to the latest spec <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS-I SupplyChain application <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Host runtimes</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tomcat integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Our M2 integration story packages the whole runtime in each web app. We need another better / lighter integration. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Geronimo integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Just run Tuscany webapps on Geronimo <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Geronimo integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> A real integration with the Geronimo runtime <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> OSGI integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Standalone server <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Spring component type</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Extend Spring to declare SCA services / refs <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> This is described in the SCA for Spring spec </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Use a Spring assembly in an SCA composition <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Looks like a subset of the SCA for Spring spec is implemented? </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Javascript component type</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for JavaScript components </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Groovy component type</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for Groovy components </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>JRuby component type</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for JRuby components </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>BPEL component type</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for BPEL components </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Function test suite</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> TBD </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Integration test suite</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complex composition test cases </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multiple runtimes / containers / bindings <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS based test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB based test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS based test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> REST based test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC based test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Spring integration test cases <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Samples</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample databinding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample component impl. type <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sample policy <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Simple assembly samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS binding samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS binding samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> EJB samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC samples </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Nested composites <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA default binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA include samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Property samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> POJO samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Jruby samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Javascript samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Groovy samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> REST samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Configuration override samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Transaction samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Reliability samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Security samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Standalone server samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Web app integration samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Spring integration samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Architecture documentation</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Kernel <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> POJO support <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in a component impl type <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in a binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in a policy <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in a data binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in an interface type <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Plugging in a new host integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Building <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JMS binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WS-binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JSON-RPC binding <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> RMI/EJB <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Deployment / packaging <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> OSGI integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Spring integration <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>User documentation</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">Shelita </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Build Tuscany <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Develop an SCA app <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Build an SCA app <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Package/Deploy <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Run <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/features-for-java-das-m3-release.html b/site/trunk/site-publish/features-for-java-das-m3-release.html
new file mode 100644
index 0000000000..3c04f80dc2
--- /dev/null
+++ b/site/trunk/site-publish/features-for-java-das-m3-release.html
@@ -0,0 +1,613 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Features for Java DAS M3 Release</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="" title="Features for Java DAS M3 Release">Features for Java DAS M3 Release</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Features for Java DAS M3 Release</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51909">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51909">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51909">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51909">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51909">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51909">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=adriano_crestani">Adriano Crestani</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Apr 19, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=51909&originalId=52075">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="FeaturesforJavaDASM3Release-UnresolvedJavaDASJIRAs"></A>Unresolved Java DAS JIRAs</H1>
+
+<P>The table below contains the listed JIRAs for Java DAS that are actually(04/18/2007) unresolved. It must be decided which JIRA should be resolved before M3 release and which should be postponed for next.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1027 </TD>
+<TD class="confluenceTd"> DAS should throw a meaningful exception if applyChanges process encounters a DO with no defined PK </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 04/Jan/07 </TD>
+<TD class="confluenceTd"> 10/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-864 </TD>
+<TD class="confluenceTd"> Better integration between SCA and DAS </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 09/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-961 </TD>
+<TD class="confluenceTd"> DAS: Using deprected SDO method causes Type lookup failure </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 30/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1010 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit CUD testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1009 </TD>
+<TD class="confluenceTd"> Adding/Enhancing name mapping testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1014 </TD>
+<TD class="confluenceTd"> Add/Enhance convention over configuration testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1012 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit resultSetShape testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1011 </TD>
+<TD class="confluenceTd"> Add/Enhance external transactions test cases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1015 </TD>
+<TD class="confluenceTd"> Add/Enhance graphhelper testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-986 </TD>
+<TD class="confluenceTd"> DAS integration with SDO 2.1 APIs </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 11/Dec/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-915 </TD>
+<TD class="confluenceTd"> User level documentation </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature<BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-916 </TD>
+<TD class="confluenceTd"> OCC recovery framework </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-953 </TD>
+<TD class="confluenceTd"> Invalid data graph results in NPE on applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-952 </TD>
+<TD class="confluenceTd"> DAS must support queries that reference tables in different &quot;schemas&quot; </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 01/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-542 </TD>
+<TD class="confluenceTd"> Pager API needs some work </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 13/Jul/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-233 </TD>
+<TD class="confluenceTd"> Case sensitivity   DAS config file </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Rick Rineholt </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 26/Apr/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sub-task </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-904 </TD>
+<TD class="confluenceTd"> TUSCANY-864 <BR clear="all">
+ Expose DAS as SCA container </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Amita Vadhavkar </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 07/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">  New Feature </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-800 </TD>
+<TD class="confluenceTd"> Introduce new DAS Sample APP to demonstrate DAS advanced features </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 05/Oct/06 </TD>
+<TD class="confluenceTd"> 10/Apr/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-863 </TD>
+<TD class="confluenceTd"> CompanyWeb DAS Sample should create and initialize the canned database when app is loaded by first time and db is not available </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 17/Apr/07 </TD>
+</TR>
+</TBODY></TABLE>
+
+<H1><A name="FeaturesforJavaDASM3Release-ResolvedJavaDASJiras"></A>Resolved Java DAS Jiras</H1>
+
+<P>The table below contains the listed JIRAs for DAS Java that were resolved/closed since last release: Java DAS M2 released on November 20th, 2006. It will be included as the fixed bugs and new features in Java DAS M3 release documentation.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-866 </TD>
+<TD class="confluenceTd"> <A href="das.html" title="DAS">DAS</A> Use overqualified update by default </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Oct/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-954 </TD>
+<TD class="confluenceTd"> Need to throw an exception when users try to set a relationship and FK property </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-968 </TD>
+<TD class="confluenceTd"> Invalid FK columns causes NPE </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1087 </TD>
+<TD class="confluenceTd"> DAS should not commit individual commands as part of applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Closed </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-841 </TD>
+<TD class="confluenceTd"> Need a test for relationships formed by compound keys </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 14/Oct/06 </TD>
+<TD class="confluenceTd"> 24/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-898 </TD>
+<TD class="confluenceTd"> Expose DAS as a SCA service </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Nov/06 </TD>
+<TD class="confluenceTd"> 03/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-971 </TD>
+<TD class="confluenceTd"> DAS may not now depend on CPL if EMF has completed migration to EPL </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-937 </TD>
+<TD class="confluenceTd"> Multiple test failures while connecting with MySQL </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 16/Nov/06 </TD>
+<TD class="confluenceTd"> 21/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-948 </TD>
+<TD class="confluenceTd"> Consider DAS config connection info for J2SE environment </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 22/Nov/06 </TD>
+<TD class="confluenceTd"> 10/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1008 </TD>
+<TD class="confluenceTd"> Adding/Enhancing PartialUpdates testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1041 </TD>
+<TD class="confluenceTd"> DAS Needs a JavaDoc distribution </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-886 </TD>
+<TD class="confluenceTd"> DAS distributions should unpack into it's own directory based on the version </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Oct/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-441 </TD>
+<TD class="confluenceTd"> Remove DAS use of Class variable to trigger logging. </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Jun/06 </TD>
+<TD class="confluenceTd"> 07/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-957 </TD>
+<TD class="confluenceTd"> DAS generates invalid INSERT statement when no properties are set on the new DO </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 29/Nov/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1013 </TD>
+<TD class="confluenceTd"> Add/Enhance configHelper testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 09/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-939 </TD>
+<TD class="confluenceTd"> DAS Should throw an exception when ResultSetMetadata is invalid </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+</TBODY></TABLE>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/features.html b/site/trunk/site-publish/features.html
new file mode 100644
index 0000000000..8b731f1f18
--- /dev/null
+++ b/site/trunk/site-publish/features.html
@@ -0,0 +1,715 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Features</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="" title="Features">Features</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Features</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43438">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43438">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=43438">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=43438">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=43438">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=43438">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jsdelfino">Jean-Sebastien Delfino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jsdelfino">Jean-Sebastien Delfino</A> on Feb 01, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=43438&originalId=43722">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>Here's a list of features that I think we need to implement at some point. I am hoping that we can use this page to organize our thoughts and sort out the features that we'll want to support in the next few milestones.</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Feature </TH>
+<TH class="confluenceTh"> Milestone <BR clear="all"> </TH>
+<TH class="confluenceTh"> Who is working on it <BR clear="all"> </TH>
+<TH class="confluenceTh"> Comments / description <BR clear="all"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Assembly PM spec</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complex properties <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support to SCDL parsers, builders and factory configuration. Integrate with data bindings. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Pass by-value / by-reference </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Initial implementation almost in? Some cleanup necessary? Need to understand how to clone/copy data with different databindings, SDO, JAX-WS, and POJOs. Understand how to handle pointers across multiple parameters when copying. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multiplicity </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support multiplicity constraints on references. Support multiple wires. Handle overrides. Investigate how to handle binding selection. Support for callbacks. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Naming constraints in a composite <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Validate that service/reference/component names are unique inside a composite. Check the presence of SCDL includes. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multi-valued properties </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support to SCDL parsers, builders and factory configuration. Integrate with data bindings. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> WSDL 2.0 <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add support for WSDL 2.0 accross the board, runtime, WSDL/Java tools and WS binding. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Operation overloading (simple exact matching) </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Change runtime service contract hashmap and invocation handling/dispatching. Adjust extensions to this. Match identical methods on ends of a wire. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Operation overloading (complete support) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Match and wire compatible methods, factor in different databindings, WSDL wrapping/unwrapping, and match invocation and actual parameters to a compatible method. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ComponentType side files <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Partial support already in. Need to define overriding strategy when implementation and componentType metadata overlap. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for SCA contribution <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp; <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Generic handling of SCA contributions and base plugin mechanism for loading/scanning artifacts. Allow a contribution and artifacts in it to be addressed by URI. Do not assume a fixed default.scdl file. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Filesystem based SCA contributions <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support free-form folder structure in a contribution. Support multiple SCDLs per contribution. Scan for SCDL and other artifacts under an SCA contribution. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> JAR based SCA contributions <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp; <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support JAR contribution structure. Support multiple SCDLs per contribution. Scan for SCDL and other artifacts under an SCA contribution. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCA includes <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> This does not seem complete, verify, in particular wiring across includes and support for nested includes. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Composite resolution (no recursion) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Register composites and find them by Qname within a contribution. Support references across contributions in domain level includes. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Composite resolution (recursive composition) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolve composites with nested composites. Support full recursion. Current support needs to be fixed, as each reference to a composite gets it reloaded/redefined. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> XML property configuration in side files <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Properties configured in an external XML file. Resolve the file location, load it. See if loading and xpath reference mechanism needs to be adjusted for this. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ref/Service/Property config override (no recursion) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support overriding of services/references/properties. Investigate overrides combined with multiplicity. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ref/Service/Property config override (recursive) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support overriding of services/references/properties in nested composites. Handle multiple overrides. Support additions vs overrides in the case of bindings. Investigate overrides combined with multiplicity. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Wiring with service/reference bindings <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support binding URIs. Then configuration of binding URI with wires. Then propagation of binding info from a service to a reference wired to it. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for business exceptions <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Distinguish handling of runtime exceptions vs business exceptions. Add support to invocation/dispatching mechanism + POJO implementations, bindings and databinding. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Context info in error reports <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Across the board, need to provide application level context data (composite, component, service, reference etc.) with errors, to allow an app developer to understand what's wrong in his application. Without that he's left having to understand all the underlying middleware. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Minimum SCDL extensibility (non SCA namespaces) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support additional bindings, implementation types, interface types, and policies from diff namespaces. Should already work for bindings and implementations. Need to check policies and interface types. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Complete SCDL extensibility as defined by the XSD <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Will need changes to a number of loaders and builders. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for xsi:type in addition to global elements <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Changes to most loaders or improvements to LoaderRegistry. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Support for various ordering of SCDL elements <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Loaders depend on a specific order of elements in the SCDL files. Supporting other possible sequences will require changes in the loaders logic. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire - local <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Adjust to the spec, which now defines this at the assembly level, independent of the Java C&amp;I. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire - domain level <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Support autowire in a domain, including components services and references, policy intents and compatible bindings. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Autowire extension point <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Plugin mechanism to allow different autowire algorithms to be plugged in <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL validation, semantic constraints (obvious cases) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Only support the obvious/main semantic constraints. Separate tool to perform semantic validation of an assembly. Also needs to be invoked as part of deployment and/or loading at runtime. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> SCDL validation, semantic constraints (complete) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Complete support for the spec. Separate tool to perform semantic validation of an assembly. Also needs to be invoked as part of deployment and/or loading at runtime. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Implementation / component matching <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Make sure that an implementation matches the component that uses it. For example enforce wiring of required references. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Callback support </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Combinations of sync and async. Determine which binding to use for a callback invocation. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Configured implementations <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Configuration of component implementations in .componentType files or inlined in implementations (spec issue 8) and in component declarations. Resolve/merge when overlap between the three. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Promotion of Ref/ Services/ Properties (no recursion) <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> New promotion mechanism for services/references/properties. Service/reference/property definition on components. Handle promotion of already wired services and references. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Promotion of Ref/ Services/ Properties (recursive) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> New promotion mechanism for services/references/properties. Service/reference/property definition on components. Handle promotion of already wired services and references. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Multiple bindings on services and refs </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Basic support for multiple bindings is in. See how configuration overriding works with multiple bindings. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Ability to use and alter SCDL model at deployment <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Add missing relationships to the SCDL logical model, independent of runtime context. Allow deployment tools to alter the model and write it back to XML. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Interchangeability of Java and WSDL </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Build ServiceContract representation from Java or WSDL. Needs more work to understand combinations of SDO/JAXB/POJOs and wrapped/unwrapped. Add logic to wiring framework to match WSDL portTypes and Java interfaces. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Document limitations and deviations from the spec <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Review the spec and document Tuscany limitations and differences with the SCA assembly spec. <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Java C&amp;I spec</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Conversational PM</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Non-blocking PM</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SCA default binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;JMS binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>WS binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>EJB binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>REST binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;JSON-RPC binding</B> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <B>&nbsp;</B> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Data binding support</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;Policy Intent framework</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Transaction policy</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Security policy</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Reliability policy</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Modular build</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Packaging / deployment</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Administration</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Scenarios</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Host runtimes</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Spring component type</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Javascript component type</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Groovy component type</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>JRuby component type</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>BPEL component type</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Function test suite</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Integration test suite</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Samples</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>Architecture documentation</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>User documentation</B> <BR clear="all"> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/federation-notes.html b/site/trunk/site-publish/federation-notes.html
new file mode 100644
index 0000000000..2facc1f947
--- /dev/null
+++ b/site/trunk/site-publish/federation-notes.html
@@ -0,0 +1,267 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Federation Notes</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=49982">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Federation Notes">Federation Notes</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Pulling together notes on what has been build to support federation in the tunk as it stands (just after TSS demo - March 07)</P>
+
+<H2><A name="FederationNotes-References"></A>References</H2>
+
+<P>Raymond's architecture guide <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Tuscany%20Architecture%20Guide" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/Tuscany+Architecture+Guide</A><BR>
+Some discussions from the dev list about contributio, discovery, federation and the TSS demo:</P>
+<UL>
+	<LI>First talk of contribution and assembly service <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3CE38CFB43-CEB5-456F-BDDD-C25BFFC3C238@apache.org%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3cE38CFB43-CEB5-456F-BDDD-C25BFFC3C238@apache.org%3e</A></LI>
+	<LI>Mangament service intro <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3CBAY105-F38054BAB691DCF4F15BA77DDB80@phx.gbl%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3cBAY105-F38054BAB691DCF4F15BA77DDB80@phx.gbl%3e</A></LI>
+	<LI>First talk of distributed/federated assemblies <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3C90B6915C-ED14-484A-873F-F26894C63DB2@apache.org%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3c90B6915C-ED14-484A-873F-F26894C63DB2@apache.org%3e</A></LI>
+	<LI>Resolve and verify phases of deployment <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3C2F2C595B-CCDA-4AB0-8BF9-A20CB4012F88@apache.org%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3c2F2C595B-CCDA-4AB0-8BF9-A20CB4012F88@apache.org%3e</A></LI>
+	<LI>JMX and standalone runtime <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/raw/%3C53EC6802E2BF4643BBD5BC34D2C3A38301B6C3F2@SPR3V4.office.local%3E/" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/raw/%3c53EC6802E2BF4643BBD5BC34D2C3A38301B6C3F2@SPR3V4.office.local%3e/</A><BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/raw/%3CBAY105-F20D5A6A881D4A9A3ED3D45DDBD0@phx.gbl%3E/" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/raw/%3cBAY105-F20D5A6A881D4A9A3ED3D45DDBD0@phx.gbl%3e/</A></LI>
+	<LI>Federated deployment<BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3CE6925252-9922-4A65-8867-2B0E2B2BFA67@apache.org%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3cE6925252-9922-4A65-8867-2B0E2B2BFA67@apache.org%3e</A><BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3CBAY105-F33CE29B9024EDBB20FCA09DDA70@phx.gbl%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200701.mbox/%3cBAY105-F33CE29B9024EDBB20FCA09DDA70@phx.gbl%3e</A><BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200702.mbox/%3C53EC6802E2BF4643BBD5BC34D2C3A38301E41C94@SPR3V4.office.local%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200702.mbox/%3c53EC6802E2BF4643BBD5BC34D2C3A38301E41C94@SPR3V4.office.local%3e</A></LI>
+	<LI>Federation demo startup<BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3CBAY105-F14D60CFBA31DA296B772EADD770@phx.gbl%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3cBAY105-F14D60CFBA31DA296B772EADD770@phx.gbl%3e</A></LI>
+	<LI>Meeraj code description<BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3CBAY105-F7123B0C05FE260B65B8D3DD750@phx.gbl%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3cBAY105-F7123B0C05FE260B65B8D3DD750@phx.gbl%3e</A></LI>
+	<LI>Meeraj note on running the demo<BR>
+<A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3C53EC6802E2BF4643BBD5BC34D2C3A3830279C142@SPR3V4.office.local%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3c53EC6802E2BF4643BBD5BC34D2C3A3830279C142@SPR3V4.office.local%3e</A></LI>
+</UL>
+
+
+<H2><A name="FederationNotes-BuildingTheDemo"></A>Building The Demo</H2>
+
+<H3><A name="FederationNotes-FromTheTSSTag"></A>From The TSS Tag</H3>
+
+<P>Follow instructions in README.txt here <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/distribution/sca/tsss-demo/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/java/distribution/sca/tsss-demo/</A><BR>
+Unzip the resulting demo zip file<BR>
+Meeraj's discussion of switching from JXTA to JSM <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg15731.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg15731.html</A><BR>
+I had problems in that some of the required dependency JARs were missing. I copied:</P>
+<UL>
+	<LI>tuscany-jms-discovery-0.1-incubating-SNAPSHOT.jar</LI>
+	<LI>apache-activemq-4.1.0-incubator.jar</LI>
+	<LI>tuscany-http-jetty-0.1-incubating-SNAPSHOT.jar</LI>
+	<LI>jetty-6.1.0.jar</LI>
+	<LI>jetty-util-6.1.0.jar</LI>
+	<LI>tuscany-sca-console-0.1-incubating-SNAPSHOT.jar</LI>
+	<LI>geronimo-j2ee-connector_1.5_spec-1.0.jar</LI>
+</UL>
+
+
+<P>into each of the profiles boot directories</P>
+
+<H3><A name="FederationNotes-ManuallyFromHead"></A>Manually From Head</H3>
+<P>I couldn't get this to work as the core tests now fail</P>
+
+<H2><A name="FederationNotes-DebuggingTheDemo"></A>Debugging The Demo</H2>
+<P>When run originally the demo complained about missing dependencies. In particular when reading the system components (root.system) I got the error:</P>
+
+<P>org.apache.tuscany.host.runtime.InitializationException: org.apache.tuscany.spi.<BR>
+component.GroupInitializationException: sca://root.system/main<BR>
+        at org.apache.tuscany.core.runtime.AbstractRuntime.initialize(AbstractRu<BR>
+ntime.java)<BR>
+        at org.apache.tuscany.standalone.server.TuscanyServer.startRuntime(Tusca<BR>
+nyServer.java:134)</P>
+
+<P>What this actually means is that Tuscany failed to load one of the system components successfully but, by default, doesn't tell what the issue is. I wanted to use Eclipse to debug it so I played about a bit but couldn't get the java -jar command line to come up in the Eclipse debugger. As a fall back I started a remote debugging session. There were three steps to this. </P>
+
+<P>Add a trap to the code to give me a chance to attach the debugger. I added the following lines to the mainline of the:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;press a key&quot;</SPAN>);
+ java.io.BufferedReader stdin = <SPAN class="code-keyword">new</SPAN> java.io.BufferedReader(<SPAN class="code-keyword">new</SPAN> java.io.InputStreamReader(<SPAN class="code-object">System</SPAN>.in));
+ <SPAN class="code-object">String</SPAN> line = stdin.readLine();
+</PRE>
+</DIV></DIV>
+
+<P>Start java app with remote debugging enabled. There are plenty of references on the web on how to do this. Here is the comman line I used to start the master profile.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -Xrunjdwp:server=y,transport=dt_socket,address=4142,suspend=n -Dtuscany.adminPort=2000 -jar server.start.jar ma
+ster
+</PRE>
+</DIV></DIV>
+
+<P>When the app comes up and stops at the trap connect the Eclipse debugger by selecting the remote debugging profile and specifying localhost:4142 as the connection details. The port number (4142) just comes from that specified on the application command line. </P>
+
+<H2><A name="FederationNotes-TurningLoggingOn"></A>Turning Logging On</H2>
+<P>Its not clear how to do this just yet. Meeraj suggests that the missing nested exception detail can be printed out by specifying a log formatter.  TODO.</P>
+
+<H2><A name="FederationNotes-RunningTheDemo"></A>Running The Demo</H2>
+
+<P>(From Meeraj's post on the subject)<BR>
+This is how you start the servers (Please make sure you start ActiveMQ<BR>
+before you start the servers) .</P>
+
+<P>Master: java -Dtuscany.adminPort=2000 -jar server.start.jar master<BR>
+Slave1: java -Dtuscany.adminPort=3000 -jar server.start.jar slave1<BR>
+Slave2: java -Dtuscany.adminPort=4000 -jar server.start.jar slave2</P>
+
+<P>You can access the admin console from <A href="http://localhost:7000/scdlForm" class="external-link" rel="nofollow">http://localhost:7000/scdlForm</A> and<BR>
+if you target the deployed SCDL to slave1, access the demo appilcation<BR>
+from <A href="http://localhsot:8000/calculatorForm" class="external-link" rel="nofollow">http://localhsot:8000/calculatorForm</A>. The test scdl is as follows<BR>
+(this is what you submit from the admin console to target a deployment<BR>
+to a slave),</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http://www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+          <SPAN class="code-keyword">xmlns:tuscany</SPAN>=<SPAN class="code-quote">&quot;http://tuscany.apache.org/xmlns/sca/2.0-alpha&quot;</SPAN>
+          name=<SPAN class="code-quote">&quot;CalculatorComposite&quot;</SPAN>&gt;
+
+   <SPAN class="code-tag">&lt;component runtimeId=<SPAN class="code-quote">&quot;slave1&quot;</SPAN> name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;</SPAN>
+       <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;</SPAN>
+       <SPAN class="code-tag">&lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>/&gt;</SPAN>
+       &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN>
+target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN>/&gt;
+       &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN>
+target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN>/&gt;
+       &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN>
+target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN>/&gt;
+   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+
+   <SPAN class="code-tag">&lt;component runtimeId=<SPAN class="code-quote">&quot;slave1&quot;</SPAN> name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;</SPAN>
+       <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;</SPAN>
+   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+
+   <SPAN class="code-tag">&lt;component runtimeId=<SPAN class="code-quote">&quot;slave1&quot;</SPAN> name=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN>&gt;</SPAN>
+       <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.SubtractServiceImpl&quot;</SPAN>/&gt;</SPAN>
+   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+
+   <SPAN class="code-tag">&lt;component runtimeId=<SPAN class="code-quote">&quot;slave1&quot;</SPAN> name=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN>&gt;</SPAN>
+       <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.MultiplyServiceImpl&quot;</SPAN>/&gt;</SPAN>
+   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+
+   <SPAN class="code-tag">&lt;component runtimeId=<SPAN class="code-quote">&quot;slave1&quot;</SPAN> name=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN>&gt;</SPAN>
+       <SPAN class="code-tag">&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.DivideServiceImpl&quot;</SPAN>/&gt;</SPAN>
+   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
+
+<SPAN class="code-tag">&lt;/composite&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Here is the actual sequence of events:</P>
+
+<P>Start ActiveMQ</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -Dtuscany.adminPort=2000 -jar server.start.jar master
+java -Dtuscany.adminPort=3000 -jar server.start.jar slave1
+java -Dtuscany.adminPort=4000 -jar server.start.jar slave2
+</PRE>
+</DIV></DIV>
+
+<P>Each of these just reports &quot;Started&quot; on the command line</P>
+
+<P>Go to <A href="http://localhost:7000/scdlForm" class="external-link" rel="nofollow">http://localhost:7000/scdlForm</A> in a browser and paste in the SCDL from above to configure slave1 to create and wire the calculator components.</P>
+
+<P>Go to <A href="http://localhsot:8000/calculatorForm" class="external-link" rel="nofollow">http://localhsot:8000/calculatorForm</A> in a browser and see the form that drives the calculator sample. Type in a couple of numbers and press Add.</P>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/foreignkeyrepresentationandmanagement.html b/site/trunk/site-publish/foreignkeyrepresentationandmanagement.html
new file mode 100644
index 0000000000..7283ae5e44
--- /dev/null
+++ b/site/trunk/site-publish/foreignkeyrepresentationandmanagement.html
@@ -0,0 +1,122 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : ForeignKeyRepresentationAndManagement</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52823">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="ForeignKeyRepresentationAndManagement">ForeignKeyRepresentationAndManagement</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ForeignKeyRepresentationAndManagement-ForeignKeyRepresentationAndManagement"></A>ForeignKeyRepresentationAndManagement</H1>
+
+<P>Database table foreign keys map to DataObjects as relationships to other DataObjects. Consider two tables: DEPARTMENT and EMPLOYEE and assume the EMPLOYEE table has a FK column DEPT_ID that references a row in the DEPARTEMENT table.</P>
+
+<P>If you use the DAS to read a particular department and all of its related employees then you will end up with a DEPARTMENT DataObject that has a property named &quot;EMPLOYEE&quot; that is a reference to a list of related EMPLOYEE DataObjects. You can navigate directly to the employees via this property like this: department.getList(&quot;EMPLOYEE&quot;).</P>
+
+<P>Although the relationship is mapped to the DataObjects as a relationship, the FK value is also stored in the repsective DataObject. So, continuing with this example, the EMPLOYEE DataObject will have a simple property named &quot;DEPT_ID&quot; that holds the value of the FK. This property is not maintained after the read. So, if an EMPLOYEE DataObject is moved to a different department, the FK property in EMPLOYEE will not be modified. Although most applications will ignore this FK property, there are a few scenarios that make use of it. In fact, although the preferred method of modifying relationships between DataObjects in a data graph is to use normal POJO manipulation, the DAS does allow the modification of a relationship via direct modification of the FK value.</P>
+
+<P>When the DAS is scanning changes made to a data graph, it employs the following set of rule to guide the generation of update statements:</P>
+
+<P>&quot;The value for a foreign key column will come from either the primary key of the parent dataobject or from the FK property itself. If the relationship is set but the FK property is not, the value will be taken from the parent's primary key. If the FK property is set but the relationship is not, the value will be taken from the property value. If both the relationship and the FK property are set, an exception will be thrown stating that &quot;Foreign key properties should not be set when the corresponding relationship has changed&quot; </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/found-a-bug-section.html b/site/trunk/site-publish/found-a-bug-section.html
new file mode 100644
index 0000000000..0220eab19a
--- /dev/null
+++ b/site/trunk/site-publish/found-a-bug-section.html
@@ -0,0 +1,141 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Found A Bug Section</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55922">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Found A Bug Section">Found A Bug Section</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="FoundABugSection-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="FoundABugSection-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="FoundABugSection-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="FoundABugSection-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/general-das-subproject-menu.html b/site/trunk/site-publish/general-das-subproject-menu.html
new file mode 100644
index 0000000000..3e6611ad1e
--- /dev/null
+++ b/site/trunk/site-publish/general-das-subproject-menu.html
@@ -0,0 +1,83 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>General DAS Subproject Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56535">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="General DAS Subproject Menu">General DAS Subproject Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/general-info.html b/site/trunk/site-publish/general-info.html
new file mode 100644
index 0000000000..d7a1e250bc
--- /dev/null
+++ b/site/trunk/site-publish/general-info.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : General Info</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55498">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="General Info">General Info</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/general-menu.html b/site/trunk/site-publish/general-menu.html
new file mode 100644
index 0000000000..f29698ce6b
--- /dev/null
+++ b/site/trunk/site-publish/general-menu.html
@@ -0,0 +1,116 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : General Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47628">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="General Menu">General Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H4><A name="GeneralMenu-General"></A>General</H4>
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Home" class="external-link" rel="nofollow">Home</A><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">News &amp; Events</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A><BR>
+<A href="http://www.apache.org/" class="external-link" rel="nofollow">ASF</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/general-subproject-menu.html b/site/trunk/site-publish/general-subproject-menu.html
new file mode 100644
index 0000000000..aa65d049d9
--- /dev/null
+++ b/site/trunk/site-publish/general-subproject-menu.html
@@ -0,0 +1,83 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>General Subproject Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56535">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="General Subproject Menu">General Subproject Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Get%20Involved&linkCreation=true&fromPageId=56535" title="Create Page: Get Involved" class="createlink">Get Involved<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Found%20a%20Bug&linkCreation=true&fromPageId=56535" title="Create Page: Found a Bug" class="createlink">Found a Bug?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/general.html b/site/trunk/site-publish/general.html
new file mode 100644
index 0000000000..d612f09f57
--- /dev/null
+++ b/site/trunk/site-publish/general.html
@@ -0,0 +1,123 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : General</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54956">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="General">General</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/get-hold-of-rat.html b/site/trunk/site-publish/get-hold-of-rat.html
new file mode 100644
index 0000000000..67f47c0348
--- /dev/null
+++ b/site/trunk/site-publish/get-hold-of-rat.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Get hold of RAT</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=76121">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making releases">Making releases</A>&nbsp;&gt;&nbsp;<A href="" title="Get hold of RAT">Get hold of RAT</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Download the latest release from <A href="http://code.google.com/p/arat" class="external-link" rel="nofollow">http://code.google.com/p/arat</A> (It's moving back to Apache incubation now).</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/get-involved-section.html b/site/trunk/site-publish/get-involved-section.html
new file mode 100644
index 0000000000..dc19ff333a
--- /dev/null
+++ b/site/trunk/site-publish/get-involved-section.html
@@ -0,0 +1,214 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Get Involved Section</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55916">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Get Involved Section">Get Involved Section</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="GetInvolvedSection-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="GetInvolvedSection-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-involved-projects-panel.html b/site/trunk/site-publish/getting-involved-projects-panel.html
new file mode 100644
index 0000000000..d4ada27baa
--- /dev/null
+++ b/site/trunk/site-publish/getting-involved-projects-panel.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Involved - Projects Panel</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82213">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Involved - Projects Panel">Getting Involved - Projects Panel</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-involved-projects.html b/site/trunk/site-publish/getting-involved-projects.html
new file mode 100644
index 0000000000..71641662b9
--- /dev/null
+++ b/site/trunk/site-publish/getting-involved-projects.html
@@ -0,0 +1,212 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Involved - Projects</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82199">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Involved - Projects">Getting Involved - Projects</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="GettingInvolved-Projects-Projectsforthebuddingcontributor..."></A>Projects for the budding contributor...</H2>
+
+
+<P>This page enlists some ideas that can be taken up for implementation and contribution, by anybody interested in Apache Tuscany - University Students, SCA and SOA enthusiasts...</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">1. Consuming SCA services from Google Gadgets</FONT></H3>
+
+
+<P>Summary : Integrate Tuscany and Apache Shindig to mash-up Google gadgets and backend SCA service components (Web Services, existing JEE services etc)</P>
+
+<P>Use SCA to model references from Javascript gadgets to server-side services, and provide transparent access to these services (by injecting Javascript proxies into the gadgets, similar to what Tuscany currently does with its SCA Widget component support).</P>
+
+<P>Use SCA composites to configure and assemble the gadgets together as well, allowing the application developer to use a consistent SCA-based assembly model for client-side mashups, server-side compositions and mixes of the two.</P>
+
+<P>One possible scenario would be to construct a Stock Quote widget, that would get the quotes trough a SCA Service</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">2. Data Services (Implementation.data.jpa) </FONT></H3>
+
+<P>Create a new implementation type that would facilitate and simplify the access to Relation Database using JPA.<BR>
+A component using this new implementation type would define itself in the composite as :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   ...
+   &lt;implementation.data.jpa db=<SPAN class="code-quote">&quot;...&quot;</SPAN> table=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">2. Data Feeds and Data Services</FONT></H3>
+
+
+<P>Summary : Extend the Tuscany Atom Binding to work with data from relational databases to provide data services. This could be done by completing/enhancing the experimental Tuscany Data component type.</P>
+
+<P>One possible scenario would be to modify the store sample/tutorial to provide a Catalog implementation exposing catalog rows from a relation database.</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">3.Integrate Java SCA with PHP</FONT></H3>
+
+<P>PHP PECL project provides a PHP implementation of the Service Component Architecture (SCA) programming model (see <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=WWW&linkCreation=true&fromPageId=82199" class="createlink">WWW</A> <A href="http://pecl.php.net/package/SCA_SDO" class="external-link" rel="nofollow">http://pecl.php.net/package/SCA_SDO</A>). SCA is a programming model which allows you to assemble applications using a Service-Oriented Architecture style. This includes producing and consuming Web services of various types, including soap/http, json-rpc, REST,Atom. Looking into the Tuscany Apache Incubator project (see <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=WWW&linkCreation=true&fromPageId=82199" class="createlink">WWW</A> <A href="http://incubator.apache.org/tuscany/" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/</A> ), which provides a Java-based implementation of SCA. This runtime is extensible for different implementation types, and currently supports things like BPEL, OSGi, Java (POJOs), Spring, JavaScript and XQuery. </P>
+
+<P>I think it would make a very interesting and challenging project to extend Apache Tuscany to supports the concept of a PHP implementation type. This implementation type would be used to include PHP SCA enabled applications in an assembly which might also include any of the other Apache Tuscany implementation types. A realistic scenario for this solution might be a PHP Web front end to a Java business application. Tuscany includes a Java &quot;store&quot; application which could be converted to demonstrate the final deliverables. The solution would also require extensions to the PHP SCA project to enable existing PHP SCA service configuration to be externally overridden by Tuscany. The major work items would be as follows: </P>
+<UL>
+	<LI>Extend PHP SCA to support external configuration of services (PHP Scripting skills).</LI>
+	<LI>Extend Apache Tuscany to provide a PHP implementation type (Java and XML/XML Schema skills).</LI>
+	<LI>Extend Apache Tuscany to support PHP SCA as a deployment target(Java skills).</LI>
+</UL>
+
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">4.Integrate Java SCA and JBI</FONT></H3>
+<P>Build some Tuscany extensions to integrate JBI components into SCA - eg an SCA binding extension that supports running JBI binding components and maybe an SCA implementation extension that supports running JBI service engines. Both Tuscany/SCA and JBI have the concept of plugable extensions so these Tuscany extensions would be kind of adapters from the Tuscany extension APIs to the JBI APIs and you'd end up being able to drop a standard JBI binding component jar into the Tuscany runtime and have that used in an SCA assembly.</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">5.Bring Native SCA project to Spec 1.0 level</FONT></H3>
+<P>Help is needed to enhance Native SCA to support spec 1.0 level.</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">6.Ability to use C++ and Java in a composition</FONT></H3>
+<P>Integration between Native SCA and Java SCA. The ability to use legacy or new C++ type applications and integrate them into overall SOA solution which is composed of Java and C++.</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">7.Interop with .Net</FONT></H3>
+<P>How to integrate with .net.</P>
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">8. Data Binding for Google Protocol Buffers </FONT></H3>
+<P>Google just introduced Binary Encoding Format: Protocol Buffers. Is anybody interested in developing a databinding for Tuscany to support it?</P>
+
+<P><A href="http://www.infoq.com/news/2008/07/google-protocol-buffers" class="external-link" rel="nofollow">http://www.infoq.com/news/2008/07/google-protocol-buffers</A></P>
+
+
+<H3><A name="GettingInvolved-Projects-"></A><FONT color="#003366">8. Contribute to projects under roadmaps</FONT></H3>
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=put%20roadmap%20link&linkCreation=true&fromPageId=82199" class="createlink">put roadmap link</A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-involved.html b/site/trunk/site-publish/getting-involved.html
new file mode 100644
index 0000000000..a410e5b722
--- /dev/null
+++ b/site/trunk/site-publish/getting-involved.html
@@ -0,0 +1,255 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47460">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Involved">Getting Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="GettingInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="GettingInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-source.html b/site/trunk/site-publish/getting-source.html
new file mode 100644
index 0000000000..f0f433f0c4
--- /dev/null
+++ b/site/trunk/site-publish/getting-source.html
@@ -0,0 +1,149 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Source</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48691">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="delete-this-page-using-sdo-java.html" title="Delete This Page - Using SDO Java">Delete This Page - Using SDO Java</A>&nbsp;&gt;&nbsp;<A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">Set up SDO Development Environment</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Source">Getting Source</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SDO Java - Getting Source</B></DIV></DIV>
+
+<P>You have two options for obtaining SDO Java source code; you can either download a source code distribution, or you can extract the source code from our svn repository. Note that if you want to contribute to the development, then you'll need to take the latter approach, since creating patches depends on the svn environment.</P>
+
+<H4><A name="GettingSource-Downloadingasourcedistribution"></A>Downloading a source distribution</H4>
+
+<P>You can <A href="sdo-java-download.html" title="SDO Java Download">download</A> SDO Java source distributions (SDO API and Implementation), and either follow the instructions in the BUILDING.txt file to recreate the SDO Java binary distribution, or you can extract the archives and follow the <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">instructions</A> to establish a Maven or Eclipse development environment.</P>
+
+<H4><A name="GettingSource-ExtractingsourcecodefromSVN"></A>Extracting source code from <A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">SVN</A></H4>
+
+<P>If you want to contribute to SDO development you'll need to follow this approach to getting source code. First you'll need a subversion client installed on your machine. These instructions demonstrate the command line interface. If you choose to install a graphical client you should readily be able to map these instructions to the required interactions.</P>
+<UL>
+	<LI>Install your SVN client and ensure it is on your execution path</LI>
+	<LI>Create an empty local directory (referred to as &lt;sdo-source-root&gt; below)</LI>
+	<LI>execute the command: svn checkout <A href="https://svn.apache.org/repos/asf/tuscany/java/sdo/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/java/sdo/</A></LI>
+	<LI>if you get a message asking you whether you want to accept the server certificate, reply yes</LI>
+</UL>
+
+
+<P>Now follow the <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">instructions</A> to establish a Maven or Eclipse development environment.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-started-build-your-first-web-services-with-tuscany.html b/site/trunk/site-publish/getting-started-build-your-first-web-services-with-tuscany.html
new file mode 100644
index 0000000000..1b5387dcf2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-build-your-first-web-services-with-tuscany.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Getting Started - Build your first web services with Tuscany : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=82969">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started - Build your first web services with Tuscany">Getting Started - Build your first web services with Tuscany</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png
new file mode 100644
index 0000000000..48bf481e1d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png.jpeg
new file mode 100644
index 0000000000..4a05eb3baa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png
new file mode 100644
index 0000000000..656465d618
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png.jpeg
new file mode 100644
index 0000000000..268ad62251
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png
new file mode 100644
index 0000000000..80b2822afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png.jpeg
new file mode 100644
index 0000000000..5273a016d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/New_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png
new file mode 100644
index 0000000000..796f560dd8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png.jpeg
new file mode 100644
index 0000000000..3af6676b6f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png
new file mode 100644
index 0000000000..c1da921ee5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png.jpeg
new file mode 100644
index 0000000000..779e369a2e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feed.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png
new file mode 100644
index 0000000000..6e7c4bb227
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png.jpeg
new file mode 100644
index 0000000000..82fe4d8111
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/atom_feeds_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png
new file mode 100644
index 0000000000..f7c0fd012b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png.jpeg
new file mode 100644
index 0000000000..dd108d061a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png
new file mode 100644
index 0000000000..84f439c41c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png.jpeg
new file mode 100644
index 0000000000..a0828163fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png
new file mode 100644
index 0000000000..60bce5ee98
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png.jpeg
new file mode 100644
index 0000000000..cab8b0264b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/class_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png
new file mode 100644
index 0000000000..9ef69db7d0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png.jpeg
new file mode 100644
index 0000000000..99dd341348
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png
new file mode 100644
index 0000000000..00d3edd3d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png.jpeg
new file mode 100644
index 0000000000..58e4733cf4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/first_composite.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png
new file mode 100644
index 0000000000..85a24d4a27
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png.jpeg
new file mode 100644
index 0000000000..71c6705477
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/folder_structure.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png
new file mode 100644
index 0000000000..5c342b8194
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png.jpeg
new file mode 100644
index 0000000000..ee25c45cba
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/interface_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png
new file mode 100644
index 0000000000..902fe75507
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png.jpeg
new file mode 100644
index 0000000000..9ed36e4e23
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png
new file mode 100644
index 0000000000..95b51cf26a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png.jpeg
new file mode 100644
index 0000000000..be327e7e1f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png
new file mode 100644
index 0000000000..07cd5a0502
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png.jpeg
new file mode 100644
index 0000000000..6b4cd2b9b4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png
new file mode 100644
index 0000000000..50297b3afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png.jpeg
new file mode 100644
index 0000000000..8fdf13e716
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png
new file mode 100644
index 0000000000..5f051094b9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png.jpeg
new file mode 100644
index 0000000000..22d226ce07
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png
new file mode 100644
index 0000000000..8329b143de
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png.jpeg
new file mode 100644
index 0000000000..90231cf672
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png
new file mode 100644
index 0000000000..c0b12eea7a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png.jpeg
new file mode 100644
index 0000000000..4537f7d914
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/new_java_project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png
new file mode 100644
index 0000000000..9de01ff4d5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png.jpeg
new file mode 100644
index 0000000000..745f2dbfbd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/project_layout.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png
new file mode 100644
index 0000000000..38077052b3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png.jpeg
new file mode 100644
index 0000000000..32e3de3909
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/release_zips.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png
new file mode 100644
index 0000000000..7dba24bd53
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png.jpeg
new file mode 100644
index 0000000000..00fa4a3ca4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png
new file mode 100644
index 0000000000..7d51969a8a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png.jpeg
new file mode 100644
index 0000000000..529ac57071
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/source_attachment_config.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png
new file mode 100644
index 0000000000..988c62fae7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png.jpeg
new file mode 100644
index 0000000000..e52776334f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png
new file mode 100644
index 0000000000..834ef26e35
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png.jpeg
new file mode 100644
index 0000000000..7247d60368
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png
new file mode 100644
index 0000000000..c71b600146
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png.jpeg
new file mode 100644
index 0000000000..0ecef780b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png
new file mode 100644
index 0000000000..2560148e19
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png.jpeg
new file mode 100644
index 0000000000..d05d2288af
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_page_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png
new file mode 100644
index 0000000000..f0d1999ff2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png.jpeg
new file mode 100644
index 0000000000..fab518699e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png
new file mode 100644
index 0000000000..eb6bd340d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png.jpeg
new file mode 100644
index 0000000000..404c40daf8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png
new file mode 100644
index 0000000000..81119985d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png.jpeg
new file mode 100644
index 0000000000..0159ecc040
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png
new file mode 100644
index 0000000000..5aaf5ed3fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png.jpeg
new file mode 100644
index 0000000000..6a5e9220cb
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png
new file mode 100644
index 0000000000..217d10ed25
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png.jpeg
new file mode 100644
index 0000000000..9c90a17f3a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_4.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png
new file mode 100644
index 0000000000..3586520e47
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png.jpeg
new file mode 100644
index 0000000000..3fa840138a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/store_project_5.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png
new file mode 100644
index 0000000000..d58afb88d1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png.jpeg
new file mode 100644
index 0000000000..7ade1f20e5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png
new file mode 100644
index 0000000000..fe79cf56c7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png.jpeg
new file mode 100644
index 0000000000..d953ca2af1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-release-10.html b/site/trunk/site-publish/getting-started-with-tuscany-release-10.html
new file mode 100644
index 0000000000..58106f05ac
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-release-10.html
@@ -0,0 +1,726 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Getting Started with Tuscany Release 1.0 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=67902">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started with Tuscany Release 1.0">Getting Started with Tuscany Release 1.0</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="GettingStartedwithTuscanyRelease1.0-Ready%2CSet%2CGoGettingstartedwithTuscany"></A>Ready, Set, Go - Getting started with Tuscany</H1>
+
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-InstalltheTuscanyDistribution%26nbsp%3B"></A>Install the Tuscany Distribution&nbsp;</H2>
+
+<P>The first thing you do is to create a folder on you disk into which you will download the TUSCANY distribution.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/tuscany_folder.png" align="absmiddle" border="0"></P>
+
+<P>Next you download the latest release distribution. Launch your browser and enter one of the<BR>
+following URL's.<BR>
+Latest Release - <SPAN class="nobr"><A href="http://cwiki.apache.org/TUSCANY/sca-java-releases.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/TUSCANY/sca-java-releases.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+Download both the <B><EM>bin zip</EM></B> as well as the <B><EM>src zip</EM></B> to the folder that you created on your disk. Once you completed the download you should see the following on your disk.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/release_zips.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+Next you unzip the <B><EM>bin zip</EM></B> in place, you should see the following folder file structure on your disk after unzip is complete.<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/folder_structure.png" align="absmiddle" border="0"></P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-SetupEclipseforTuscany"></A>Setup Eclipse for Tuscany</H2>
+
+<P>Start Eclipse and create a User Library to contain the TUSCANY runtime jar's as well as their<BR>
+depending jar's.</P>
+
+<P>From the menu bar select <B><EM>Window</EM></B> and then <B><EM>Preferences...</EM></B> . The Preferences dialog will appear,<BR>
+in its left navigation tree select <B><EM>Java</EM></B>, followed by <B><EM>Build Path</EM></B>, and followed by <B><EM>User Libraries</EM></B>.<BR>
+Select the <B><EM>New...</EM></B> pushbutton on the right of the New Libraries dialog to create a new user library.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/New_User_Lib.png" align="absmiddle" border="0"></P>
+
+<P>The user library created is empty, select the <B><EM>Add JARs...</EM></B> pushbutton on the right to add all the<BR>
+jar's from your Tuscany installation <B><EM>lib folder</EM></B>. When completed all the jar's will appear under the<BR>
+TUSCANY user library.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/Tuscany_User_Lib.png" align="absmiddle" border="0"></P>
+
+<P>Since some of you maybe interested in <B><EM>debugging</EM></B> also the Tuscany runtime code we will attach<BR>
+the Tuscany source to the Tuscany runtime jar in the following step. In the User Libraies dialog<BR>
+scroll down until you see the <B><EM>Tuscany runtime jar</EM></B> and select its <B><EM>Source attachment.</EM></B></P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/source_attachment.png" align="absmiddle" border="0"></P>
+
+<P>Select the <B><EM>Edit...</EM></B> pushbutton on the right and in the Edit dialog use the <B><EM>External File...</EM></B> pushbutton<BR>
+to the select the Tuscany <B><EM>src zip</EM></B> that we downloaded earlier.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/source_attachment_config.png" align="absmiddle" border="0"></P>
+
+<P>Select <B><EM>OK</EM></B> to complete this and the Preferences dialog, and you are done with the Tuscany setup<BR>
+for Eclipse.</P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-Createyour1stCompositeServiceApplication"></A>Create your 1st Composite Service Application</H2>
+
+<P>The following shows the composition diagram for the composite service application you are about<BR>
+to create.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/first_composite.png" align="absmiddle" border="0"></P>
+
+<P>The composite service application you will create is a composition of four services. The composed<BR>
+service provided is that of an on-line store.<BR>
+There is a Catalog service which you can ask for catalog items, and depending on its currency<BR>
+code property configuration it will provide the item prices in USD or EUR. The Catalog service is not<BR>
+doing the currency conversion itself it references a CurrencyConverter service to do that task. Then<BR>
+there is the ShoppingCart service into which items chosen from the catalog can be added, it is<BR>
+implemented as a REST service. The Catalog is bound using the JSONRPC binding, and the<BR>
+ShoppingCart service is bound using the ATOM binding. Finally there is the Store user facing<BR>
+service that provides the browser based user interface of the store. The Store service makes use of<BR>
+the Catalog and ShoppingCart service using the JSONRPC, and ATOM binding respectively.</P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-CreateaJavaProject"></A>Create a Java Project</H2>
+
+<P>In this step you create a Java Project in Eclipse to hold the composite service application.<BR>
+Click on the <B><EM>New Java Project</EM></B> button <IMG src="getting-started-with-tuscany-release-10.data/new_java_project.png" align="absmiddle" border="0">&nbsp; in the toolbar to launch the project creation dialog.<BR>
+Next you enter &quot;store&quot; as the <B><EM>Project name</EM></B>, and for <B><EM>Project Layout</EM></B> select <B><EM>Create separate</EM></B><BR>
+<B><EM>folders for sources and class files.</EM></B><BR>
+<IMG src="getting-started-with-tuscany-release-10.data/new_java_project_dlg.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/project_layout.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+Hit the <B><EM>Next</EM></B> button, and on the following page go to the <B><EM>Libraries</EM></B> tab. Use the <B><EM>Add Library...</EM></B><BR>
+button on the right to add the TUSCANY user library to the project.<BR>
+&nbsp;<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/new_java_project_lib.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+&nbsp;<BR>
+Hit the <B><EM>Finish</EM></B> button to complete the <B><EM>New Java Project</EM></B> dialog to create the &quot;store&quot; java project.&nbsp;<BR>
+&nbsp;<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/new_java_project_folder.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-ConstructServices"></A>Construct Services</H2>
+
+<P>First you create two package folders into which later in this step you place service implementations.<BR>
+Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <IMG src="getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png" align="absmiddle" border="0"> in the toolbar to launch<BR>
+the package creation dialog.</P>
+
+<P>Next you enter &quot;services&quot; as the package <B><EM>Name</EM></B>, and press the <B><EM>Finish</EM></B> button to complete the<BR>
+dialog.<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/new_java_pkg_dlg.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+Repeat the previous step to create another package named &quot;ufservices&quot;. The store project now<BR>
+should look as follows.<BR>
+&nbsp;<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/new_java_pkg_folder.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+In the following you will place in the &quot;services&quot; package the regular services, and in the &quot;ufservices&quot;<BR>
+package the user facing services of the composite service application you create.</P>
+
+<H3><A name="GettingStartedwithTuscanyRelease1.0-Catalog"></A><EM>Catalog</EM></H3>
+
+<P>In this step you create the Catalog service interface and implementation.<BR>
+Select the &quot;services&quot; package. Next you click on the dropdown arrow next to the <B><EM>New Java Class</EM></B><BR>
+button&nbsp; <IMG src="getting-started-with-tuscany-release-10.data/class_btn.png" align="absmiddle" border="0">&nbsp; and select the <B><EM>New Java Interface</EM></B>&nbsp;&nbsp;&nbsp;<IMG src="getting-started-with-tuscany-release-10.data/interface_btn.png" align="absmiddle" border="0"> option from the dropdown list. In the dialog<BR>
+enter &quot;Catalog&quot; as the <B><EM>Name</EM></B> of the interface and select the Finish button to complete the dialog.<BR>
+The Java editor will open on the new created Java interface. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java interface code snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Catalog {
+    <SPAN class="code-object">String</SPAN>[] get();
+}</PRE>
+</DIV></DIV>
+<P>Select the &quot;services&quot; package again. Select the <B><EM>New Java Class</EM></B> button <IMG src="getting-started-with-tuscany-release-10.data/class_btn.png" align="absmiddle" border="0"> . In the dialog enter<BR>
+&quot;CatalogImpl&quot; as the <B><EM>Name</EM></B> of the class, add &quot;Catalog&quot; as the interface this class implements, and<BR>
+then select <B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Property;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Reference;
+<SPAN class="code-keyword">public</SPAN> class CatalogImpl <SPAN class="code-keyword">implements</SPAN> Catalog {
+	@Property
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> currencyCode = <SPAN class="code-quote">&quot;USD&quot;</SPAN>;
+	@Reference
+	<SPAN class="code-keyword">public</SPAN> CurrencyConverter currencyConverter;
+	<SPAN class="code-keyword">private</SPAN> List&lt;<SPAN class="code-object">String</SPAN>&gt; catalog = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;<SPAN class="code-object">String</SPAN>&gt;();
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		<SPAN class="code-object">String</SPAN> currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
+		catalog.add(<SPAN class="code-quote">&quot;Apple - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 2.99f));
+		catalog.add(<SPAN class="code-quote">&quot;Orange - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 3.55f));
+		catalog.add(<SPAN class="code-quote">&quot;Pear - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 1.55f));
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN>[] get() {
+		<SPAN class="code-object">String</SPAN>[] catalogArray = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">String</SPAN>[catalog.size()];
+		catalog.toArray(catalogArray);
+		<SPAN class="code-keyword">return</SPAN> catalogArray;
+	}
+}</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.<BR>
+<IMG src="getting-started-with-tuscany-release-10.data/store_project.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+<B>Note:</B> CatalogImpl is red x'ed because it makes use of the CurrencyConverter interface that we<BR>
+have not implemented yet.<BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscanyRelease1.0-CurrencyConverter"></A><EM>CurrencyConverter</EM></H3>
+
+<P>In this step you create the CurrencyConverter service interface and implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.<BR>
+First create a Java interface in the &quot;services&quot; package named &quot;CurrencyConverter&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java interface code snippet into it.<BR>
+&nbsp;&nbsp;</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CurrencyConverter {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrenycCode,
+	<SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">float</SPAN> amount);
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode);
+}</PRE>
+</DIV></DIV>
+<P>Next create a Java class in the &quot;services&quot; package named &quot;CurrencyConverterImpl&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java class code snippet into it.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">public</SPAN> class CurrencyConverterImpl <SPAN class="code-keyword">implements</SPAN> CurrencyConverter {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrencyCode,
+		<SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">float</SPAN> amount) {
+		<SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+			<SPAN class="code-keyword">return</SPAN> amount;
+		<SPAN class="code-keyword">else</SPAN> 			<SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+				<SPAN class="code-keyword">return</SPAN> amount*0.7256f;
+		<SPAN class="code-keyword">return</SPAN> 0;
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode) {
+		<SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+			<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;$&quot;</SPAN>;
+		<SPAN class="code-keyword">else</SPAN>
+			<SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+				<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;&euro;&quot;</SPAN>;
+		<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;?&quot;</SPAN>;
+	}
+}</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_project_1.png" align="absmiddle" border="0"></P>
+
+<H3><A name="GettingStartedwithTuscanyRelease1.0-ShoppingCart"></A><EM>ShoppingCart</EM></H3>
+
+<P>In this step you create the ShoppingCart service implementation.</P>
+
+<P>You follow the same steps that you learned previously to create the implementation.</P>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;ShoppingCartImpl&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following Java class code snippet into it.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> java.util.Date;
+<SPAN class="code-keyword">import</SPAN> java.util.HashMap;
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+<SPAN class="code-keyword">import</SPAN> java.util.UUID;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.feed.collection.Collection;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Content;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Entry;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Feed;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Link;
+<SPAN class="code-keyword">public</SPAN> class ShoppingCartImpl <SPAN class="code-keyword">implements</SPAN> Collection {
+	<SPAN class="code-comment">// needs to change to instance <SPAN class="code-keyword">var</SPAN> once conversation scope works
+</SPAN>	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Map&lt;<SPAN class="code-object">String</SPAN>, Entry&gt; cart = <SPAN class="code-keyword">new</SPAN> HashMap&lt;<SPAN class="code-object">String</SPAN>, Entry&gt;();
+	<SPAN class="code-keyword">public</SPAN> Feed getFeed() {
+		Feed feed = <SPAN class="code-keyword">new</SPAN> Feed();
+		feed.setTitle(<SPAN class="code-quote">&quot;shopping cart&quot;</SPAN>);
+		Content subtitle = <SPAN class="code-keyword">new</SPAN> Content();
+		subtitle.setValue(<SPAN class="code-quote">&quot;Total : &quot;</SPAN> + getTotal());
+		feed.setSubtitle(subtitle);
+		feed.getEntries().addAll(cart.values());
+		<SPAN class="code-keyword">return</SPAN> feed;
+	}
+	<SPAN class="code-keyword">public</SPAN> Entry get(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">return</SPAN> cart.get(id);
+	}
+	<SPAN class="code-keyword">public</SPAN> Entry post(Entry entry) {
+		<SPAN class="code-object">String</SPAN> id = <SPAN class="code-quote">&quot;cart-&quot;</SPAN> + UUID.randomUUID().toString();
+		entry.setId(id);
+		Link link = <SPAN class="code-keyword">new</SPAN> Link();
+		link.setRel(<SPAN class="code-quote">&quot;edit&quot;</SPAN>);
+		link.setHref(&quot;&quot; + id);
+		entry.getOtherLinks().add(link);
+		link = <SPAN class="code-keyword">new</SPAN> Link();
+		link.setRel(<SPAN class="code-quote">&quot;alternate&quot;</SPAN>);
+		link.setHref(&quot;&quot; + id);
+		entry.getAlternateLinks().add(link);
+		entry.setCreated(<SPAN class="code-keyword">new</SPAN> Date());
+		cart.put(id, entry);
+		<SPAN class="code-keyword">return</SPAN> entry;
+	}
+		<SPAN class="code-keyword">public</SPAN> Entry put(<SPAN class="code-object">String</SPAN> id, Entry entry) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		entry.setUpdated(<SPAN class="code-keyword">new</SPAN> Date());
+		cart.put(id, entry);
+		<SPAN class="code-keyword">return</SPAN> entry;
+	}
+	<SPAN class="code-keyword">public</SPAN> void delete(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (id.equals(&quot;&quot;))
+			cart.clear();
+		<SPAN class="code-keyword">else</SPAN>
+			cart.remove(id);
+	} 	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> getTotal() {
+		<SPAN class="code-object">float</SPAN> total = 0;
+		<SPAN class="code-object">String</SPAN> symbol = &quot;&quot;;
+		<SPAN class="code-keyword">if</SPAN> (!cart.isEmpty()) {
+			Entry entry = cart.values().iterator().next();
+			<SPAN class="code-object">String</SPAN> item = ((Content)entry.getContents().get(0)).getValue();
+			symbol = item.substring(item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+2, item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+3);
+		}
+		<SPAN class="code-keyword">for</SPAN> (Entry entry : cart.values()) {
+			<SPAN class="code-object">String</SPAN> item = ((Content)entry.getContents().get(0)).getValue();
+			total += <SPAN class="code-object">Float</SPAN>.valueOf(item.substring(item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+3));
+		}
+		<SPAN class="code-keyword">return</SPAN> symbol + <SPAN class="code-object">String</SPAN>.valueOf(total);
+	}
+}</PRE>
+</DIV></DIV>
+<P><B>Note:</B> Since the Tuscany conversational support is not ready yet the cart is realized through a hack.<BR>
+The cart field is defined as static.</P>
+
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_project_2.png" align="absmiddle" border="0"><BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscanyRelease1.0-%7B%7DStore%7B%7D"></A><B><EM>Store</EM></B></H3>
+
+<P>In this step you create the user facing Store service that will run in a Web browser and provide the<BR>
+user interface to the other services you created.</P>
+
+<P>Select the &quot;ufservices&quot; package. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and then <B><EM>File</EM></B>. In<BR>
+the <B><EM>New File</EM></B> dialog enter &quot;store.html&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B> to complete the<BR>
+dialog.</P>
+
+<P>The Text editor will open on the new created html file. Replace the content of the editor by <B><EM>copy-paste</EM></B><BR>
+of the following html snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;html&gt;
+	&lt;head&gt;
+	&lt;title&gt;Store&lt;/title&gt;
+	&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;binding-atom.js&quot;</SPAN>&gt;&lt;/script&gt;
+	&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;binding-jsonrpc.js&quot;</SPAN>&gt;&lt;/script&gt;
+	&lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+	<SPAN class="code-comment">//Reference
+</SPAN>	catalog = (<SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;../Catalog&quot;</SPAN>)).Catalog;
+	<SPAN class="code-comment">//Reference
+</SPAN>	shoppingCart = <SPAN class="code-keyword">new</SPAN> AtomClient(<SPAN class="code-quote">&quot;../ShoppingCart&quot;</SPAN>);
+	function catalog_getResponse(items) {
+		<SPAN class="code-keyword">var</SPAN> catalog = &quot;&quot;;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			catalog += '&lt;input name=<SPAN class="code-quote">&quot;items&quot;</SPAN> type=<SPAN class="code-quote">&quot;checkbox&quot;</SPAN> value=&quot;' +
+				items[i] + '&quot;&gt;' + items[i]+ ' &lt;br&gt;';
+		document.getElementById('catalog').innerHTML=catalog;
+	}
+	function shoppingCart_getResponse(feed) {
+		<SPAN class="code-keyword">if</SPAN> (feed != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);
+			<SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+			<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+				<SPAN class="code-keyword">var</SPAN> item =
+					entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0].firstChild.nodeValue;
+				list += item + ' &lt;br&gt;';
+			}
+			document.getElementById(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>).innerHTML = list;
+			<SPAN class="code-keyword">if</SPAN> (list != &quot;&quot;)
+				document.getElementById('total').innerHTML =
+						feed.getElementsByTagName(<SPAN class="code-quote">&quot;subtitle&quot;</SPAN>)[0].firstChild.nodeValue;
+		}
+	}
+	function shoppingCart_postResponse(entry) {
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}
+	function addToCart() {
+		<SPAN class="code-keyword">var</SPAN> items = document.catalogForm.items;
+		<SPAN class="code-keyword">var</SPAN> j = 0;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			<SPAN class="code-keyword">if</SPAN> (items[i].checked) {
+				<SPAN class="code-keyword">var</SPAN> entry = '&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;' +
+</SPAN>							'&lt;title&gt;cart-item&lt;/title&gt;' +
+							'&lt;content type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;'+items[i].value+'&lt;/content&gt;' +
+							'&lt;/entry&gt;';
+				shoppingCart.post(entry, shoppingCart_postResponse);
+				items[i].checked = <SPAN class="code-keyword">false</SPAN>;
+			}
+	}
+	function checkoutCart() {
+		document.getElementById('store').innerHTML='&lt;h2&gt;' +
+			'Thanks <SPAN class="code-keyword">for</SPAN> Shopping With Us!&lt;/h2&gt;'+
+			'&lt;h2&gt;Your Order&lt;/h2&gt;'+
+			'&lt;form name=<SPAN class="code-quote">&quot;orderForm&quot;</SPAN> action=<SPAN class="code-quote">&quot;/ufs/store.html&quot;</SPAN>&gt;'+
+			document.getElementById('shoppingCart').innerHTML+
+			'&lt;br&gt;'+
+			document.getElementById('total').innerHTML+
+			'&lt;br&gt;'+
+			'&lt;br&gt;'+
+			'&lt;input type=<SPAN class="code-quote">&quot;submit&quot;</SPAN> value=<SPAN class="code-quote">&quot;Continue Shopping&quot;</SPAN>&gt;'+
+			'&lt;/form&gt;';
+		shoppingCart.delete(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+	}
+	function deleteCart() {
+		shoppingCart.delete(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+		document.getElementById('shoppingCart').innerHTML = &quot;&quot;;
+		document.getElementById('total').innerHTML = &quot;&quot;;
+	}
+	window.onload = function() {
+			catalog.get(catalog_getResponse);
+			shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+		}
+	&lt;/script&gt;
+	&lt;link rel=<SPAN class="code-quote">&quot;stylesheet&quot;</SPAN> type=<SPAN class="code-quote">&quot;text/css&quot;</SPAN> href=<SPAN class="code-quote">&quot;style.css&quot;</SPAN> /&gt;
+	&lt;/head&gt;
+	&lt;body&gt;
+	&lt;h1&gt;Store&lt;/h1&gt;
+	&lt;div id=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+	&lt;h2&gt;Catalog&lt;/h2&gt;
+	&lt;form name=<SPAN class="code-quote">&quot;catalogForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> &gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;addToCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Add to Cart&quot;</SPAN>&gt;
+	&lt;/form&gt;
+	&lt;br&gt;
+	&lt;h2&gt;Your Shopping Cart&lt;/h2&gt;
+	&lt;form name=<SPAN class="code-quote">&quot;shoppingCartForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;total&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;checkoutCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Checkout&quot;</SPAN>&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;deleteCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Empty&quot;</SPAN>&gt;
+		&lt;a href=<SPAN class="code-quote">&quot;../ShoppingCart/&quot;</SPAN>&gt;
+		&lt;img src=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//projects.apache.org/images/blue-icon.png&quot;</SPAN> border=<SPAN class="code-quote">&quot;0&quot;</SPAN>&gt;
+</SPAN>		&lt;/a&gt;
+	&lt;/form&gt;
+	&lt;/div&gt;
+	&lt;/body&gt;
+&lt;/html&gt;</PRE>
+</DIV></DIV>
+<P>Next select the &quot;ufservices&quot; package again. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;binding-jsonrpc.js&quot; for the <B><EM>File name</EM></B>, and then select<BR>
+<B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Text editor will open on the new created javascript file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the javascript snippet you find here:</P>
+
+<P><SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js" title="Visit page outside Confluence" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>Next select the &quot;ufservices&quot; package again. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;binding-atom.js&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created javascript file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following javascript snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">function AtomClient(uri) {
+	<SPAN class="code-keyword">this</SPAN>.uri=uri;
+	<SPAN class="code-keyword">this</SPAN>.get = function(id, responseFunction) {
+		<SPAN class="code-keyword">var</SPAN> xhr = <SPAN class="code-keyword">this</SPAN>.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			<SPAN class="code-keyword">if</SPAN> (xhr.readyState == 4) {
+				<SPAN class="code-keyword">if</SPAN> (xhr.status == 200) {
+					<SPAN class="code-keyword">if</SPAN> (responseFunction != <SPAN class="code-keyword">null</SPAN>)
+						responseFunction(xhr.responseXML);
+				} <SPAN class="code-keyword">else</SPAN> {
+				alert(<SPAN class="code-quote">&quot;get - Error getting data from the server&quot;</SPAN>);
+				}
+			}
+		}
+		xhr.open(<SPAN class="code-quote">&quot;GET&quot;</SPAN>, uri + id, <SPAN class="code-keyword">true</SPAN>);
+		xhr.send(<SPAN class="code-keyword">null</SPAN>);
+	}
+	<SPAN class="code-keyword">this</SPAN>.post = function (entry, responseFunction) {
+	<SPAN class="code-keyword">var</SPAN> xhr = <SPAN class="code-keyword">this</SPAN>.createXMLHttpRequest();
+	xhr.onreadystatechange = function() {
+		<SPAN class="code-keyword">if</SPAN> (xhr.readyState == 4) {
+			<SPAN class="code-keyword">if</SPAN> (xhr.status == 201) {
+				<SPAN class="code-keyword">if</SPAN> (responseFunction != <SPAN class="code-keyword">null</SPAN>)
+					responseFunction(xhr.responseXML);
+				} <SPAN class="code-keyword">else</SPAN> {
+					alert(<SPAN class="code-quote">&quot;post - Error getting data from the server&quot;</SPAN>);
+				}
+			}
+		}
+		xhr.open(<SPAN class="code-quote">&quot;POST&quot;</SPAN>, uri, <SPAN class="code-keyword">true</SPAN>);
+		xhr.setRequestHeader(<SPAN class="code-quote">&quot;Content-Type&quot;</SPAN>, <SPAN class="code-quote">&quot;application/atom+xml&quot;</SPAN>);
+		xhr.send(entry);
+	}
+	<SPAN class="code-keyword">this</SPAN>.put = function (id, entry, responseFunction) {
+		<SPAN class="code-keyword">var</SPAN> xhr = <SPAN class="code-keyword">this</SPAN>.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			<SPAN class="code-keyword">if</SPAN> (xhr.readyState == 4) {
+				<SPAN class="code-keyword">if</SPAN> (xhr.status == 200) {
+					<SPAN class="code-keyword">if</SPAN> (responseFunction != <SPAN class="code-keyword">null</SPAN>)
+						responseFunction(xhr.responseXML);
+				} <SPAN class="code-keyword">else</SPAN> {
+					alert(<SPAN class="code-quote">&quot;put - Error getting data from the server&quot;</SPAN>);
+				}
+			}
+		}
+		xhr.open(<SPAN class="code-quote">&quot;PUT&quot;</SPAN>, uri + id, <SPAN class="code-keyword">true</SPAN>);
+		xhr.setRequestHeader(<SPAN class="code-quote">&quot;Content-Type&quot;</SPAN>, <SPAN class="code-quote">&quot;application/atom+xml&quot;</SPAN>);
+		xhr.send(entry);
+	}
+	<SPAN class="code-keyword">this</SPAN>.delete = function (id, responseFunction) {
+		<SPAN class="code-keyword">var</SPAN> xhr = <SPAN class="code-keyword">this</SPAN>.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			<SPAN class="code-keyword">if</SPAN> (xhr.readyState == 4) {
+				<SPAN class="code-keyword">if</SPAN> (xhr.status == 200) {
+					<SPAN class="code-keyword">if</SPAN> (responseFunction != <SPAN class="code-keyword">null</SPAN>) responseFunction();
+				} <SPAN class="code-keyword">else</SPAN> {
+					alert(<SPAN class="code-quote">&quot;delete - Error getting data from the server&quot;</SPAN>);
+				}
+			}
+		}
+		xhr.open(<SPAN class="code-quote">&quot;DELETE&quot;</SPAN>, uri + id, <SPAN class="code-keyword">true</SPAN>);
+		xhr.send(<SPAN class="code-keyword">null</SPAN>);
+	}
+	<SPAN class="code-keyword">this</SPAN>.createXMLHttpRequest = function () {
+		<SPAN class="code-keyword">try</SPAN> {<SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> XMLHttpRequest();} <SPAN class="code-keyword">catch</SPAN>(e) {}
+		<SPAN class="code-keyword">try</SPAN> {<SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> ActiveXObject(<SPAN class="code-quote">&quot;Msxml2.XMLHTTP&quot;</SPAN>);} <SPAN class="code-keyword">catch</SPAN>(e) {}
+		<SPAN class="code-keyword">try</SPAN> {<SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> ActiveXObject(<SPAN class="code-quote">&quot;Microsoft.XMLHTTP&quot;</SPAN>);} <SPAN class="code-keyword">catch</SPAN>(e) {}
+		alert(<SPAN class="code-quote">&quot;XML http request not supported&quot;</SPAN>);
+		<SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">null</SPAN>;
+	}
+}</PRE>
+</DIV></DIV>
+<P><B>Note:</B> That we have to have the bindig-jsonrpc.js, and binding-atom.js local in our project is only<BR>
+temporary, so this step will be removed in the future.</P>
+
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P>&nbsp;<IMG src="getting-started-with-tuscany-release-10.data/store_project_3.png" align="absmiddle" border="0"></P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-ComposeServices"></A>Compose Services</H2>
+
+<P>Now that you have all the required service implementations you compose them together to provide<BR>
+the store composite service. The composition is stored in a .composite file.</P>
+
+<P>Select the &quot;src&quot; folder of the &quot;store&quot; project. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;store.composite&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created composite file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following composite snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:s=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN>
+</SPAN>	name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;ufs&quot;</SPAN>&gt;
+		&lt;t:implementation.resource location=<SPAN class="code-quote">&quot;ufservices&quot;</SPAN>/&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Resource&quot;</SPAN>&gt;
+			&lt;t:binding.http/&gt;
+		&lt;/service&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CatalogImpl&quot;</SPAN>/&gt;
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc/&gt;
+		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>/&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.ShoppingCartImpl&quot;</SPAN>/&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Collection&quot;</SPAN>&gt;
+			&lt;t:binding.atom/&gt;
+		&lt;/service&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CurrencyConverterImpl&quot;</SPAN>/&gt;
+	&lt;/component&gt;
+&lt;/composite&gt;</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_project_4.png" align="absmiddle" border="0"><BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-LaunchServices"></A>Launch Services</H2>
+
+<P>In this step you create the code to launch the Tuscany runtime with the new store composite<BR>
+service you created.</P>
+
+<P>Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <IMG src="getting-started-with-tuscany-release-10.data/new_java_pkg_btn.png" align="absmiddle" border="0">&nbsp; in the toolbar to start the</P>
+
+<P>package creation dialog. Use the dialog to create a new package named &quot;launch&quot;.&nbsp;<BR>
+Select the &quot;launch&quot; package. Select the <B><EM>New Java Class</EM></B> button <IMG src="getting-started-with-tuscany-release-10.data/class_btn.png" align="absmiddle" border="0">&nbsp; . In the dialog enter &quot;Launch&quot;<BR>
+as the <B><EM>Name</EM></B> of the class, check the <B><EM>checkbox for creating a main method stub</EM></B>, and then select<BR>
+<B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> launch;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.host.embedded.SCADomain;
+<SPAN class="code-keyword">public</SPAN> class Launch {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+		<SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Starting ...&quot;</SPAN>);
+		SCADomain scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;store.composite&quot;</SPAN>);
+		<SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;store.composite ready <SPAN class="code-keyword">for</SPAN> big business !!!&quot;</SPAN>);
+		<SPAN class="code-object">System</SPAN>.out.println();
+		<SPAN class="code-object">System</SPAN>.in.read();
+		scaDomain.close();
+	}
+}</PRE>
+</DIV></DIV>
+<P>&nbsp;After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_project_5.png" align="absmiddle" border="0"><BR>
+Congratulations you completed your 1st composite service applications, now its time to take it into<BR>
+action.</P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-UseServices"></A>Use Services</H2>
+
+<P>In this step you launch and use the store composite service application you created.</P>
+
+<P>First select the &quot;Launch&quot; class in the &quot;launch&quot; package of your &quot;store&quot; project. <B><EM>Right click</EM></B> to get the<BR>
+context menu, select <B><EM>Run As</EM></B>, and then <B><EM>Java application</EM></B>. The Tuscany runtime will start up adding<BR>
+the store composition to its domain.</P>
+
+<P>The Eclipse console will show the following messages.</P>
+
+<P>&nbsp;<IMG src="getting-started-with-tuscany-release-10.data/eclipse_console.png" align="absmiddle" border="0"></P>
+
+<P>&nbsp;Next Launch your Web browser and enter the following address:</P>
+
+<P><SPAN class="nobr"><A href="http://localhost:8080/ufs/store.html" title="Visit page outside Confluence" rel="nofollow">http://localhost:8080/ufs/store.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>&nbsp;</P>
+
+<P>&nbsp;You get to the Store user facing service of the composite service application.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_page.png" align="absmiddle" border="0"></P>
+
+<P>You can select items from the Catalog and add them to your Shopping Cart.</P>
+
+<P><B>Note:</B> When adding items for the first time you will be asked for <B><EM>userid and password</EM></B> by the<BR>
+browser. Enter &quot;admin&quot; for both.</P>
+
+<P> <IMG src="getting-started-with-tuscany-release-10.data/store_page_1.png" align="absmiddle" border="0"></P>
+
+<P>Since the ShoppingCart service is bound using the ATOM binding, you can also look at the<BR>
+shopping card content in ATOM feed form by clicking on the feed icon <IMG src="getting-started-with-tuscany-release-10.data/atom_feed.png" align="absmiddle" border="0">. You get the browsers default rendering for ATOM feeds.</P>
+
+<P>&nbsp;<IMG src="getting-started-with-tuscany-release-10.data/atom_feeds_page.png" align="absmiddle" border="0"></P>
+
+<P>&nbsp;Use the browser back button to get back to the Store page.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_page_2.png" align="absmiddle" border="0"></P>
+
+<P>And then you can Checkout to complete your order.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/store_page_3.png" align="absmiddle" border="0"></P>
+
+<H2><A name="GettingStartedwithTuscanyRelease1.0-ExploretheSamplesfromtheTuscanyDistribution"></A>Explore the Samples from the Tuscany Distribution</H2>
+
+<P>The sample folder of the Tuscany distribution provides a rich set of samples ready for you to explore.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/tuscany_samples_folder.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+In Eclipse create a New Java Project, specify the project name, select Create project from<BR>
+existing source, and specify the folder that contains the sample source.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/New_Calc_Java_Project.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+Use <B><EM>Next</EM></B> to get to the next page in the New Java Project dialog. There go to the <B><EM>Libraries</EM></B> tab, use<BR>
+the <B><EM>Add Library</EM></B>... pushbutton to add the JUnit library and the user library <B><EM>TUSCANY</EM></B>.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/New_Calc_Java_Project_lib.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+Finish the New Java Project dialog. You now have the sample project available in the Eclipse workbench.</P>
+
+<P><IMG src="getting-started-with-tuscany-release-10.data/calculator_proj_dlg.png" align="absmiddle" border="0"><BR>
+&nbsp;<BR>
+For the calculator sample that we've chosen go to its <B><EM>CalculatorClient</EM></B> class and select <B><EM>Run As &#45;&gt;</EM></B><BR>
+<B><EM>Java Application.</EM></B> You will see the following output in the console.</P>
+
+<P>&nbsp;<IMG src="getting-started-with-tuscany-release-10.data/calculator_eclipse_console.png" align="absmiddle" border="0"></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png
new file mode 100644
index 0000000000..571cb46381
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png.jpeg
new file mode 100644
index 0000000000..600348eba9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png
new file mode 100644
index 0000000000..33337a534d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png.jpeg
new file mode 100644
index 0000000000..7bc4855628
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png
new file mode 100644
index 0000000000..9802b38fa3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png.jpeg
new file mode 100644
index 0000000000..b571f57dd8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png
new file mode 100644
index 0000000000..cea563b09c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png.jpeg
new file mode 100644
index 0000000000..6d5dd226d3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculator4.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png
new file mode 100644
index 0000000000..89448ffc60
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png.jpeg
new file mode 100644
index 0000000000..c42fdc76f6
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.html b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.html
new file mode 100644
index 0000000000..c3067192c9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-the-command-line.html
@@ -0,0 +1,577 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Started with Tuscany ( using the Command Line)</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84815">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started with Tuscany ( using the Command Line)">Getting Started with Tuscany ( using the Command Line)</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Build Calculator Using Command Line</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-intro"><B>What this is about</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-setup"><B>Setup Environment</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-runcalculator"><B>Run An Existing Calculator Appliction</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-develop"><B>Build The Calculator Sample</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-assemble"><B>Assemble The Calculator Application</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-Deploy"><B>Deploy The Calculator Application</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-Bindings"><B>Reconfigure The Calculator Application</B></A></LI>
+	<LI><A href="#GettingStartedwithTuscany%2528usingtheCommandLine%2529-Implementation"><B>Use Alternative Implementation Types</B></A><BR>
+&nbsp;</LI>
+</UL>
+</DIV></DIV>
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-intro"></A><DIV class="" style="background-color: #C3CDA1;">What this is about</DIV>
+</H2>
+
+<P>This guide takes a command line based approach to getting started with Apache Tuscany Java SCA. For the Eclipse users amongst us there are other <A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">guides</A> that show how to install the distribution into Eclipse or how to exploit Tuscany SCA Java using the Eclipse plugin that is has been built as part of the project. This article however just uses the downloaded Tuscany SCA Java distribution, Java, Maven or Ant and the command line. So if you want to feel close to the action this is where to start!</P>
+
+<P>Tuscany ships with a number of samples. One of the most straightforward of these is the calculator sample. We will use this to make sure that you installation is working properly.  As the name indicates, this example performs typical calculator operations. It is given two numbers and asked to perform an operation on them. Our calculator will handle add, subtract, multiply and divide. </P>
+
+<P>By the end of this exercise you know how to develop, deploy and run the calculator application and how to reconfigure it to make it work for different environments.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-setup"></A><DIV class="" style="background-color: #C3CDA1;">Setup Environment</DIV>
+</H2>
+
+<P>First of all we will walk through running the calculator sample to make sure you installation is working correctly. Then we will walk through the steps taken to implement the calculator sample in the first place. Following this you should be familiar with how to build a basic SCA application that runs in a single, stand-alone, SCA runtime. The next step is to update the sample to use some of the other Tuscany SCA Java extensions. Finally we will use the calculator sample to show you how you can build a distributed Service Oriented Architecture using Tuscany SCA Java. </P>
+
+<UL>
+	<LI>Download the <A href="sca-java-releases.html" title="SCA Java Releases">Tuscany Java SCA release</A>.<BR>
+From this page you can get binary and source releases for both windows and linux. For this exercise you will need the binary release for your preferred platform. You can use the source code release but you will have to use Maven at all stages.</LI>
+	<LI>Download java<BR>
+<A href="http://java.sun.com/javase/downloads/index.jsp" class="external-link" rel="nofollow">Java 5</A></LI>
+	<LI>Download a build tool<BR>
+<A href="http://maven.apache.org/download.html" class="external-link" rel="nofollow">Maven 2.0.7+</A><BR>
+OR<BR>
+<A href="http://ant.apache.org/bindownload.cgi" class="external-link" rel="nofollow">Ant 1.7.0</A></LI>
+</UL>
+
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-runcalculator"></A><DIV class="" style="background-color: #C3CDA1;">Run An Existing Calculator Appliction</DIV>
+</H2>
+
+<P>Tuscan SCA provides a calculator sample with its binary distribution. You can find it in the samples/calculator directory. As shown below, this sample and every sample in Tuscany has a &quot;readme&quot; that explains how to run the sample, a *.png file that has shows how the SCA application looks like.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="getting-started-with-tuscany-using-the-command-line.data/calculator1.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Let's first run the sample before we go about building it. It is easy! Go to the directory ..\samples\calculator</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant run
+</PRE>
+</DIV></DIV>
+
+<P>Alternatively if you want to run the sample directly from the command line try the following.</P>
+
+<UL>
+	<LI>if you are using Windows issue the command:
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
+</PRE>
+</DIV></DIV></LI>
+	<LI>if you are using *nix issue the command:
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
+</PRE>
+</DIV></DIV></LI>
+</UL>
+
+
+<P>You should see the following result:</P>
+
+<P>3 + 2=5.0<BR>
+3 - 2=1.0<BR>
+3 * 2=6.0<BR>
+3 / 2=1.5</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="getting-started-with-tuscany-using-the-command-line.data/calculator2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>If you are using the source distribution then we suggest you use Maven to build and run the calculator sample because the tuscany-sca-manifest.jar is not provided with the source distribution. This jar is part of the binary distribution and collects together all of the tuscany jars in one place so that the java command line is nice and short when running samples.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-build"></A><DIV class="" style="background-color: #C3CDA1;">Build The Calculator Sample In Java</DIV>
+</H2>
+
+<P>This example illustrates how to define your application while staying focused on the business logic. It walks you through the steps of building the calculator sample. All connections between the components within the composite are local and described using Java interfaces.</P>
+
+<P><B>Step 1 - Define what building blocks are needed:</B> Think about how your application can be broken down into smaller functions/services. Each block is a logical unit of operation that can be used in the overall application. In this case, calculator application can be divided into five blocks: AddService block, SubstractService block, MultiplyService block and DivideService block and a main block that takes a request and routes it to the right operation. We have called this main block the CalculatorService  </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="getting-started-with-tuscany-using-the-command-line.data/calculatorblocks.png" style="border: 0px solid black"></SPAN></P>
+
+<P><B>Step 2 - Implement each block:</B> Now that you have identified the blocks of functionality in your application, you are ready to create each block. In SCA the blocks of functionality are referred to as components so let's look at how we implement a component. We'll take the AddService component as our first example. </P>
+
+<P>The AddService component will provide a service that adds two numbers together. The CalculatorService component uses the AddService component whenever it is asked to perform additions. If we were writing the AddService component in plain old Java we would start by describing a (Java) interface.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> AddService {
+
+    <SPAN class="code-object">double</SPAN> add(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2);
+}
+</PRE>
+</DIV></DIV>
+
+<P>Now, we provide an implementation of this interface.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class AddServiceImpl <SPAN class="code-keyword">implements</SPAN> AddService {
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> add(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2) {
+        <SPAN class="code-keyword">return</SPAN> n1 + n2;
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<P>But wait! Aren't we writing an SCA component? It must be more complicated than plain old Java interface and implementation, right? Well, actually, an SCA component can just be plain old Java so we have just done all the coding we needed to implement the SCA AddService component. We can use SCA to expose the service that the AddService component provides over any of the supported bindings, for example, WebServices, JMS or RMI, without changing the AddService implementation.</P>
+
+<P>Let's take a look at the CalculatorService component. This is interesting because it's going to call the AddService component. In the full application it will call the SubtractService, MultiplyService and DivideService components as well, but we will ignore these for the time being as they follow the same pattern as we will implement for the AddService component. </P>
+
+<P>Again we will start by defining an interface because CalcultorService is itself providing an interface that others will call.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CalculatorService {
+
+    <SPAN class="code-object">double</SPAN> add(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2);
+    <SPAN class="code-object">double</SPAN> subtract(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2);
+    <SPAN class="code-object">double</SPAN> multiply(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2);
+    <SPAN class="code-object">double</SPAN> divide(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2);
+}
+</PRE>
+</DIV></DIV>
+
+<P>Now we implement this interface. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class CalculatorServiceImpl <SPAN class="code-keyword">implements</SPAN> CalculatorService {
+
+    <SPAN class="code-keyword">private</SPAN> AddService addService;
+    <SPAN class="code-keyword">private</SPAN> SubtractService subtractService;
+    <SPAN class="code-keyword">private</SPAN> MultiplyService multiplyService;
+    <SPAN class="code-keyword">private</SPAN> DivideService divideService;
+   
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setAddService(AddService addService) {
+        <SPAN class="code-keyword">this</SPAN>.addService = addService;
+    }
+
+    ...set methods <SPAN class="code-keyword">for</SPAN> the other attributes would go here
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> add(<SPAN class="code-object">double</SPAN> n1, <SPAN class="code-object">double</SPAN> n2) {
+        <SPAN class="code-keyword">return</SPAN> addService.add(n1, n2);
+    }
+
+    ...implementations of the other methods would go here
+}
+</PRE>
+</DIV></DIV>
+
+<P>So we now have some components implemented using Java. Each component has a well defined interface, using Java interfaces in this case. Notice that these are just plain Java services with business logic and nothing else in them.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="getting-started-with-tuscany-using-the-command-line.data/calculator3.png" style="border: 0px solid black"></SPAN></P>
+
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-assemble"></A><DIV class="" style="background-color: #C3CDA1;">Assemble the Calculator Application</DIV>
+</H2>
+<P>So far we have created the components. How do we actually run the calculator application? Well of course the java programmer in us wants to get down to it, write a mainline to connect our two components together and run then. We could still do that easily in this case.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+
+        CalculatorServiceImpl calculatorService = <SPAN class="code-keyword">new</SPAN> CalculatorServiceImpl();
+        AddService            addService        = <SPAN class="code-keyword">new</SPAN> AddServiceImpl();
+        calculatorService.setAddService(addService);
+      
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-comment">// calls to other methods go here <SPAN class="code-keyword">if</SPAN> we have implemented SubtractService, MultiplyService, DivideService
+</SPAN>    }
+}
+</PRE>
+</DIV></DIV>
+
+<P>But this doesn't run using the Tuscany SCA runtime and extending this code to provide web services interfaces, for example, would be a little more complicated. What do we have to do to make it run in Tuscany where we get all things like web service support for free? Well, not much actually. First let's change the client to fire up the Tuscany SCA runtime before calling our components. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+
+        SCADomain scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>);
+        CalculatorService calculatorService = scaDomain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-comment">// calls to other methods go here <SPAN class="code-keyword">if</SPAN> we have implemented SubtractService, MultiplyService, DivideService
+</SPAN>
+        scaDomain.close();
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>You can see that we start by using a static method on SCADomain to create a new instance of itself. The SCADomain is a concept in SCA that represents the boundary of an SCA system. This could be distributed across many processors. For now, lets concentrate on getting this working inside a single Java VM. </P>
+
+<P>The parameter &quot;Calculator.composite&quot; refers to an XML file that tells SCA how the components in our calculator application are assembled into a working application. Here is the XML that's inside Calculator.composite. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+	&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;!-- You can add references to SubtractComponent, MultiplyComponent and DivideComponent  --&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;!-- definitions of SubtractComponent, MultiplyComponent and DivideComponent --&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In our case so far, we defined two components and we specify the Java implementation classes that Tuscany SCA needs to load to make them work in the .composite file. These are the classes we have just implemented.</P>
+
+<P>Also note that the CalculatorServiceComponent has a reference named &quot;addService&quot;. In the XML, this reference targets the AddServiceComponent. It is no coincidence that the reference name, &quot;addService&quot;, matches the name of the addService field we created when we implemented CalculatorServiceImpl. The Tuscany SCA runtime parses the information from the XML composite file and uses it to build the objects and relationships that represent our calculator application. It first creates instances of AddServiceImpl and CalcualtorSreviceImpl. It then injects a reference to the AddServiceImpl object into the addService field in the CalculatorServiceImpl object. If you look back at how we implemented the CalculatorService you will see an @Reference annotation that tells SCA which fields are expecting to be set automatically by SCA. This is equivalent to this piece of code from our normal Java client.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        CalculatorServiceImpl calculatorService = <SPAN class="code-keyword">new</SPAN> CalculatorServiceImpl();
+        AddService            addService        = <SPAN class="code-keyword">new</SPAN> AddServiceImpl();
+        calculatorService.setAddService(addService);
+</PRE>
+</DIV></DIV>
+
+<P>Once the composite file is loaded into the SCADomain our client code asks the SCADomain to give us a reference to the component called &quot;CalculatorServiceComponent&quot;. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        CalculatorService calculatorService = scaDomain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>We can now use this reference as though we had created it ourselves, for example, from the CalculatorServiceImpl.add() method implementation.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">return</SPAN> addService.add(n1, n2);
+</PRE>
+</DIV></DIV>
+
+<P>The SCA specifications often describe SCA applications is diagrammatic form. This often helps give a quick overview of what components are part of an application and how they are wired together. If we draw a diagram of what we have build in the calculator sample we come up with something like.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="getting-started-with-tuscany-using-the-command-line.data/calculator4.png" style="border: 0px solid black"></SPAN></P>
+
+<P>You will notice that diagrams are provided with all of our samples. If you like to take a visual approach to things this may help you become quickly familiar with the components in the samples. Take a look at the &quot;.png&quot; files in the top level directory of each sample.</P>
+
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-deploy"></A><DIV class="" style="background-color: #C3CDA1;">Deploy the Calculator Application</DIV>
+</H2>
+<P>The composite describes how SCA components are implemented and how they are assembled by wiring references to targets. This composite file has some dependencies, in this case the Java class and interface files that are used to implement the SCA components that it defines. The collection of composite files and other artifacts that are required to run an SCA application are collected together into one or more SCA contributions. A contribution can be a simple as a directory in a file system or could be packaged in, for example, a Jar file. SCA does not mandate any particular packing scheme. For our calculator sample you can imagine the contribution holding the calculator composite and all of its dependencies.  </P>
+
+<P>In fact if you look inside the jar file that the calculator sample produces, you will find the following</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+calculator/AddService.class
+calculator/AddServiceImpl.class
+calculator/CalculatorClient.class
+calculator/CalculatorService.class
+calculator/CalculatorServiceImpl.class
+calculator/DivideService.class
+calculator/DivideServiceImpl.class
+calculator/MultiplyService.class
+calculator/MultiplyServiceImpl.class
+calculator/SubtractService.class
+calculator/SubtractServiceImpl.class
+Calculator.composite
+</PRE>
+</DIV></DIV>
+<P>Which are all the artifacts that are required to run the calculator sample. We just need to add this contribution to the Tuscany SCA java runtime and then call the services that will be enabled.</P>
+
+<P>The samples in Tuscany come with an Ant build.xml file that allows the sample files to be rebuilt so if you want to experiment with the sample code you can do so and then recompile it. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant compile
+</PRE>
+</DIV></DIV>
+
+<P>Once recompiled you can run it as before in the <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Started%20with%20Tuscany%20(%20using%20the%20Command%20Line)#GettingStartedwithTuscany%2528usingtheCommandLine%2529-runcalculator" class="external-link" rel="nofollow">Running The Calculator Sample</A> section, for example, we provide a run target in the Ant build.xml file so the calculator sample can also be run using. </P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>ant run
+</PRE>
+</DIV></DIV>
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-bindings"></A><DIV class="" style="background-color: #C3CDA1;">Reconfigure The Calculator Application - Change Bindings</DIV>
+</H2>
+
+<P>Looking back, the client code we have written to start the calculator application using the Tuscany SCA runtime is no longer than a normal Java client for the application. However we do now have the XML composite file that describes how our application is assembled. </P>
+
+<P>This concept of assembly is a great advantage as our applications become more complex and we want to change them, reuse them, integrate them with other applications or just further develop them using a programming model consistent with all our other SCA applications. Regardless of what language is used to implement each of them. </P>
+
+<P>For example, lets say our calculator sample is so poweful and popular that we want to put it on the company intranet and let other people access it as a service directly from their browser based Web2.0 applications. It's at this point we would normally start reaching for the text books to work out how to make this happen. As we have an XML file that describes our application it's easy in Tuscany SCA. The following should do the trick. </P>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+
+     &lt;service name=<SPAN class="code-quote">&quot;CalculatorService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;CalculatorServiceComponent/CalculatorService&quot;</SPAN>&gt;
+         &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.CalculatorService&quot;</SPAN>/&gt;
+         &lt;binding.jsonrpc/&gt;
+     &lt;/service&gt;    
+
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;!-- references to SubtractComponent, MultiplyComponent and DivideComponent  --&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;!-- definitions of SubtractComponent, MultiplyComponent and DivideComponent --&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>All we have done is added the &lt;service&gt; element which tells Tuscany SCA how to expose our CalculatorServiceComponent as a JSONRPC service. Note that we didn't have to change the Java code of our components. This is just a configuration change. The helloworld-jsonrpc sample shows a working example of the jsonrpc binding that you can use as an example to change the calculator application to use JSONRPC.</P>
+
+<P>If we really wanted a SOAP/HTTP web service we can do that easily too. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+
+     &lt;service name=<SPAN class="code-quote">&quot;CalculatorService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;CalculatorServiceComponent/CalculatorService&quot;</SPAN>&gt;
+         &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.CalculatorService&quot;</SPAN>/&gt;
+         &lt;!-- ** Below we added info <SPAN class="code-keyword">for</SPAN> json binding ** --&gt;
+         &lt;binding.jsonrpc/&gt;
+         &lt;binding.ws/&gt;
+     &lt;/service&gt;    
+
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;!-- references to SubtractComponent, MultiplyComponent and DivideComponent  --&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;!-- definitions of SubtractComponent, MultiplyComponent and DivideComponent --&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>We have added binding.ws here so that your calculator service is available over JSONRPC <B>and</B> WebService bindings <B>at the same time</B>. The helloworld-ws-service and helloworld-ws-reference samples show you how to work with web services. </P>
+
+<P>SCA allows other kinds of flexibility. We can rewire our components, for example, using a one of the remote bindings, like RMI, we could have the CalculatorServiceComponent running on one machine wired to a remote version of the application running on another machine. The calculator-rmi-service and calculator-rmi-reference samples show the RMI binding at work.  </P>
+
+<H2><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-"></A><A name="GettingStartedwithTuscany%28usingtheCommandLine%29-implementation"></A><DIV class="" style="background-color: #C3CDA1;">Use Alternative Implementation Types </DIV>
+</H2>
+<P>We could also introduce components implemented in different languages, for example, let's add the SubtractServiceComponent implemented in Ruby.  </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN> /&gt;
+        &lt;!-- references to MultiplyComponent and DivideComponent  --&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.script script=<SPAN class="code-quote">&quot;calculator/SubtractServiceImpl.rb&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;!-- definitions of MultiplyComponent and DivideComponent --&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Of course we need the Ruby code that implements the component. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+def subtract(n1, n2)
+    <SPAN class="code-keyword">return</SPAN> n1 - n2
+end
+</PRE>
+</DIV></DIV>
+
+<P>The Tuscany SCA runtime handles wiring Java components to Ruby components and performs any required data transformations. The calculator-script sample shows different script languages in use. </P>
+
+<P>So, now that our application is described as an SCA assembly there are lots of possibilities as we further develop it and integrate it with other applications. </P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png
new file mode 100644
index 0000000000..48bf481e1d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png.jpeg
new file mode 100644
index 0000000000..4a05eb3baa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png
new file mode 100644
index 0000000000..656465d618
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png.jpeg
new file mode 100644
index 0000000000..268ad62251
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_Calc_Java_Project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png
new file mode 100644
index 0000000000..80b2822afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png.jpeg
new file mode 100644
index 0000000000..5273a016d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/New_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png
new file mode 100644
index 0000000000..796f560dd8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png.jpeg
new file mode 100644
index 0000000000..3af6676b6f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/Tuscany_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png
new file mode 100644
index 0000000000..c1da921ee5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png.jpeg
new file mode 100644
index 0000000000..779e369a2e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png
new file mode 100644
index 0000000000..6e7c4bb227
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png.jpeg
new file mode 100644
index 0000000000..82fe4d8111
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png
new file mode 100644
index 0000000000..f7c0fd012b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png.jpeg
new file mode 100644
index 0000000000..dd108d061a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png
new file mode 100644
index 0000000000..84f439c41c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png.jpeg
new file mode 100644
index 0000000000..a0828163fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/calculator_proj_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png
new file mode 100644
index 0000000000..60bce5ee98
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png.jpeg
new file mode 100644
index 0000000000..cab8b0264b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png
new file mode 100644
index 0000000000..9ef69db7d0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png.jpeg
new file mode 100644
index 0000000000..99dd341348
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png
new file mode 100644
index 0000000000..00d3edd3d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png.jpeg
new file mode 100644
index 0000000000..58e4733cf4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg
new file mode 100644
index 0000000000..534748845b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg.jpeg
new file mode 100644
index 0000000000..6d63cd1c5d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png
new file mode 100644
index 0000000000..85a24d4a27
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png.jpeg
new file mode 100644
index 0000000000..71c6705477
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/folder_structure.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg
new file mode 100644
index 0000000000..0357e5a253
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg.jpeg
new file mode 100644
index 0000000000..d71bfe84b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg
new file mode 100644
index 0000000000..457b4e7983
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg.jpeg
new file mode 100644
index 0000000000..e488e74fd2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_license.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg
new file mode 100644
index 0000000000..23ded64414
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg.jpeg
new file mode 100644
index 0000000000..8e88737cea
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_feature_verification.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg
new file mode 100644
index 0000000000..190036e382
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg.jpeg
new file mode 100644
index 0000000000..bbb6a5ef56
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_finish.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg
new file mode 100644
index 0000000000..ef1bd53888
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg.jpeg
new file mode 100644
index 0000000000..2fd587e991
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_installation.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg
new file mode 100644
index 0000000000..ced23f111a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg.jpeg
new file mode 100644
index 0000000000..83c882dbd7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_new_site.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg
new file mode 100644
index 0000000000..995daba70d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg.jpeg
new file mode 100644
index 0000000000..369f562ef2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_restart_eclipse.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg
new file mode 100644
index 0000000000..dcb2ce7afd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg.jpeg
new file mode 100644
index 0000000000..77ae3d0f92
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_search_results.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg
new file mode 100644
index 0000000000..c32031adcf
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg.jpeg
new file mode 100644
index 0000000000..b929427c48
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/install_update_sites.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png
new file mode 100644
index 0000000000..5c342b8194
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png.jpeg
new file mode 100644
index 0000000000..ee25c45cba
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png
new file mode 100644
index 0000000000..902fe75507
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png.jpeg
new file mode 100644
index 0000000000..9ed36e4e23
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png
new file mode 100644
index 0000000000..95b51cf26a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png.jpeg
new file mode 100644
index 0000000000..be327e7e1f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png
new file mode 100644
index 0000000000..07cd5a0502
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png.jpeg
new file mode 100644
index 0000000000..6b4cd2b9b4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png
new file mode 100644
index 0000000000..50297b3afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png.jpeg
new file mode 100644
index 0000000000..8fdf13e716
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png
new file mode 100644
index 0000000000..5f051094b9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png.jpeg
new file mode 100644
index 0000000000..22d226ce07
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png
new file mode 100644
index 0000000000..8329b143de
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png.jpeg
new file mode 100644
index 0000000000..90231cf672
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png
new file mode 100644
index 0000000000..c0b12eea7a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png.jpeg
new file mode 100644
index 0000000000..4537f7d914
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png
new file mode 100644
index 0000000000..9de01ff4d5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png.jpeg
new file mode 100644
index 0000000000..745f2dbfbd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg
new file mode 100644
index 0000000000..c06fec1d7c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg.jpeg
new file mode 100644
index 0000000000..2ed010eff4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png
new file mode 100644
index 0000000000..38077052b3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png.jpeg
new file mode 100644
index 0000000000..32e3de3909
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/release_zips.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg
new file mode 100644
index 0000000000..1ab42867a2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg.jpeg
new file mode 100644
index 0000000000..5339a41827
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png
new file mode 100644
index 0000000000..7dba24bd53
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png.jpeg
new file mode 100644
index 0000000000..00fa4a3ca4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg
new file mode 100644
index 0000000000..2eb5f64e93
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg.jpeg
new file mode 100644
index 0000000000..5d44c2a867
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png
new file mode 100644
index 0000000000..7d51969a8a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png.jpeg
new file mode 100644
index 0000000000..529ac57071
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/source_attachment_config.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png
new file mode 100644
index 0000000000..988c62fae7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png.jpeg
new file mode 100644
index 0000000000..e52776334f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png
new file mode 100644
index 0000000000..834ef26e35
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png.jpeg
new file mode 100644
index 0000000000..7247d60368
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png
new file mode 100644
index 0000000000..c71b600146
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png.jpeg
new file mode 100644
index 0000000000..0ecef780b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png
new file mode 100644
index 0000000000..2560148e19
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png.jpeg
new file mode 100644
index 0000000000..d05d2288af
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png
new file mode 100644
index 0000000000..f0d1999ff2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png.jpeg
new file mode 100644
index 0000000000..fab518699e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png
new file mode 100644
index 0000000000..eb6bd340d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png.jpeg
new file mode 100644
index 0000000000..404c40daf8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png
new file mode 100644
index 0000000000..81119985d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png.jpeg
new file mode 100644
index 0000000000..0159ecc040
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg
new file mode 100644
index 0000000000..a682bb2d74
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg.jpeg
new file mode 100644
index 0000000000..23b9f5c584
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png
new file mode 100644
index 0000000000..5aaf5ed3fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png.jpeg
new file mode 100644
index 0000000000..6a5e9220cb
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg
new file mode 100644
index 0000000000..7c7ed0a157
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg.jpeg
new file mode 100644
index 0000000000..c0aa95b56b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png
new file mode 100644
index 0000000000..217d10ed25
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png.jpeg
new file mode 100644
index 0000000000..9c90a17f3a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg
new file mode 100644
index 0000000000..4b7e5a9b67
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg.jpeg
new file mode 100644
index 0000000000..ea68ebff08
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png
new file mode 100644
index 0000000000..3586520e47
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png.jpeg
new file mode 100644
index 0000000000..3fa840138a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg
new file mode 100644
index 0000000000..6e7ec70688
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg.jpeg
new file mode 100644
index 0000000000..b6019f5311
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png
new file mode 100644
index 0000000000..d58afb88d1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png.jpeg
new file mode 100644
index 0000000000..7ade1f20e5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg
new file mode 100644
index 0000000000..7fb4ed05c0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg.jpeg
new file mode 100644
index 0000000000..2468cc9b6e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png
new file mode 100644
index 0000000000..fe79cf56c7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png.jpeg
new file mode 100644
index 0000000000..d953ca2af1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/tuscany_samples_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.html b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.html
new file mode 100644
index 0000000000..dbf457d763
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.html
@@ -0,0 +1,650 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Started with Tuscany (using Tuscany Eclipse Plugin 1.1)</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=85984">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin 1.1)">Getting Started with Tuscany (using Tuscany Eclipse Plugin 1.1)</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-Ready%2CSet%2CGoGettingstartedwithTuscany"></A>Ready, Set, Go - Getting started with Tuscany</H1>
+
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-InstalltheTuscanyEclipsePlugin%26nbsp%3B"></A>Install the Tuscany Eclipse Plugin&nbsp;</H2>
+
+<P>The first thing you do is to start Eclipse and go to <B>Help &#45;&gt; Software Updates &#45;&gt; Find and Install</B>,<BR>
+select &quot;Search for new features to install&quot; and then click next</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>On the next dialog, click on <B>&quot;New Remote Site...&quot;</B> to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL as *<A href="http://people.apache.org/~jsdelfino/tuscany/tools/updatesite/*" class="external-link" rel="nofollow">http://people.apache.org/~jsdelfino/tuscany/tools/updatesite/*</A></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Make sure the <B>&quot;Remote&nbsp; Site&quot;</B> that was just created is selected, and click <B>&quot;Finish&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Select the <B>&quot;Apache Tuscany SCA Tools&quot;</B> and click <B>&quot;Next&quot;</B>, and then, on the next dialog, click <B>&quot;Finish&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Accept the <B>&quot;Plugin License&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>and next click on <B>&quot;Install All&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>When asked to <B>&quot;restart eclipse&quot;</B>, click the&nbsp; <B>&quot;yes&quot;</B> button.&nbsp;</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-Createyour1stCompositeServiceApplication"></A>Create your 1st Composite Service Application</H2>
+
+<P>The following shows the composition diagram for the composite service application you are about<BR>
+to create.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/first_composite.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The composite service application you will create is a composition of four services. The composed<BR>
+service provided is that of an on-line store.<BR>
+There is a Catalog service which you can ask for catalog items, and depending on its currency<BR>
+code property configuration it will provide the item prices in USD or EUR. The Catalog service is not<BR>
+doing the currency conversion itself it references a CurrencyConverter service to do that task. Then<BR>
+there is the ShoppingCart service into which items chosen from the catalog can be added, it is<BR>
+implemented as a REST service. The Catalog is bound using the JSONRPC binding, and the<BR>
+ShoppingCart service is bound using the ATOM binding. Finally there is the Store user facing<BR>
+service that provides the browser based user interface of the store. The Store service makes use of<BR>
+the Catalog and ShoppingCart service using the JSONRPC, and ATOM binding respectively.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-CreateaJavaProject"></A>Create a Java Project</H2>
+
+<P>In this step you create a Java Project in Eclipse to hold the composite service application.<BR>
+Click on the <B><EM>New Java Project</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project.png" style="border: 0px solid black"></SPAN>&nbsp; in the toolbar to launch the project creation dialog.<BR>
+Next you enter &quot;store&quot; as the <B><EM>Project name</EM></B>, and for <B><EM>Project Layout</EM></B> select <B><EM>Create separate</EM></B><BR>
+<B><EM>folders for sources and class files.</EM></B><BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/project_layout.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Hit the <B><EM>Next</EM></B> button, and on the following page go to the <B><EM>Libraries</EM></B> tab. Use the <B><EM>Add Library...</EM></B><BR>
+button on the right to add the <B>Tuscany Library</B> library to the project.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_lib.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;<BR>
+Hit the <B><EM>Finish</EM></B> button to complete the <B><EM>New Java Project</EM></B> dialog to create the &quot;store&quot; java project.&nbsp;<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_project_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-ConstructServices"></A>Construct Services</H2>
+
+<P>First you create two package folders into which later in this step you place service implementations.<BR>
+Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN> in the toolbar to launch<BR>
+the package creation dialog.</P>
+
+<P>Next you enter &quot;services&quot; as the package <B><EM>Name</EM></B>, and press the <B><EM>Finish</EM></B> button to complete the<BR>
+dialog.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Repeat the previous step to create another package named &quot;ufservices&quot;. The store project now<BR>
+should look as follows.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+In the following you will place in the &quot;services&quot; package the regular services, and in the &quot;ufservices&quot;<BR>
+package the user facing services of the composite service application you create.</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-Catalog"></A><EM>Catalog</EM></H3>
+
+<P>In this step you create the Catalog service interface and implementation.<BR>
+Select the &quot;services&quot; package. Next you click on the dropdown arrow next to the <B><EM>New Java Class</EM></B><BR>
+button&nbsp; <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp; and select the <B><EM>New Java Interface</EM></B>&nbsp;&nbsp;&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/interface_btn.png" style="border: 0px solid black"></SPAN> option from the dropdown list. In the dialog<BR>
+enter &quot;Catalog&quot; as the <B><EM>Name</EM></B> of the interface and select the Finish button to complete the dialog.<BR>
+The Java editor will open on the new created Java interface. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java interface code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Catalog {
+    <SPAN class="code-object">String</SPAN>[] get();
+}
+</PRE>
+</DIV></DIV>
+<P>Select the &quot;services&quot; package again. Select the <B><EM>New Java Class</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png" style="border: 0px solid black"></SPAN> . In the dialog enter<BR>
+&quot;CatalogImpl&quot; as the <B><EM>Name</EM></B> of the class, add &quot;Catalog&quot; as the interface this class implements, and<BR>
+then select <B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Property;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Reference;
+<SPAN class="code-keyword">public</SPAN> class CatalogImpl <SPAN class="code-keyword">implements</SPAN> Catalog {
+	@Property
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> currencyCode = <SPAN class="code-quote">&quot;USD&quot;</SPAN>;
+	@Reference
+	<SPAN class="code-keyword">public</SPAN> CurrencyConverter currencyConverter;
+	<SPAN class="code-keyword">private</SPAN> List&lt;<SPAN class="code-object">String</SPAN>&gt; catalog = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;<SPAN class="code-object">String</SPAN>&gt;();
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		<SPAN class="code-object">String</SPAN> currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
+		catalog.add(<SPAN class="code-quote">&quot;Apple - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 2.99f));
+		catalog.add(<SPAN class="code-quote">&quot;Orange - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 3.55f));
+		catalog.add(<SPAN class="code-quote">&quot;Pear - &quot;</SPAN> + currencySymbol +
+		currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 1.55f));
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN>[] get() {
+		<SPAN class="code-object">String</SPAN>[] catalogArray = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">String</SPAN>[catalog.size()];
+		catalog.toArray(catalogArray);
+		<SPAN class="code-keyword">return</SPAN> catalogArray;
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<B>Note:</B> CatalogImpl is red x'ed because it makes use of the CurrencyConverter interface that we<BR>
+have not implemented yet.<BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-CurrencyConverter"></A><EM>CurrencyConverter</EM></H3>
+
+<P>In this step you create the CurrencyConverter service interface and implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.<BR>
+First create a Java interface in the &quot;services&quot; package named &quot;CurrencyConverter&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java interface code snippet into it.<BR>
+&nbsp;&nbsp;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CurrencyConverter {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrenycCode,
+	<SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">float</SPAN> amount);
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode);
+}
+</PRE>
+</DIV></DIV>
+<P>Next create a Java class in the &quot;services&quot; package named &quot;CurrencyConverterImpl&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">public</SPAN> class CurrencyConverterImpl <SPAN class="code-keyword">implements</SPAN> CurrencyConverter {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrencyCode,
+		<SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">float</SPAN> amount) {
+		<SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+			<SPAN class="code-keyword">return</SPAN> amount;
+		<SPAN class="code-keyword">else</SPAN> 			<SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+				<SPAN class="code-keyword">return</SPAN> amount*0.7256f;
+		<SPAN class="code-keyword">return</SPAN> 0;
+	}
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode) {
+		<SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+			<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;$&quot;</SPAN>;
+		<SPAN class="code-keyword">else</SPAN>
+			<SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+				<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;&euro;&quot;</SPAN>;
+		<SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;?&quot;</SPAN>;
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_1.png" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-ShoppingCart"></A><EM>ShoppingCart</EM></H3>
+
+<P>In this step you create the ShoppingCart service implementation.</P>
+
+<P>You follow the same steps that you learned previously to create the implementation.</P>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;ShoppingCartImpl&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+<SPAN class="code-keyword">import</SPAN> java.util.Date;
+<SPAN class="code-keyword">import</SPAN> java.util.HashMap;
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+<SPAN class="code-keyword">import</SPAN> java.util.UUID;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.feed.collection.Collection;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Content;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Entry;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Feed;
+<SPAN class="code-keyword">import</SPAN> com.sun.syndication.feed.atom.Link;
+<SPAN class="code-keyword">public</SPAN> class ShoppingCartImpl <SPAN class="code-keyword">implements</SPAN> Collection {
+	<SPAN class="code-comment">// needs to change to instance <SPAN class="code-keyword">var</SPAN> once conversation scope works
+</SPAN>	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Map&lt;<SPAN class="code-object">String</SPAN>, Entry&gt; cart = <SPAN class="code-keyword">new</SPAN> HashMap&lt;<SPAN class="code-object">String</SPAN>, Entry&gt;();
+	<SPAN class="code-keyword">public</SPAN> Feed getFeed() {
+		Feed feed = <SPAN class="code-keyword">new</SPAN> Feed();
+		feed.setTitle(<SPAN class="code-quote">&quot;shopping cart&quot;</SPAN>);
+		Content subtitle = <SPAN class="code-keyword">new</SPAN> Content();
+		subtitle.setValue(<SPAN class="code-quote">&quot;Total : &quot;</SPAN> + getTotal());
+		feed.setSubtitle(subtitle);
+		feed.getEntries().addAll(cart.values());
+		<SPAN class="code-keyword">return</SPAN> feed;
+	}
+	<SPAN class="code-keyword">public</SPAN> Entry get(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">return</SPAN> cart.get(id);
+	}
+	<SPAN class="code-keyword">public</SPAN> Entry post(Entry entry) {
+		<SPAN class="code-object">String</SPAN> id = <SPAN class="code-quote">&quot;cart-&quot;</SPAN> + UUID.randomUUID().toString();
+		entry.setId(id);
+		Link link = <SPAN class="code-keyword">new</SPAN> Link();
+		link.setRel(<SPAN class="code-quote">&quot;edit&quot;</SPAN>);
+		link.setHref(&quot;&quot; + id);
+		entry.getOtherLinks().add(link);
+		link = <SPAN class="code-keyword">new</SPAN> Link();
+		link.setRel(<SPAN class="code-quote">&quot;alternate&quot;</SPAN>);
+		link.setHref(&quot;&quot; + id);
+		entry.getAlternateLinks().add(link);
+		entry.setCreated(<SPAN class="code-keyword">new</SPAN> Date());
+		cart.put(id, entry);
+		<SPAN class="code-keyword">return</SPAN> entry;
+	}
+		<SPAN class="code-keyword">public</SPAN> void put(<SPAN class="code-object">String</SPAN> id, Entry entry) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		entry.setUpdated(<SPAN class="code-keyword">new</SPAN> Date());
+		cart.put(id, entry);
+	}
+	<SPAN class="code-keyword">public</SPAN> void delete(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (id.equals(&quot;&quot;))
+			cart.clear();
+		<SPAN class="code-keyword">else</SPAN>
+			cart.remove(id);
+	} 	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> getTotal() {
+		<SPAN class="code-object">float</SPAN> total = 0;
+		<SPAN class="code-object">String</SPAN> symbol = &quot;&quot;;
+		<SPAN class="code-keyword">if</SPAN> (!cart.isEmpty()) {
+			Entry entry = cart.values().iterator().next();
+			<SPAN class="code-object">String</SPAN> item = ((Content)entry.getContents().get(0)).getValue();
+			symbol = item.substring(item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+2, item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+3);
+		}
+		<SPAN class="code-keyword">for</SPAN> (Entry entry : cart.values()) {
+			<SPAN class="code-object">String</SPAN> item = ((Content)entry.getContents().get(0)).getValue();
+			total += <SPAN class="code-object">Float</SPAN>.valueOf(item.substring(item.indexOf(<SPAN class="code-quote">&quot;-&quot;</SPAN>)+3));
+		}
+		<SPAN class="code-keyword">return</SPAN> symbol + <SPAN class="code-object">String</SPAN>.valueOf(total);
+	}
+}
+</PRE>
+</DIV></DIV>
+<P><B>Note:</B> Since the Tuscany conversational support is not ready yet the cart is realized through a hack.<BR>
+The cart field is defined as static.</P>
+
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_2.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-%7B%7DStore%7B%7D"></A><B><EM>Store</EM></B></H3>
+
+<P>In this step you create the user facing Store service that will run in a Web browser and provide the<BR>
+user interface to the other services you created.</P>
+
+<P>Select the &quot;ufservices&quot; package. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and then <B><EM>File</EM></B>. In<BR>
+the <B><EM>New File</EM></B> dialog enter &quot;store.html&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B> to complete the<BR>
+dialog.</P>
+
+<P>The Text editor will open on the new created html file. Replace the content of the editor by <B><EM>copy-paste</EM></B><BR>
+of the following html snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;Store&lt;/TITLE&gt;
+
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;store.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+&lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> catalog = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;catalog&quot;</SPAN>);
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> shoppingCart = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>);
+
+
+	function catalog_getResponse(items) {
+		<SPAN class="code-keyword">var</SPAN> catalog = &quot;&quot;;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			catalog += '&lt;input name=<SPAN class="code-quote">&quot;items&quot;</SPAN> type=<SPAN class="code-quote">&quot;checkbox&quot;</SPAN> value=&quot;' +
+						items[i] + '&quot;&gt;' + items[i]+ ' &lt;br&gt;';
+		document.getElementById('catalog').innerHTML=catalog;
+	}
+
+	function shoppingCart_getResponse(feed) {
+		<SPAN class="code-keyword">if</SPAN> (feed != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);
+			<SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+			<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+				<SPAN class="code-keyword">var</SPAN> item = entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0].firstChild.nodeValue;
+				list += item + ' &lt;br&gt;';
+			}
+			document.getElementById(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>).innerHTML = list;
+			document.getElementById('total').innerHTML = feed.getElementsByTagName(<SPAN class="code-quote">&quot;subtitle&quot;</SPAN>)[0].firstChild.nodeValue;
+		}
+	}
+	function shoppingCart_postResponse(entry) {
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}
+
+
+	function addToCart() {
+		<SPAN class="code-keyword">var</SPAN> items  = document.catalogForm.items;
+		<SPAN class="code-keyword">var</SPAN> j = 0;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			<SPAN class="code-keyword">if</SPAN> (items[i].checked) {
+				<SPAN class="code-keyword">var</SPAN> entry = '&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;&lt;title&gt;cart-item&lt;/title&gt;&lt;content type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;'+items[i].value+'&lt;/content&gt;&lt;/entry&gt;'
+</SPAN>				shoppingCart.post(entry, shoppingCart_postResponse);
+				items[i].checked = <SPAN class="code-keyword">false</SPAN>;
+			}
+	}
+	function checkoutCart() {
+		document.getElementById('store').innerHTML='&lt;h2&gt;' +
+				'Thanks <SPAN class="code-keyword">for</SPAN> Shopping With Us!&lt;/h2&gt;'+
+				'&lt;h2&gt;Your Order&lt;/h2&gt;'+
+				'&lt;form name=<SPAN class="code-quote">&quot;orderForm&quot;</SPAN> action=<SPAN class="code-quote">&quot;store.html&quot;</SPAN>&gt;'+
+					document.getElementById('shoppingCart').innerHTML+
+					'&lt;br&gt;'+
+					document.getElementById('total').innerHTML+
+					'&lt;br&gt;'+
+					'&lt;br&gt;'+
+					'&lt;input type=<SPAN class="code-quote">&quot;submit&quot;</SPAN> value=<SPAN class="code-quote">&quot;Continue Shopping&quot;</SPAN>&gt;'+
+				'&lt;/form&gt;';
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+	}
+	function deleteCart() {
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+		document.getElementById('shoppingCart').innerHTML = &quot;&quot;;
+		document.getElementById('total').innerHTML = &quot;&quot;;
+	}
+
+	catalog.get(catalog_getResponse);
+	shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+&lt;/script&gt;
+
+&lt;/head&gt;
+
+&lt;body&gt;
+&lt;h1&gt;Store&lt;/h1&gt;
+  &lt;div id=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+   	&lt;h2&gt;Catalog&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;catalogForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> &gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;addToCart()&quot;</SPAN>  value=<SPAN class="code-quote">&quot;Add to Cart&quot;</SPAN>&gt;
+   	&lt;/form&gt;
+
+ 	&lt;br&gt;
+
+   	&lt;h2&gt;Your Shopping Cart&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;shoppingCartForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;total&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;checkoutCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Checkout&quot;</SPAN>&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;deleteCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Empty&quot;</SPAN>&gt;
+	   	&lt;a href=<SPAN class="code-quote">&quot;../ShoppingCart/&quot;</SPAN>&gt;(feed)&lt;/a&gt;
+	&lt;/form&gt;
+  &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_3.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-ComposeServices"></A>Compose Services</H2>
+
+<P>Now that you have all the required service implementations you compose them together to provide<BR>
+the store composite service. The composition is stored in a .composite file.</P>
+
+<P>Select the &quot;src&quot; folder of the &quot;store&quot; project. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;store.composite&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created composite file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following composite snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:s=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN>
+</SPAN>	name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		&lt;t:implementation.widget location=<SPAN class="code-quote">&quot;ufservices/store.html&quot;</SPAN>/&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Widget&quot;</SPAN>&gt;
+			&lt;t:binding.http/&gt;
+		&lt;/service&gt;
+                &lt;reference name=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> target=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		 	&lt;t:binding.jsonrpc/&gt;
+		 &lt;/reference&gt;
+		 &lt;reference name=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+		 	&lt;t:binding.atom/&gt;
+		 &lt;/reference&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CatalogImpl&quot;</SPAN>/&gt;
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc/&gt;
+		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>/&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.ShoppingCartImpl&quot;</SPAN>/&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Collection&quot;</SPAN>&gt;
+			&lt;t:binding.atom/&gt;
+		&lt;/service&gt;
+	&lt;/component&gt;
+	&lt;component name=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CurrencyConverterImpl&quot;</SPAN>/&gt;
+	&lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_4.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-LaunchServices"></A>Launch Services</H2>
+
+<P>In this step you create the code to launch the Tuscany runtime with the new store composite<BR>
+service you created.</P>
+
+<P>Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN>&nbsp; in the toolbar to start the</P>
+
+<P>package creation dialog. Use the dialog to create a new package named &quot;launch&quot;.&nbsp;<BR>
+Select the &quot;launch&quot; package. Select the <B><EM>New Java Class</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp; . In the dialog enter &quot;Launch&quot;<BR>
+as the <B><EM>Name</EM></B> of the class, check the <B><EM>checkbox for creating a main method stub</EM></B>, and then select<BR>
+<B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> launch;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.host.embedded.SCADomain;
+<SPAN class="code-keyword">public</SPAN> class Launch {
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+		<SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Starting ...&quot;</SPAN>);
+		SCADomain scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;store.composite&quot;</SPAN>);
+		<SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;store.composite ready <SPAN class="code-keyword">for</SPAN> big business !!!&quot;</SPAN>);
+		<SPAN class="code-object">System</SPAN>.out.println();
+		<SPAN class="code-object">System</SPAN>.in.read();
+		scaDomain.close();
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>&nbsp;After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_project_5.jpg" style="border: 0px solid black"></SPAN><BR>
+Congratulations you completed your 1st composite service applications, now its time to take it into<BR>
+action.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin1.1%29-UseServices"></A>Use Services</H2>
+
+<P>In this step you launch and use the store composite service application you created.</P>
+
+<P>First select the &quot;Launch&quot; class in the &quot;launch&quot; package of your &quot;store&quot; project. <B><EM>Right click</EM></B> to get the<BR>
+context menu, select <B><EM>Run As</EM></B>, and then <B><EM>Java application</EM></B>. The Tuscany runtime will start up adding<BR>
+the store composition to its domain.</P>
+
+<P>The Eclipse console will show the following messages.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/eclipse_console.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Next Launch your Web browser and enter the following address:</P>
+
+<P><A href="http://localhost:8080/store/store.html" class="external-link" rel="nofollow">http://localhost:8080/store/store.html</A>&nbsp;</P>
+
+<P>&nbsp;You get to the Store user facing service of the composite service application.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>You can select items from the Catalog and add them to your Shopping Cart.</P>
+
+<P><B>Note:</B> When adding items for the first time you will be asked for <B><EM>userid and password</EM></B> by the<BR>
+browser. Enter &quot;admin&quot; for both.</P>
+
+<P> <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_1.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Since the ShoppingCart service is bound using the ATOM binding, you can also look at the<BR>
+shopping card content in ATOM feed form by clicking on the feed icon <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feed.png" style="border: 0px solid black"></SPAN>. You get the browsers default rendering for ATOM feeds.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/atom_feeds_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Use the browser back button to get back to the Store page.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>And then you can Checkout to complete your order.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin-11.data/store_page_3.png" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png
new file mode 100644
index 0000000000..48bf481e1d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png.jpeg
new file mode 100644
index 0000000000..4a05eb3baa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png
new file mode 100644
index 0000000000..656465d618
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png.jpeg
new file mode 100644
index 0000000000..268ad62251
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_Calc_Java_Project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png
new file mode 100644
index 0000000000..80b2822afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png.jpeg
new file mode 100644
index 0000000000..5273a016d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/New_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png
new file mode 100644
index 0000000000..796f560dd8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png.jpeg
new file mode 100644
index 0000000000..3af6676b6f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/Tuscany_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png
new file mode 100644
index 0000000000..c1da921ee5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png.jpeg
new file mode 100644
index 0000000000..779e369a2e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png
new file mode 100644
index 0000000000..6e7c4bb227
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png.jpeg
new file mode 100644
index 0000000000..82fe4d8111
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png
new file mode 100644
index 0000000000..f7c0fd012b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png.jpeg
new file mode 100644
index 0000000000..dd108d061a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png
new file mode 100644
index 0000000000..84f439c41c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png.jpeg
new file mode 100644
index 0000000000..a0828163fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/calculator_proj_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png
new file mode 100644
index 0000000000..60bce5ee98
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png.jpeg
new file mode 100644
index 0000000000..cab8b0264b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png
new file mode 100644
index 0000000000..9ef69db7d0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png.jpeg
new file mode 100644
index 0000000000..99dd341348
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png
new file mode 100644
index 0000000000..00d3edd3d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png.jpeg
new file mode 100644
index 0000000000..58e4733cf4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg
new file mode 100644
index 0000000000..534748845b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg.jpeg
new file mode 100644
index 0000000000..6d63cd1c5d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png
new file mode 100644
index 0000000000..85a24d4a27
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png.jpeg
new file mode 100644
index 0000000000..71c6705477
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/folder_structure.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg
new file mode 100644
index 0000000000..0357e5a253
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg.jpeg
new file mode 100644
index 0000000000..d71bfe84b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg
new file mode 100644
index 0000000000..457b4e7983
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg.jpeg
new file mode 100644
index 0000000000..e488e74fd2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_license.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg
new file mode 100644
index 0000000000..23ded64414
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg.jpeg
new file mode 100644
index 0000000000..8e88737cea
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_feature_verification.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg
new file mode 100644
index 0000000000..190036e382
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg.jpeg
new file mode 100644
index 0000000000..bbb6a5ef56
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_finish.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg
new file mode 100644
index 0000000000..ef1bd53888
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg.jpeg
new file mode 100644
index 0000000000..2fd587e991
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_installation.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg
new file mode 100644
index 0000000000..ced23f111a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg.jpeg
new file mode 100644
index 0000000000..83c882dbd7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_new_site.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg
new file mode 100644
index 0000000000..995daba70d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg.jpeg
new file mode 100644
index 0000000000..369f562ef2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_restart_eclipse.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg
new file mode 100644
index 0000000000..dcb2ce7afd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg.jpeg
new file mode 100644
index 0000000000..77ae3d0f92
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_search_results.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg
new file mode 100644
index 0000000000..c32031adcf
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg.jpeg
new file mode 100644
index 0000000000..b929427c48
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/install_update_sites.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png
new file mode 100644
index 0000000000..5c342b8194
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png.jpeg
new file mode 100644
index 0000000000..ee25c45cba
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png
new file mode 100644
index 0000000000..902fe75507
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png.jpeg
new file mode 100644
index 0000000000..9ed36e4e23
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png
new file mode 100644
index 0000000000..95b51cf26a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png.jpeg
new file mode 100644
index 0000000000..be327e7e1f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png
new file mode 100644
index 0000000000..07cd5a0502
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png.jpeg
new file mode 100644
index 0000000000..6b4cd2b9b4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png
new file mode 100644
index 0000000000..50297b3afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png.jpeg
new file mode 100644
index 0000000000..8fdf13e716
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png
new file mode 100644
index 0000000000..5f051094b9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png.jpeg
new file mode 100644
index 0000000000..22d226ce07
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png
new file mode 100644
index 0000000000..8329b143de
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png.jpeg
new file mode 100644
index 0000000000..90231cf672
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png
new file mode 100644
index 0000000000..c0b12eea7a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png.jpeg
new file mode 100644
index 0000000000..4537f7d914
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png
new file mode 100644
index 0000000000..9de01ff4d5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png.jpeg
new file mode 100644
index 0000000000..745f2dbfbd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg
new file mode 100644
index 0000000000..c06fec1d7c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg.jpeg
new file mode 100644
index 0000000000..2ed010eff4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png
new file mode 100644
index 0000000000..38077052b3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png.jpeg
new file mode 100644
index 0000000000..32e3de3909
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/release_zips.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg
new file mode 100644
index 0000000000..1ab42867a2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg.jpeg
new file mode 100644
index 0000000000..5339a41827
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png
new file mode 100644
index 0000000000..7dba24bd53
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png.jpeg
new file mode 100644
index 0000000000..00fa4a3ca4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg
new file mode 100644
index 0000000000..2eb5f64e93
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg.jpeg
new file mode 100644
index 0000000000..5d44c2a867
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png
new file mode 100644
index 0000000000..7d51969a8a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png.jpeg
new file mode 100644
index 0000000000..529ac57071
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/source_attachment_config.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png
new file mode 100644
index 0000000000..988c62fae7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png.jpeg
new file mode 100644
index 0000000000..e52776334f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png
new file mode 100644
index 0000000000..834ef26e35
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png.jpeg
new file mode 100644
index 0000000000..7247d60368
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png
new file mode 100644
index 0000000000..c71b600146
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png.jpeg
new file mode 100644
index 0000000000..0ecef780b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png
new file mode 100644
index 0000000000..2560148e19
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png.jpeg
new file mode 100644
index 0000000000..d05d2288af
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png
new file mode 100644
index 0000000000..f0d1999ff2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png.jpeg
new file mode 100644
index 0000000000..fab518699e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png
new file mode 100644
index 0000000000..eb6bd340d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png.jpeg
new file mode 100644
index 0000000000..404c40daf8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png
new file mode 100644
index 0000000000..81119985d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png.jpeg
new file mode 100644
index 0000000000..0159ecc040
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg
new file mode 100644
index 0000000000..a682bb2d74
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg.jpeg
new file mode 100644
index 0000000000..23b9f5c584
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png
new file mode 100644
index 0000000000..5aaf5ed3fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png.jpeg
new file mode 100644
index 0000000000..6a5e9220cb
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg
new file mode 100644
index 0000000000..7c7ed0a157
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg.jpeg
new file mode 100644
index 0000000000..c0aa95b56b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png
new file mode 100644
index 0000000000..217d10ed25
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png.jpeg
new file mode 100644
index 0000000000..9c90a17f3a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg
new file mode 100644
index 0000000000..4b7e5a9b67
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg.jpeg
new file mode 100644
index 0000000000..ea68ebff08
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png
new file mode 100644
index 0000000000..3586520e47
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png.jpeg
new file mode 100644
index 0000000000..3fa840138a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_5.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg
new file mode 100644
index 0000000000..6e7ec70688
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg.jpeg
new file mode 100644
index 0000000000..b6019f5311
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png
new file mode 100644
index 0000000000..d58afb88d1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png.jpeg
new file mode 100644
index 0000000000..7ade1f20e5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg
new file mode 100644
index 0000000000..7fb4ed05c0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg.jpeg
new file mode 100644
index 0000000000..2468cc9b6e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png
new file mode 100644
index 0000000000..fe79cf56c7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png.jpeg
new file mode 100644
index 0000000000..d953ca2af1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/tuscany_samples_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html
new file mode 100644
index 0000000000..73a02ac7b2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html
@@ -0,0 +1,745 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Started with Tuscany (using Tuscany Eclipse Plugin)</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=74081">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Getting Started with Tuscany (using Tuscany Eclipse Plugin)</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-Ready%2CSet%2CGoGettingstartedwithTuscany"></A>Ready, Set, Go - Getting started with Tuscany</H1>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Getting%20Started%20with%20Apache%20Tuscany" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Get Started with Store Demo in Eclipse video&quot;</A><BR>
+This guide shows you how to get started with Tuscany in Eclipse by installing the Eclipse plugins and creating a web store shopping cart with SCA technology.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-InstalltheLatestTuscanyEclipsePlugin"></A>Install the Latest Tuscany Eclipse Plugin</H2>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Installing%20the%20Apache%20Tuscany%20Eclipse%20Plugins" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Installing the Apache Tuscany Eclipse Plugins video&quot;</A></P>
+
+<P>A quick Step by Step walk through of downloading, installing, and verifying the Tuscany Eclipse Plugins.</P>
+
+<P>This section shows you how to install the lastest Tuscany Eclipse plugin. The plugin gives you the ability to run an SCA composite file from the Package Explorer. You will see a &quot;Run As Tuscany&quot; menu item when you bring up the context menu on composite files.</P>
+
+<P>Start Eclipse and go to Help -&gt; Software Updates -&gt; Find and Install. Select &quot;Search for new features to install&quot; and then click next</P>
+
+<P>Create a new Remote Site. On the next dialog, click on &quot;New Remote Site...&quot; to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL from the latest <B><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases">Tuscany release</A></B> (e.g  <B><A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/" class="external-link" rel="nofollow">http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/</A></B>.</P>
+
+<P>Select the &quot;Remote Site&quot; you just created, and click &quot;Finish&quot;</P>
+
+<P>Select the &quot;Apache Tuscany SCA Tools&quot; and click &quot;Next&quot;, and then, on the next dialog, click &quot;Finish&quot;. Accept the &quot;Plugin License&quot; and next click on &quot;Install All&quot;.</P>
+
+<P>When asked to &quot;restart eclipse&quot;, click the &quot;yes&quot; button. </P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-Createyour1stCompositeServiceApplication"></A>Create your 1st Composite Service Application</H2>
+
+<P>The following shows the composition diagram for the composite service application you are about<BR>
+to create.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/first_composite.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The composite service application you will create is a composition of four services. The composed<BR>
+service provided is that of an on-line store.<BR>
+There is a Catalog service which you can ask for catalog items, and depending on its currency<BR>
+code property configuration it will provide the item prices in USD or EUR. The Catalog service is not<BR>
+doing the currency conversion itself it references a CurrencyConverter service to do that task. Then<BR>
+there is the ShoppingCart service into which items chosen from the catalog can be added, it is<BR>
+implemented as a REST service. The Catalog is bound using the JSONRPC binding, and the<BR>
+ShoppingCart service is bound using the ATOM binding. Finally there is the Store user facing<BR>
+service that provides the browser based user interface of the store. The Store service makes use of<BR>
+the Catalog and ShoppingCart service using the JSONRPC, and ATOM binding respectively.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-CreateaJavaProject"></A>Create a Java Project</H2>
+
+<P>In this step you create a Java Project in Eclipse to hold the composite service application.<BR>
+Click on the <B><EM>New Java Project</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project.png" style="border: 0px solid black"></SPAN>&nbsp; in the toolbar to launch the project creation dialog.<BR>
+Next you enter &quot;store&quot; as the <B><EM>Project name</EM></B>, and for <B><EM>Project Layout</EM></B> select <B><EM>Create separate</EM></B><BR>
+<B><EM>folders for sources and class files.</EM></B><BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/project_layout.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Hit the <B><EM>Next</EM></B> button, and on the following page go to the <B><EM>Libraries</EM></B> tab. Use the <B><EM>Add Library...</EM></B><BR>
+button on the right to add the <B>Tuscany Library</B> library to the project.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_lib.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;<BR>
+Hit the <B><EM>Finish</EM></B> button to complete the <B><EM>New Java Project</EM></B> dialog to create the &quot;store&quot; java project.&nbsp;<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_project_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-ConstructServices"></A>Construct Services</H2>
+
+<P>First you create two package folders into which later in this step you place service implementations.<BR>
+Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN> in the toolbar to launch<BR>
+the package creation dialog.</P>
+
+<P>Next you enter &quot;services&quot; as the package <B><EM>Name</EM></B>, and press the <B><EM>Finish</EM></B> button to complete the<BR>
+dialog.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Repeat the previous step to create another package named &quot;ufservices&quot;. The store project now<BR>
+should look as follows.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/new_java_pkg_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+In the following you will place in the &quot;services&quot; package the regular services, and in the &quot;ufservices&quot;<BR>
+package the user facing services of the composite service application you create.</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-Catalog"></A><EM>Catalog</EM></H3>
+
+<P>In this step you create the Catalog service interface and implementation.<BR>
+Select the &quot;services&quot; package. Next you click on the dropdown arrow next to the <B><EM>New Java Class</EM></B><BR>
+button&nbsp; <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp; and select the <B><EM>New Java Interface</EM></B>&nbsp;&nbsp;&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/interface_btn.png" style="border: 0px solid black"></SPAN> option from the dropdown list. In the dialog<BR>
+enter &quot;Catalog&quot; as the <B><EM>Name</EM></B> of the interface and select the Finish button to complete the dialog.<BR>
+The Java editor will open on the new created Java interface. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java interface code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Catalog {
+	Item[] get();
+}
+</PRE>
+</DIV></DIV>
+<P>Select the &quot;services&quot; package again. Select the <B><EM>New Java Class</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/class_btn.png" style="border: 0px solid black"></SPAN> . In the dialog enter<BR>
+&quot;CatalogImpl&quot; as the <B><EM>Name</EM></B> of the class, add &quot;Catalog&quot; as the interface this class implements, and<BR>
+then select <B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Property;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Reference;
+
+<SPAN class="code-keyword">public</SPAN> class CatalogImpl <SPAN class="code-keyword">implements</SPAN> Catalog {
+	@Property
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> currencyCode = <SPAN class="code-quote">&quot;USD&quot;</SPAN>;
+	@Reference
+	<SPAN class="code-keyword">public</SPAN> CurrencyConverter currencyConverter;
+
+	<SPAN class="code-keyword">private</SPAN> List&lt;Item&gt; catalog = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;Item&gt;();
+
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		<SPAN class="code-object">String</SPAN> currencySymbol = currencyConverter
+				.getCurrencySymbol(currencyCode);
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Apple&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 2.99)));
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Orange&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 3.55)));
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Pear&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 1.55)));
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item[] get() {
+		Item[] catalogArray = <SPAN class="code-keyword">new</SPAN> Item[catalog.size()];
+		catalog.toArray(catalogArray);
+		<SPAN class="code-keyword">return</SPAN> catalogArray;
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<B>Note:</B> CatalogImpl is red x'ed because it makes use of the CurrencyConverter interface that we<BR>
+have not implemented yet.<BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-CurrencyConverter"></A><EM>CurrencyConverter</EM></H3>
+
+<P>In this step you create the CurrencyConverter service interface and implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.<BR>
+First create a Java interface in the &quot;services&quot; package named &quot;CurrencyConverter&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java interface code snippet into it.<BR>
+&nbsp;&nbsp;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CurrencyConverter {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrenycCode, <SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">double</SPAN> amount);
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode);
+}
+</PRE>
+</DIV></DIV>
+<P>Next create a Java class in the &quot;services&quot; package named &quot;CurrencyConverterImpl&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">public</SPAN> class CurrencyConverterImpl <SPAN class="code-keyword">implements</SPAN> CurrencyConverter {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrencyCode,<SPAN class="code-object">String</SPAN> toCurrencyCode,<SPAN class="code-object">double</SPAN> amount) {
+        <SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> amount;
+        <SPAN class="code-keyword">else</SPAN> <SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> ((<SPAN class="code-object">double</SPAN>)<SPAN class="code-object">Math</SPAN>.round(amount * 0.7256 * 100)) /100;
+        <SPAN class="code-keyword">return</SPAN> 0;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode) {
+        <SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;$&quot;</SPAN>;
+        <SPAN class="code-keyword">else</SPAN> <SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;E&quot;</SPAN>; <SPAN class="code-comment">//<SPAN class="code-quote">&quot;&acirc;&sbquo;&not;&quot;</SPAN>;
+</SPAN>        <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;?&quot;</SPAN>;
+    }
+}
+
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_1.png" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-ShoppingCart"></A><EM>ShoppingCart</EM></H3>
+
+<P>In this step you create the Item model object, the Cart and Total service interfaces and the ShoppingCart service implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.</P>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;Item&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">public</SPAN> class Item {
+	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> name;
+	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> price;
+
+	<SPAN class="code-keyword">public</SPAN> Item() {
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item(<SPAN class="code-object">String</SPAN> name, <SPAN class="code-object">String</SPAN> price) {
+		<SPAN class="code-keyword">this</SPAN>.name = name;
+		<SPAN class="code-keyword">this</SPAN>.price = price;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getName() {
+		<SPAN class="code-keyword">return</SPAN> name;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void setName(<SPAN class="code-object">String</SPAN> name) {
+		<SPAN class="code-keyword">this</SPAN>.name = name;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getPrice() {
+		<SPAN class="code-keyword">return</SPAN> price;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void setPrice(<SPAN class="code-object">String</SPAN> price) {
+		<SPAN class="code-keyword">this</SPAN>.price = price;
+	}
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java interface in the &quot;services&quot; package named &quot;Cart&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.Collection;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Cart <SPAN class="code-keyword">extends</SPAN> Collection&lt;<SPAN class="code-object">String</SPAN>, Item&gt; {
+
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java interface in the &quot;services&quot; package named &quot;Total&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Total {
+	<SPAN class="code-object">String</SPAN> getTotal();
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;ShoppingCartImpl&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.HashMap;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+<SPAN class="code-keyword">import</SPAN> java.util.UUID;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.Entry;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.NotFoundException;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Scope;
+
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>)
+<SPAN class="code-keyword">public</SPAN> class ShoppingCartImpl <SPAN class="code-keyword">implements</SPAN> Cart, Total {
+
+	<SPAN class="code-keyword">private</SPAN> Map&lt;<SPAN class="code-object">String</SPAN>, Item&gt; cart;
+
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		cart = <SPAN class="code-keyword">new</SPAN> HashMap&lt;<SPAN class="code-object">String</SPAN>, Item&gt;();
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] getAll() {
+		Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] entries = <SPAN class="code-keyword">new</SPAN> Entry[cart.size()];
+		<SPAN class="code-object">int</SPAN> i = 0;
+		<SPAN class="code-keyword">for</SPAN> (Map.Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt; e : cart.entrySet()) {
+			entries[i++] = <SPAN class="code-keyword">new</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;(e.getKey(), e.getValue());
+		}
+		<SPAN class="code-keyword">return</SPAN> entries;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item get(<SPAN class="code-object">String</SPAN> key) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		Item item = cart.get(key);
+		<SPAN class="code-keyword">if</SPAN> (item == <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		} <SPAN class="code-keyword">else</SPAN> {
+			<SPAN class="code-keyword">return</SPAN> item;
+		}
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> post(<SPAN class="code-object">String</SPAN> key, Item item) {
+		<SPAN class="code-keyword">if</SPAN> (key == <SPAN class="code-keyword">null</SPAN>) {
+			key = <SPAN class="code-quote">&quot;cart-&quot;</SPAN> + UUID.randomUUID().toString();
+		}
+		cart.put(key, item);
+		<SPAN class="code-keyword">return</SPAN> key;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void put(<SPAN class="code-object">String</SPAN> key, Item item) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (!cart.containsKey(key)) {
+			<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		}
+		cart.put(key, item);
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void delete(<SPAN class="code-object">String</SPAN> key) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (key == <SPAN class="code-keyword">null</SPAN> || key.equals(&quot;&quot;)) {
+			cart.clear();
+		} <SPAN class="code-keyword">else</SPAN> {
+			Item item = cart.remove(key);
+			<SPAN class="code-keyword">if</SPAN> (item == <SPAN class="code-keyword">null</SPAN>)
+				<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		}
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] query(<SPAN class="code-object">String</SPAN> queryString) {
+		List&lt;Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;&gt; entries = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;&gt;();
+		<SPAN class="code-keyword">if</SPAN> (queryString.startsWith(<SPAN class="code-quote">&quot;name=&quot;</SPAN>)) {
+			<SPAN class="code-object">String</SPAN> name = queryString.substring(5);
+			<SPAN class="code-keyword">for</SPAN> (Map.Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt; e : cart.entrySet()) {
+				Item item = e.getValue();
+				<SPAN class="code-keyword">if</SPAN> (item.getName().equals(name)) {
+					entries.add(<SPAN class="code-keyword">new</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;(e.getKey(), e
+							.getValue()));
+				}
+			}
+		}
+		<SPAN class="code-keyword">return</SPAN> entries.toArray(<SPAN class="code-keyword">new</SPAN> Entry[entries.size()]);
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getTotal() {
+		<SPAN class="code-object">double</SPAN> total = 0;
+		<SPAN class="code-object">String</SPAN> currencySymbol = &quot;&quot;;
+		<SPAN class="code-keyword">if</SPAN> (!cart.isEmpty()) {
+			Item item = cart.values().iterator().next();
+			currencySymbol = item.getPrice().substring(0, 1);
+		}
+		<SPAN class="code-keyword">for</SPAN> (Item item : cart.values()) {
+			total += <SPAN class="code-object">Double</SPAN>.valueOf(item.getPrice().substring(1));
+		}
+		<SPAN class="code-keyword">return</SPAN> currencySymbol + <SPAN class="code-object">String</SPAN>.valueOf(total);
+	}
+}
+</PRE>
+</DIV></DIV>
+<P><B>Note:</B> Since the Tuscany conversational support is not ready yet the cart is realized through a hack.<BR>
+The cart field is defined as static.</P>
+
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_2.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-%7B%7DStore%7B%7D"></A><B><EM>Store</EM></B></H3>
+
+<P>In this step you create the user facing Store service that will run in a Web browser and provide the<BR>
+user interface to the other services you created.</P>
+
+<P>Select the &quot;ufservices&quot; package. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and then <B><EM>File</EM></B>. In<BR>
+the <B><EM>New File</EM></B> dialog enter &quot;store.html&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B> to complete the<BR>
+dialog.</P>
+
+<P>The Text editor will open on the new created html file. Replace the content of the editor by <B><EM>copy-paste</EM></B><BR>
+of the following html snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;Store&lt;/title&gt;
+
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;store.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+&lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> catalog = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;catalog&quot;</SPAN>);
+	
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> shoppingCart = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>);
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> shoppingTotal = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;shoppingTotal&quot;</SPAN>);
+	
+	<SPAN class="code-keyword">var</SPAN> catalogItems;
+
+	function catalog_getResponse(items) {
+		<SPAN class="code-keyword">var</SPAN> catalog = &quot;&quot;;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++) {
+			<SPAN class="code-keyword">var</SPAN> item = items[i].name + ' - ' + items[i].price;
+			catalog += '&lt;input name=<SPAN class="code-quote">&quot;items&quot;</SPAN> type=<SPAN class="code-quote">&quot;checkbox&quot;</SPAN> value=&quot;' + 
+						item + '&quot;&gt;' + item + ' &lt;br&gt;';
+		}
+		document.getElementById('catalog').innerHTML=catalog;
+		catalogItems = items;
+	}
+	
+	function shoppingCart_getResponse(feed) {
+		<SPAN class="code-keyword">if</SPAN> (feed != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);              
+			<SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+			<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+				<SPAN class="code-keyword">var</SPAN> content = entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0];
+				<SPAN class="code-keyword">var</SPAN> name = content.getElementsByTagName(<SPAN class="code-quote">&quot;name&quot;</SPAN>)[0].firstChild.nodeValue;
+				<SPAN class="code-keyword">var</SPAN> price = content.getElementsByTagName(<SPAN class="code-quote">&quot;price&quot;</SPAN>)[0].firstChild.nodeValue;
+				list += name + ' - ' + price + ' &lt;br&gt;';
+			}
+			document.getElementById(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>).innerHTML = list;
+
+			<SPAN class="code-keyword">if</SPAN> (entries.length != 0) {			
+				shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+			}
+		}
+	}
+	
+	function shoppingTotal_getTotalResponse(total) {
+		document.getElementById('total').innerHTML = total;
+	}
+	
+	function shoppingCart_postResponse(entry) {
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}				
+
+	function addToCart() {
+		<SPAN class="code-keyword">var</SPAN> items  = document.catalogForm.items;
+		<SPAN class="code-keyword">var</SPAN> j = 0;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			<SPAN class="code-keyword">if</SPAN> (items[i].checked) {
+				<SPAN class="code-keyword">var</SPAN> entry = '&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;&lt;title&gt;item&lt;/title&gt;&lt;content type=<SPAN class="code-quote">&quot;text/xml&quot;</SPAN>&gt;' +
+</SPAN>                	'&lt;Item xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//services/&quot;</SPAN>&gt;' +
+</SPAN>                	'&lt;name xmlns=<SPAN class="code-quote">&quot;&quot;&gt;' + catalogItems[i].name + '&lt;/name&gt;' + '&lt;price xmlns=&quot;</SPAN>&quot;&gt;' + catalogItems[i].price + '&lt;/price&gt;' +
+                 	'&lt;/Item&gt;' + '&lt;/content&gt;&lt;/entry&gt;';
+				shoppingCart.post(entry, shoppingCart_postResponse);
+				items[i].checked = <SPAN class="code-keyword">false</SPAN>;
+			}
+	}
+	function checkoutCart() {
+		document.getElementById('store').innerHTML='&lt;h2&gt;' +
+				'Thanks <SPAN class="code-keyword">for</SPAN> Shopping With Us!&lt;/h2&gt;'+
+				'&lt;h2&gt;Your Order&lt;/h2&gt;'+
+				'&lt;form name=<SPAN class="code-quote">&quot;orderForm&quot;</SPAN>&gt;'+
+					document.getElementById('shoppingCart').innerHTML+
+					'&lt;br&gt;'+
+					document.getElementById('total').innerHTML+
+					'&lt;br&gt;'+
+					'&lt;br&gt;'+
+					'&lt;input type=<SPAN class="code-quote">&quot;submit&quot;</SPAN> value=<SPAN class="code-quote">&quot;Continue Shopping&quot;</SPAN>&gt;'+ 
+				'&lt;/form&gt;';
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+	}
+	function deleteCart() {
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+		document.getElementById('shoppingCart').innerHTML = &quot;&quot;;
+		document.getElementById('total').innerHTML = &quot;&quot;;	
+	}	
+
+	function init() {
+		catalog.get(catalog_getResponse);
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}
+	
+&lt;/script&gt;
+
+&lt;/head&gt;
+
+&lt;body onload=<SPAN class="code-quote">&quot;init()&quot;</SPAN>&gt;
+&lt;h1&gt;Store&lt;/h1&gt;
+  &lt;div id=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+   	&lt;h2&gt;Catalog&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;catalogForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> &gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;addToCart()&quot;</SPAN>  value=<SPAN class="code-quote">&quot;Add to Cart&quot;</SPAN>&gt;
+   	&lt;/form&gt;
+ 
+ 	&lt;br&gt;
+  
+   	&lt;h2&gt;Your Shopping Cart&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;shoppingCartForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;total&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;		
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;checkoutCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Checkout&quot;</SPAN>&gt; 
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;deleteCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Empty&quot;</SPAN>&gt;     
+	   	&lt;a href=<SPAN class="code-quote">&quot;../ShoppingCart/Cart/&quot;</SPAN>&gt;(feed)&lt;/a&gt;
+	&lt;/form&gt;    
+  &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_3.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-ComposeServices"></A>Compose Services</H2>
+
+<P>Now that you have all the required service implementations you compose them together to provide<BR>
+the store composite service. The composition is stored in a .composite file.</P>
+
+<P>Select the &quot;src&quot; folder of the &quot;store&quot; project. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;store.composite&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created composite file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following composite snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:s=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN> 
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN> 
+</SPAN>	name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+	
+	&lt;component name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		&lt;t:implementation.widget location=<SPAN class="code-quote">&quot;ufservices/store.html&quot;</SPAN> /&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Widget&quot;</SPAN>&gt;
+			&lt;t:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/store&quot;</SPAN> /&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> target=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc /&gt;
+		&lt;/reference&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart/Cart&quot;</SPAN>&gt;
+			&lt;t:binding.atom /&gt;
+		&lt;/reference&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;shoppingTotal&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart/Total&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc /&gt;
+		&lt;/reference&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CatalogImpl&quot;</SPAN> /&gt;
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Catalog&quot;</SPAN>/&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN> /&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.ShoppingCartImpl&quot;</SPAN> /&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Cart&quot;</SPAN>&gt;
+			&lt;t:binding.atom uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/ShoppingCart/Cart&quot;</SPAN> /&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Total&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Total&quot;</SPAN>/&gt;
+</SPAN>		&lt;/service&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CurrencyConverterImpl&quot;</SPAN> /&gt;
+	&lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_project_4.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<P>Congratulations you completed your 1st composite service applications, now its time to take it into<BR>
+action.</P>
+
+<H2><A name="GettingStartedwithTuscany%28usingTuscanyEclipsePlugin%29-UseServices"></A>Use Services</H2>
+
+<P>In this step you launch and use the store composite service application you created.</P>
+
+<P>First select the &quot;store.composite&quot; file. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>Run As</EM></B>, and then <B><EM>Tuscany</EM></B>. <BR>
+The Tuscany runtime will start up adding the store composition to its domain.</P>
+
+<P>The Eclipse console will show the following messages.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/eclipse_console.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Next Launch your Web browser and enter the following address:</P>
+
+<P><A href="http://localhost:8080/store/store.html" class="external-link" rel="nofollow">http://localhost:8080/store/store.html</A>&nbsp;</P>
+
+<P>&nbsp;You get to the Store user facing service of the composite service application.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>You can select items from the Catalog and add them to your Shopping Cart.</P>
+
+<P> <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_1.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Since the ShoppingCart service is bound using the ATOM binding, you can also look at the<BR>
+shopping card content in ATOM feed form by clicking on the feed icon <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feed.png" style="border: 0px solid black"></SPAN>. You get the browsers default rendering for ATOM feeds.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/atom_feeds_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Use the browser back button to get back to the Store page.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>And then you can Checkout to complete your order.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany-using-tuscany-eclipse-plugin.data/store_page_3.png" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png
new file mode 100644
index 0000000000..48bf481e1d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png.jpeg
new file mode 100644
index 0000000000..4a05eb3baa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png
new file mode 100644
index 0000000000..656465d618
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg
new file mode 100644
index 0000000000..268ad62251
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_Calc_Java_Project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png
new file mode 100644
index 0000000000..80b2822afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png.jpeg
new file mode 100644
index 0000000000..5273a016d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/New_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png b/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png
new file mode 100644
index 0000000000..414e376e0f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png.jpeg
new file mode 100644
index 0000000000..3af6676b6f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/Tuscany_User_Lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png
new file mode 100644
index 0000000000..c1da921ee5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png.jpeg
new file mode 100644
index 0000000000..779e369a2e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feed.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png
new file mode 100644
index 0000000000..6e7c4bb227
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png.jpeg
new file mode 100644
index 0000000000..82fe4d8111
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/atom_feeds_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png
new file mode 100644
index 0000000000..f7c0fd012b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png.jpeg
new file mode 100644
index 0000000000..dd108d061a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png
new file mode 100644
index 0000000000..84f439c41c
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png.jpeg
new file mode 100644
index 0000000000..a0828163fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/calculator_proj_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png b/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png
new file mode 100644
index 0000000000..60bce5ee98
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png.jpeg
new file mode 100644
index 0000000000..cab8b0264b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/class_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png b/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png
new file mode 100644
index 0000000000..9ef69db7d0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png.jpeg
new file mode 100644
index 0000000000..99dd341348
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/eclipse_console.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png b/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png
new file mode 100644
index 0000000000..00d3edd3d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png.jpeg
new file mode 100644
index 0000000000..58e4733cf4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/first_composite.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg
new file mode 100644
index 0000000000..655964b482
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg.jpeg
new file mode 100644
index 0000000000..6d63cd1c5d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png
new file mode 100644
index 0000000000..85a24d4a27
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png.jpeg
new file mode 100644
index 0000000000..71c6705477
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/folder_structure.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png b/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png
new file mode 100644
index 0000000000..5c342b8194
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png.jpeg
new file mode 100644
index 0000000000..ee25c45cba
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/interface_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png
new file mode 100644
index 0000000000..902fe75507
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png.jpeg
new file mode 100644
index 0000000000..9ed36e4e23
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_btn.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png
new file mode 100644
index 0000000000..95b51cf26a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png.jpeg
new file mode 100644
index 0000000000..be327e7e1f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png
new file mode 100644
index 0000000000..07cd5a0502
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png.jpeg
new file mode 100644
index 0000000000..6b4cd2b9b4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_pkg_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png
new file mode 100644
index 0000000000..50297b3afa
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png.jpeg
new file mode 100644
index 0000000000..8fdf13e716
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png
new file mode 100644
index 0000000000..5f051094b9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png.jpeg
new file mode 100644
index 0000000000..22d226ce07
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_dlg.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png
new file mode 100644
index 0000000000..8329b143de
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png.jpeg
new file mode 100644
index 0000000000..90231cf672
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png
new file mode 100644
index 0000000000..c0b12eea7a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png.jpeg
new file mode 100644
index 0000000000..4537f7d914
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/new_java_project_lib.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png b/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png
new file mode 100644
index 0000000000..9de01ff4d5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png.jpeg
new file mode 100644
index 0000000000..745f2dbfbd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/project_layout.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg
new file mode 100644
index 0000000000..2533d27ca9
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg.jpeg
new file mode 100644
index 0000000000..2ed010eff4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png
new file mode 100644
index 0000000000..38077052b3
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png.jpeg
new file mode 100644
index 0000000000..32e3de3909
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/release_zips.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg
new file mode 100644
index 0000000000..a0f58d75b0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg.jpeg
new file mode 100644
index 0000000000..5339a41827
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png
new file mode 100644
index 0000000000..7dba24bd53
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png.jpeg
new file mode 100644
index 0000000000..00fa4a3ca4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg
new file mode 100644
index 0000000000..d546808aaf
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg.jpeg
new file mode 100644
index 0000000000..5d44c2a867
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png
new file mode 100644
index 0000000000..7d51969a8a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png.jpeg
new file mode 100644
index 0000000000..529ac57071
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/source_attachment_config.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png
new file mode 100644
index 0000000000..988c62fae7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png.jpeg
new file mode 100644
index 0000000000..e52776334f
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png
new file mode 100644
index 0000000000..834ef26e35
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png.jpeg
new file mode 100644
index 0000000000..7247d60368
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png
new file mode 100644
index 0000000000..c71b600146
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png.jpeg
new file mode 100644
index 0000000000..0ecef780b1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png
new file mode 100644
index 0000000000..2560148e19
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png.jpeg
new file mode 100644
index 0000000000..d05d2288af
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_page_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png
new file mode 100644
index 0000000000..f0d1999ff2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png.jpeg
new file mode 100644
index 0000000000..fab518699e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png
new file mode 100644
index 0000000000..eb6bd340d2
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png.jpeg
new file mode 100644
index 0000000000..404c40daf8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_1.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png
new file mode 100644
index 0000000000..81119985d8
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png.jpeg
new file mode 100644
index 0000000000..0159ecc040
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_2.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg
new file mode 100644
index 0000000000..a682bb2d74
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg.jpeg
new file mode 100644
index 0000000000..23b9f5c584
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png
new file mode 100644
index 0000000000..5aaf5ed3fd
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png.jpeg
new file mode 100644
index 0000000000..6a5e9220cb
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_3.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg
new file mode 100644
index 0000000000..7c7ed0a157
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg.jpeg
new file mode 100644
index 0000000000..c0aa95b56b
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png
new file mode 100644
index 0000000000..217d10ed25
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png.jpeg
new file mode 100644
index 0000000000..9c90a17f3a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_4.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg
new file mode 100644
index 0000000000..4b7e5a9b67
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg.jpeg
new file mode 100644
index 0000000000..ea68ebff08
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png
new file mode 100644
index 0000000000..3586520e47
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png.jpeg
new file mode 100644
index 0000000000..3fa840138a
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/store_project_5.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg
new file mode 100644
index 0000000000..72d962a512
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg.jpeg
new file mode 100644
index 0000000000..b6019f5311
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png
new file mode 100644
index 0000000000..d58afb88d1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png.jpeg
new file mode 100644
index 0000000000..7ade1f20e5
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg
new file mode 100644
index 0000000000..7fb4ed05c0
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg.jpeg
new file mode 100644
index 0000000000..2468cc9b6e
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png
new file mode 100644
index 0000000000..fe79cf56c7
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png.jpeg b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png.jpeg
new file mode 100644
index 0000000000..d953ca2af1
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.data/tuscany_samples_folder.png.jpeg
diff --git a/site/trunk/site-publish/getting-started-with-tuscany.html b/site/trunk/site-publish/getting-started-with-tuscany.html
new file mode 100644
index 0000000000..dcb2a4901d
--- /dev/null
+++ b/site/trunk/site-publish/getting-started-with-tuscany.html
@@ -0,0 +1,814 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Started with Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=67902">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started with Tuscany">Getting Started with Tuscany</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="GettingStartedwithTuscany-Ready%2CSet%2CGoGettingstartedwithTuscany"></A>Ready, Set, Go - Getting started with Tuscany</H1>
+
+<P>This article will show you how to download a Tuscany distribution, add the distribution as a user library in Eclipse, create the Store sample as a Java project, and then run the Store and use it from a web browser.</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Although this guide show some images based on the Java SCA 1.3.2 release, you should be able to use latest Java SCA release while going to the necessary steps for this guide.</TD></TR></TABLE></DIV>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Getting%20Started%20with%20Apache%20Tuscany" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Get Started with Store Demo in Eclipse video&quot;</A></P>
+
+<H2><A name="GettingStartedwithTuscany-InstalltheTuscanyDistribution%26nbsp%3B"></A>Install the Tuscany Distribution&nbsp;</H2>
+
+<P>The first thing you do is to create a file system folder into which you will download the TUSCANY distribution.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/tuscany_folder.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Next you download the latest release distribution. Launch your browser and enter the following URL.<BR>
+Latest Release - <A href="http://cwiki.apache.org/TUSCANY/sca-java-releases.html" class="external-link" rel="nofollow">http://cwiki.apache.org/TUSCANY/sca-java-releases.html</A><BR>
+Download both the <B><EM>bin zip</EM></B> as well as the <B><EM>src zip</EM></B> to the folder that you created on your disk. Once you completed the download you should see the following on your disk.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/release_zips.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Next you unzip the <B><EM>bin zip</EM></B> in place, you should see the following folder file structure on your disk after unzip is complete.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/folder_structure.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="GettingStartedwithTuscany-SetupEclipseforTuscany"></A>Setup Eclipse for Tuscany</H2>
+
+<P>Start Eclipse and create a User Library to contain the TUSCANY runtime jar's as well as their<BR>
+depending jar's.</P>
+
+<P>From the menu bar select <B><EM>Window</EM></B> and then <B><EM>Preferences...</EM></B> . The Preferences dialog will appear,<BR>
+in its left navigation tree select <B><EM>Java</EM></B>, followed by <B><EM>Build Path</EM></B>, and followed by <B><EM>User Libraries</EM></B>.<BR>
+Select the <B><EM>New...</EM></B> pushbutton on the right of the New Libraries dialog to create a new user library.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/New_User_Lib.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The user library created is empty, select the <B><EM>Add JARs...</EM></B> pushbutton on the right to add all the<BR>
+jar's from your Tuscany installation <B><EM>lib folder</EM></B>. When completed all the jar's will appear under the<BR>
+TUSCANY user library.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/Tuscany_User_Lib.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Since some of you maybe interested in <B><EM>debugging</EM></B> also the Tuscany runtime code we will attach<BR>
+the Tuscany source to the Tuscany runtime jar in the following step. In the User Libraies dialog<BR>
+scroll down until you see the <B><EM>Tuscany runtime jar</EM></B> and select its <B><EM>Source attachment.</EM></B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/source_attachment.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Select the <B><EM>Edit...</EM></B> pushbutton on the right and in the Edit dialog use the <B><EM>External File...</EM></B> pushbutton<BR>
+to the select the Tuscany <B><EM>src zip</EM></B> that we downloaded earlier.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/source_attachment_config.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Select <B><EM>OK</EM></B> to complete this and the Preferences dialog, and you are done with the Tuscany setup<BR>
+for Eclipse.</P>
+
+<H2><A name="GettingStartedwithTuscany-Createyour1stCompositeServiceApplication"></A>Create your 1st Composite Service Application</H2>
+
+<P>The following shows the composition diagram for the composite service application you are about<BR>
+to create.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/first_composite.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The composite service application you will create is a composition of four services. The composed<BR>
+service provided is that of an on-line store.<BR>
+There is a Catalog service which you can ask for catalog items, and depending on its currency<BR>
+code property configuration it will provide the item prices in USD or EUR. The Catalog service is not<BR>
+doing the currency conversion itself it references a CurrencyConverter service to do that task. Then<BR>
+there is the ShoppingCart service into which items chosen from the catalog can be added, it is<BR>
+implemented as a REST service. The Catalog is bound using the JSONRPC binding, and the<BR>
+ShoppingCart service is bound using the ATOM binding. Finally there is the Store user facing<BR>
+service that provides the browser based user interface of the store. The Store service makes use of<BR>
+the Catalog and ShoppingCart service using the JSONRPC, and ATOM binding respectively.</P>
+
+<H2><A name="GettingStartedwithTuscany-CreateaJavaProject"></A>Create a Java Project</H2>
+
+<P>In this step you create a Java Project in Eclipse to hold the composite service application.<BR>
+Click on the <B><EM>New Java Project</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_project.png" style="border: 0px solid black"></SPAN>&nbsp; in the toolbar to launch the project creation dialog.<BR>
+Next you enter &quot;store&quot; as the <B><EM>Project name</EM></B>, and for <B><EM>Project Layout</EM></B> select <B><EM>Create separate</EM></B><BR>
+<B><EM>folders for sources and class files.</EM></B><BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_project_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/project_layout.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Hit the <B><EM>Next</EM></B> button, and on the following page go to the <B><EM>Libraries</EM></B> tab. Use the <B><EM>Add Library...</EM></B><BR>
+button on the right to add the TUSCANY user library to the project.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_project_lib.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;<BR>
+Hit the <B><EM>Finish</EM></B> button to complete the <B><EM>New Java Project</EM></B> dialog to create the &quot;store&quot; java project.&nbsp;<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_project_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscany-ConstructServices"></A>Construct Services</H2>
+
+<P>First you create two package folders into which later in this step you place service implementations.<BR>
+Select the &quot;store&quot; project and click on the <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN> in the toolbar to launch<BR>
+the package creation dialog.</P>
+
+<P>Next you enter &quot;services&quot; as the package <B><EM>Name</EM></B>, and press the <B><EM>Finish</EM></B> button to complete the<BR>
+dialog.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_pkg_dlg.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+Repeat the previous step to create another package named &quot;ufservices&quot;. The store project now<BR>
+should look as follows.<BR>
+&nbsp;<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_pkg_folder.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+In the following you will place in the &quot;services&quot; package the regular services, and in the &quot;ufservices&quot;<BR>
+package the user facing services of the composite service application you create.</P>
+
+<H3><A name="GettingStartedwithTuscany-Catalog"></A><EM>Catalog</EM></H3>
+
+<P>In this step you create the Catalog service interface and implementation.<BR>
+Select the &quot;services&quot; package. Next you click on the dropdown arrow next to the <B><EM>New Java Class</EM></B><BR>
+button&nbsp; <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp; and select the <B><EM>New Java Interface</EM></B>&nbsp;&nbsp;&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/interface_btn.png" style="border: 0px solid black"></SPAN> option from the dropdown list. In the dialog<BR>
+enter &quot;Catalog&quot; as the <B><EM>Name</EM></B> of the interface and select the Finish button to complete the dialog.<BR>
+The Java editor will open on the new created Java interface. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java interface code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Catalog {
+	Item[] get();
+}
+</PRE>
+</DIV></DIV>
+<P>Select the &quot;services&quot; package again. Select the <B><EM>New Java Class</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/class_btn.png" style="border: 0px solid black"></SPAN> . In the dialog enter<BR>
+&quot;CatalogImpl&quot; as the <B><EM>Name</EM></B> of the class, add &quot;Catalog&quot; as the interface this class implements, and<BR>
+then select <B><EM>Finish</EM></B> to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following Java class code snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Property;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Reference;
+
+<SPAN class="code-keyword">public</SPAN> class CatalogImpl <SPAN class="code-keyword">implements</SPAN> Catalog {
+	@Property
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> currencyCode = <SPAN class="code-quote">&quot;USD&quot;</SPAN>;
+	@Reference
+	<SPAN class="code-keyword">public</SPAN> CurrencyConverter currencyConverter;
+
+	<SPAN class="code-keyword">private</SPAN> List&lt;Item&gt; catalog = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;Item&gt;();
+
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		<SPAN class="code-object">String</SPAN> currencySymbol = currencyConverter
+				.getCurrencySymbol(currencyCode);
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Apple&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 2.99)));
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Orange&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 3.55)));
+		catalog.add(<SPAN class="code-keyword">new</SPAN> Item(<SPAN class="code-quote">&quot;Pear&quot;</SPAN>, currencySymbol
+				+ currencyConverter.getConversion(<SPAN class="code-quote">&quot;USD&quot;</SPAN>, currencyCode, 1.55)));
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item[] get() {
+		Item[] catalogArray = <SPAN class="code-keyword">new</SPAN> Item[catalog.size()];
+		catalog.toArray(catalogArray);
+		<SPAN class="code-keyword">return</SPAN> catalogArray;
+	}
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.<BR>
+<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_project.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;<BR>
+<B>Note:</B> CatalogImpl is red x'ed because it makes use of the CurrencyConverter interface that we<BR>
+have not implemented yet.<BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany-CurrencyConverter"></A><EM>CurrencyConverter</EM></H3>
+
+<P>In this step you create the CurrencyConverter service interface and implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.<BR>
+First create a Java interface in the &quot;services&quot; package named &quot;CurrencyConverter&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java interface code snippet into it.<BR>
+&nbsp;&nbsp;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CurrencyConverter {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrenycCode, <SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">double</SPAN> amount);
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode);
+}
+
+</PRE>
+</DIV></DIV>
+<P>Next create a Java class in the &quot;services&quot; package named &quot;CurrencyConverterImpl&quot; and <B><EM>copy-paste</EM></B><BR>
+the following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">public</SPAN> class CurrencyConverterImpl <SPAN class="code-keyword">implements</SPAN> CurrencyConverter {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> getConversion(<SPAN class="code-object">String</SPAN> fromCurrencyCode, <SPAN class="code-object">String</SPAN> toCurrencyCode, <SPAN class="code-object">double</SPAN> amount) {
+        <SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> amount;
+        <SPAN class="code-keyword">else</SPAN> <SPAN class="code-keyword">if</SPAN> (toCurrencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> ((<SPAN class="code-object">double</SPAN>)<SPAN class="code-object">Math</SPAN>.round(amount * 0.7256 * 100)) /100;
+        <SPAN class="code-keyword">return</SPAN> 0;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getCurrencySymbol(<SPAN class="code-object">String</SPAN> currencyCode) {
+        <SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;USD&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;$&quot;</SPAN>;
+        <SPAN class="code-keyword">else</SPAN> <SPAN class="code-keyword">if</SPAN> (currencyCode.equals(<SPAN class="code-quote">&quot;EUR&quot;</SPAN>))
+            <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;E&quot;</SPAN>; <SPAN class="code-comment">//<SPAN class="code-quote">&quot;&acirc;&sbquo;&not;&quot;</SPAN>;
+</SPAN>        <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;?&quot;</SPAN>;
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_project_1.png" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="GettingStartedwithTuscany-ShoppingCart"></A><EM>ShoppingCart</EM></H3>
+
+<P>In this step you create the Item model object, the Cart and Total service interfaces and the ShoppingCart service implementation.<BR>
+You follow the same steps that you learned previously to create the interface and implementation.</P>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;Item&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">public</SPAN> class Item {
+	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> name;
+	<SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> price;
+
+	<SPAN class="code-keyword">public</SPAN> Item() {
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item(<SPAN class="code-object">String</SPAN> name, <SPAN class="code-object">String</SPAN> price) {
+		<SPAN class="code-keyword">this</SPAN>.name = name;
+		<SPAN class="code-keyword">this</SPAN>.price = price;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getName() {
+		<SPAN class="code-keyword">return</SPAN> name;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void setName(<SPAN class="code-object">String</SPAN> name) {
+		<SPAN class="code-keyword">this</SPAN>.name = name;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getPrice() {
+		<SPAN class="code-keyword">return</SPAN> price;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void setPrice(<SPAN class="code-object">String</SPAN> price) {
+		<SPAN class="code-keyword">this</SPAN>.price = price;
+	}
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java interface in the &quot;services&quot; package named &quot;Cart&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.Collection;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Cart <SPAN class="code-keyword">extends</SPAN> Collection&lt;<SPAN class="code-object">String</SPAN>, Item&gt; {
+
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java interface in the &quot;services&quot; package named &quot;Total&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following code snippet into it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Total {
+	<SPAN class="code-object">String</SPAN> getTotal();
+}
+</PRE>
+</DIV></DIV>
+
+<P>Create a Java class in the &quot;services&quot; package named &quot;ShoppingCartImpl&quot; and <B><EM>copy-paste</EM></B> the<BR>
+following Java class code snippet into it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> services;
+
+<SPAN class="code-keyword">import</SPAN> java.util.ArrayList;
+<SPAN class="code-keyword">import</SPAN> java.util.HashMap;
+<SPAN class="code-keyword">import</SPAN> java.util.List;
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+<SPAN class="code-keyword">import</SPAN> java.util.UUID;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.Entry;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.data.collection.NotFoundException;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Init;
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Scope;
+
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>)
+<SPAN class="code-keyword">public</SPAN> class ShoppingCartImpl <SPAN class="code-keyword">implements</SPAN> Cart, Total {
+
+	<SPAN class="code-keyword">private</SPAN> Map&lt;<SPAN class="code-object">String</SPAN>, Item&gt; cart;
+
+	@Init
+	<SPAN class="code-keyword">public</SPAN> void init() {
+		cart = <SPAN class="code-keyword">new</SPAN> HashMap&lt;<SPAN class="code-object">String</SPAN>, Item&gt;();
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] getAll() {
+		Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] entries = <SPAN class="code-keyword">new</SPAN> Entry[cart.size()];
+		<SPAN class="code-object">int</SPAN> i = 0;
+		<SPAN class="code-keyword">for</SPAN> (Map.Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt; e : cart.entrySet()) {
+			entries[i++] = <SPAN class="code-keyword">new</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;(e.getKey(), e.getValue());
+		}
+		<SPAN class="code-keyword">return</SPAN> entries;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Item get(<SPAN class="code-object">String</SPAN> key) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		Item item = cart.get(key);
+		<SPAN class="code-keyword">if</SPAN> (item == <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		} <SPAN class="code-keyword">else</SPAN> {
+			<SPAN class="code-keyword">return</SPAN> item;
+		}
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> post(<SPAN class="code-object">String</SPAN> key, Item item) {
+		<SPAN class="code-keyword">if</SPAN> (key == <SPAN class="code-keyword">null</SPAN>) {
+			key = <SPAN class="code-quote">&quot;cart-&quot;</SPAN> + UUID.randomUUID().toString();
+		}
+		cart.put(key, item);
+		<SPAN class="code-keyword">return</SPAN> key;
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void put(<SPAN class="code-object">String</SPAN> key, Item item) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (!cart.containsKey(key)) {
+			<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		}
+		cart.put(key, item);
+	}
+
+	<SPAN class="code-keyword">public</SPAN> void delete(<SPAN class="code-object">String</SPAN> key) <SPAN class="code-keyword">throws</SPAN> NotFoundException {
+		<SPAN class="code-keyword">if</SPAN> (key == <SPAN class="code-keyword">null</SPAN> || key.equals(&quot;&quot;)) {
+			cart.clear();
+		} <SPAN class="code-keyword">else</SPAN> {
+			Item item = cart.remove(key);
+			<SPAN class="code-keyword">if</SPAN> (item == <SPAN class="code-keyword">null</SPAN>)
+				<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotFoundException(key);
+		}
+	}
+
+	<SPAN class="code-keyword">public</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;[] query(<SPAN class="code-object">String</SPAN> queryString) {
+		List&lt;Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;&gt; entries = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;&gt;();
+		<SPAN class="code-keyword">if</SPAN> (queryString.startsWith(<SPAN class="code-quote">&quot;name=&quot;</SPAN>)) {
+			<SPAN class="code-object">String</SPAN> name = queryString.substring(5);
+			<SPAN class="code-keyword">for</SPAN> (Map.Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt; e : cart.entrySet()) {
+				Item item = e.getValue();
+				<SPAN class="code-keyword">if</SPAN> (item.getName().equals(name)) {
+					entries.add(<SPAN class="code-keyword">new</SPAN> Entry&lt;<SPAN class="code-object">String</SPAN>, Item&gt;(e.getKey(), e
+							.getValue()));
+				}
+			}
+		}
+		<SPAN class="code-keyword">return</SPAN> entries.toArray(<SPAN class="code-keyword">new</SPAN> Entry[entries.size()]);
+	}
+
+	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getTotal() {
+		<SPAN class="code-object">double</SPAN> total = 0;
+		<SPAN class="code-object">String</SPAN> currencySymbol = &quot;&quot;;
+		<SPAN class="code-keyword">if</SPAN> (!cart.isEmpty()) {
+			Item item = cart.values().iterator().next();
+			currencySymbol = item.getPrice().substring(0, 1);
+		}
+		<SPAN class="code-keyword">for</SPAN> (Item item : cart.values()) {
+			total += <SPAN class="code-object">Double</SPAN>.valueOf(item.getPrice().substring(1));
+		}
+		<SPAN class="code-keyword">return</SPAN> currencySymbol + <SPAN class="code-object">String</SPAN>.valueOf(total);
+	}
+}
+</PRE>
+</DIV></DIV>
+<P><B>Note:</B> Since the Tuscany conversational support is not ready yet the cart is realized through a hack.<BR>
+The cart field is defined as static.</P>
+
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_project_2.png" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H3><A name="GettingStartedwithTuscany-%7B%7DStore%7B%7D"></A><B><EM>Store</EM></B></H3>
+
+<P>In this step you create the user facing Store service that will run in a Web browser and provide the<BR>
+user interface to the other services you created.</P>
+
+<P>Select the &quot;ufservices&quot; package. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and then <B><EM>File</EM></B>. In<BR>
+the <B><EM>New File</EM></B> dialog enter &quot;store.html&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B> to complete the<BR>
+dialog.</P>
+
+<P>The Text editor will open on the new created html file. Replace the content of the editor by <B><EM>copy-paste</EM></B><BR>
+of the following html snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;Store&lt;/title&gt;
+
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;store.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+&lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> catalog = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;catalog&quot;</SPAN>);
+	
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> shoppingCart = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>);
+
+	<SPAN class="code-comment">//@Reference
+</SPAN>	<SPAN class="code-keyword">var</SPAN> shoppingTotal = <SPAN class="code-keyword">new</SPAN> tuscany.sca.Reference(<SPAN class="code-quote">&quot;shoppingTotal&quot;</SPAN>);
+	
+	<SPAN class="code-keyword">var</SPAN> catalogItems;
+
+	function catalog_getResponse(items) {
+		<SPAN class="code-keyword">var</SPAN> catalog = &quot;&quot;;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++) {
+			<SPAN class="code-keyword">var</SPAN> item = items[i].name + ' - ' + items[i].price;
+			catalog += '&lt;input name=<SPAN class="code-quote">&quot;items&quot;</SPAN> type=<SPAN class="code-quote">&quot;checkbox&quot;</SPAN> value=&quot;' + 
+						item + '&quot;&gt;' + item + ' &lt;br&gt;';
+		}
+		document.getElementById('catalog').innerHTML=catalog;
+		catalogItems = items;
+	}
+	
+	function shoppingCart_getResponse(feed) {
+		<SPAN class="code-keyword">if</SPAN> (feed != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);              
+			<SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+			<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+				<SPAN class="code-keyword">var</SPAN> content = entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0];
+				<SPAN class="code-keyword">var</SPAN> name = content.getElementsByTagName(<SPAN class="code-quote">&quot;name&quot;</SPAN>)[0].firstChild.nodeValue;
+				<SPAN class="code-keyword">var</SPAN> price = content.getElementsByTagName(<SPAN class="code-quote">&quot;price&quot;</SPAN>)[0].firstChild.nodeValue;
+				list += name + ' - ' + price + ' &lt;br&gt;';
+			}
+			document.getElementById(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>).innerHTML = list;
+
+			<SPAN class="code-keyword">if</SPAN> (entries.length != 0) {			
+				shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+			}
+		}
+	}
+	
+	function shoppingTotal_getTotalResponse(total) {
+		document.getElementById('total').innerHTML = total;
+	}
+	
+	function shoppingCart_postResponse(entry) {
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}				
+
+	function addToCart() {
+		<SPAN class="code-keyword">var</SPAN> items  = document.catalogForm.items;
+		<SPAN class="code-keyword">var</SPAN> j = 0;
+		<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;items.length; i++)
+			<SPAN class="code-keyword">if</SPAN> (items[i].checked) {
+				<SPAN class="code-keyword">var</SPAN> entry = '&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;&lt;title&gt;item&lt;/title&gt;&lt;content type=<SPAN class="code-quote">&quot;text/xml&quot;</SPAN>&gt;' +
+</SPAN>                	'&lt;Item xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//services/&quot;</SPAN>&gt;' +
+</SPAN>                	'&lt;name xmlns=<SPAN class="code-quote">&quot;&quot;&gt;' + catalogItems[i].name + '&lt;/name&gt;' + '&lt;price xmlns=&quot;</SPAN>&quot;&gt;' + catalogItems[i].price + '&lt;/price&gt;' +
+                 	'&lt;/Item&gt;' + '&lt;/content&gt;&lt;/entry&gt;';
+				shoppingCart.post(entry, shoppingCart_postResponse);
+				items[i].checked = <SPAN class="code-keyword">false</SPAN>;
+			}
+	}
+	function checkoutCart() {
+		document.getElementById('store').innerHTML='&lt;h2&gt;' +
+				'Thanks <SPAN class="code-keyword">for</SPAN> Shopping With Us!&lt;/h2&gt;'+
+				'&lt;h2&gt;Your Order&lt;/h2&gt;'+
+				'&lt;form name=<SPAN class="code-quote">&quot;orderForm&quot;</SPAN>&gt;'+
+					document.getElementById('shoppingCart').innerHTML+
+					'&lt;br&gt;'+
+					document.getElementById('total').innerHTML+
+					'&lt;br&gt;'+
+
+					'&lt;br&gt;'+
+					'&lt;input type=<SPAN class="code-quote">&quot;submit&quot;</SPAN> value=<SPAN class="code-quote">&quot;Continue Shopping&quot;</SPAN>&gt;'+ 
+				'&lt;/form&gt;';
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+	}
+	function deleteCart() {
+		shoppingCart.del(&quot;&quot;, <SPAN class="code-keyword">null</SPAN>);
+		document.getElementById('shoppingCart').innerHTML = &quot;&quot;;
+		document.getElementById('total').innerHTML = &quot;&quot;;	
+	}	
+
+	function init() {
+		catalog.get(catalog_getResponse);
+		shoppingCart.get(&quot;&quot;, shoppingCart_getResponse);
+	}
+	
+&lt;/script&gt;
+
+&lt;/head&gt;
+
+&lt;body onload=<SPAN class="code-quote">&quot;init()&quot;</SPAN>&gt;
+&lt;h1&gt;Store&lt;/h1&gt;
+  &lt;div id=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+   	&lt;h2&gt;Catalog&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;catalogForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> &gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;addToCart()&quot;</SPAN>  value=<SPAN class="code-quote">&quot;Add to Cart&quot;</SPAN>&gt;
+   	&lt;/form&gt;
+ 
+ 	&lt;br&gt;
+  
+   	&lt;h2&gt;Your Shopping Cart&lt;/h2&gt;
+   	&lt;form name=<SPAN class="code-quote">&quot;shoppingCartForm&quot;</SPAN>&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;
+		&lt;div id=<SPAN class="code-quote">&quot;total&quot;</SPAN>&gt;&lt;/div&gt;
+		&lt;br&gt;		
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;checkoutCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Checkout&quot;</SPAN>&gt; 
+		&lt;input type=<SPAN class="code-quote">&quot;button&quot;</SPAN> onClick=<SPAN class="code-quote">&quot;deleteCart()&quot;</SPAN> value=<SPAN class="code-quote">&quot;Empty&quot;</SPAN>&gt;     
+	   	&lt;a href=<SPAN class="code-quote">&quot;../ShoppingCart/Cart/&quot;</SPAN>&gt;(feed)&lt;/a&gt;
+	&lt;/form&gt;    
+  &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_project_3.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="GettingStartedwithTuscany-ComposeServices"></A>Compose Services</H2>
+
+<P>Now that you have all the required service implementations you compose them together to provide<BR>
+the store composite service. The composition is stored in a .composite file.</P>
+
+<P>Select the &quot;src&quot; folder of the &quot;store&quot; project. <B><EM>Right click</EM></B> to get the context menu, select <B><EM>New</EM></B>, and<BR>
+then <B><EM>File</EM></B>. In the <B><EM>New File</EM></B> dialog enter &quot;store.composite&quot; for the <B><EM>File name</EM></B>, and then select <B><EM>Finish</EM></B><BR>
+to complete the dialog.</P>
+
+<P>The Text editor will open on the new created composite file. Replace the content of the editor by<BR>
+<B><EM>copy-paste</EM></B> of the following composite snippet.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	xmlns:s=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN> 
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN> 
+</SPAN>	name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+	
+	&lt;component name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		&lt;t:implementation.widget location=<SPAN class="code-quote">&quot;ufservices/store.html&quot;</SPAN> /&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Widget&quot;</SPAN>&gt;
+			&lt;t:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/store&quot;</SPAN> /&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> target=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc /&gt;
+		&lt;/reference&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart/Cart&quot;</SPAN>&gt;
+			&lt;t:binding.atom /&gt;
+		&lt;/reference&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;shoppingTotal&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart/Total&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc /&gt;
+		&lt;/reference&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CatalogImpl&quot;</SPAN> /&gt;
+		&lt;property name=<SPAN class="code-quote">&quot;currencyCode&quot;</SPAN>&gt;USD&lt;/property&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Catalog&quot;</SPAN>/&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;reference name=<SPAN class="code-quote">&quot;currencyConverter&quot;</SPAN> target=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN> /&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.ShoppingCartImpl&quot;</SPAN> /&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Cart&quot;</SPAN>&gt;
+			&lt;t:binding.atom uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/ShoppingCart/Cart&quot;</SPAN> /&gt;
+</SPAN>		&lt;/service&gt;
+		&lt;service name=<SPAN class="code-quote">&quot;Total&quot;</SPAN>&gt;
+			&lt;t:binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Total&quot;</SPAN>/&gt;
+</SPAN>		&lt;/service&gt;
+	&lt;/component&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;CurrencyConverter&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;services.CurrencyConverterImpl&quot;</SPAN> /&gt;
+	&lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>After completing these steps the content of the &quot;store&quot; project will look as follows.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_project_4.jpg" style="border: 0px solid black"></SPAN><BR>
+&nbsp;</P>
+
+<H2><A name="GettingStartedwithTuscany-LaunchServices"></A>Launch Services</H2>
+
+<P>In this step you create the code to launch the Tuscany runtime with the new store composite service you created.</P>
+
+<P>Select the &quot;store&quot; project and click on the  <B><EM>New Java Package</EM></B> button <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/new_java_pkg_btn.png" style="border: 0px solid black"></SPAN> in the toolbar to start the package creation dialog. Use the dialog to create a new package named &quot;launch&quot;.</P>
+
+<P>Select the &quot;launch&quot; package. Select the <B><EM>New Java Class</EM></B> button&nbsp; <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/class_btn.png" style="border: 0px solid black"></SPAN>&nbsp;. In the dialog enter &quot;Launch&quot; as the Name of the class, check the checkbox for creating a main method stub, and then select Finish to complete the dialog.</P>
+
+<P>The Java editor will open on the new created Java class. Replace the content of the editor by copy-paste of the following Java class code snippet.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+<SPAN class="code-keyword">package</SPAN> launch;
+
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.host.embedded.SCADomain;
+
+<SPAN class="code-keyword">public</SPAN> class Launch {
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Starting ...&quot;</SPAN>);
+        SCADomain scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;store.composite&quot;</SPAN>);
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;store.composite ready <SPAN class="code-keyword">for</SPAN> big business !!!&quot;</SPAN>);
+        <SPAN class="code-object">System</SPAN>.in.read();
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Stopping ...&quot;</SPAN>);
+        scaDomain.close();
+        <SPAN class="code-object">System</SPAN>.out.println();
+    }
+}
+</PRE>
+</DIV></DIV>
+
+
+<P>Congratulations you completed your 1st composite service applications, now its time to take it into<BR>
+action.</P>
+
+<H2><A name="GettingStartedwithTuscany-UseServices"></A>Use Services</H2>
+
+<P>In this step you launch and use the store composite service application you created.</P>
+
+<P>First select the &quot;Launch&quot; class in the &quot;launch&quot; package of your &quot;store&quot; project. <B><EM>Right click</EM></B> to get the<BR>
+context menu, select <B><EM>Run As</EM></B>, and then <B><EM>Java application</EM></B>. The Tuscany runtime will start up adding<BR>
+the store composition to its domain.</P>
+
+<P>The Eclipse console will show the following messages.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/eclipse_console.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Next Launch your Web browser and enter the following address:</P>
+
+<P><A href="http://localhost:8080/store/store.html" class="external-link" rel="nofollow">http://localhost:8080/store/store.html</A>&nbsp;</P>
+
+<P>&nbsp;You get to the Store user facing service of the composite service application.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>You can select items from the Catalog and add them to your Shopping Cart.</P>
+
+<P><B>Note:</B> When adding items for the first time you will be asked for <B><EM>userid and password</EM></B> by the<BR>
+browser. Enter &quot;admin&quot; for both.</P>
+
+<P> <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_page_1.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Since the ShoppingCart service is bound using the ATOM binding, you can also look at the<BR>
+shopping card content in ATOM feed form by clicking on the feed icon <SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/atom_feed.png" style="border: 0px solid black"></SPAN>. You get the browsers default rendering for ATOM feeds.</P>
+
+<P>&nbsp;<SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/atom_feeds_page.png" style="border: 0px solid black"></SPAN></P>
+
+<P>&nbsp;Use the browser back button to get back to the Store page.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_page_2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>And then you can Checkout to complete your order.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started-with-tuscany.data/store_page_3.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Congratulations, you have created an accessible, flexible, reusable Store application using Tuscany SCA technology.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg b/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg
new file mode 100644
index 0000000000..f42b3db699
--- /dev/null
+++ b/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg
diff --git a/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg.jpeg b/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg.jpeg
new file mode 100644
index 0000000000..19c70d6d83
--- /dev/null
+++ b/site/trunk/site-publish/getting-started.data/eclipse_m2_repo.jpg.jpeg
diff --git a/site/trunk/site-publish/getting-started.html b/site/trunk/site-publish/getting-started.html
new file mode 100644
index 0000000000..f5c0e975d4
--- /dev/null
+++ b/site/trunk/site-publish/getting-started.html
@@ -0,0 +1,213 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Getting Started</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44794">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Started">Getting Started</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="GettingStarted-GettingStartedwithTuscanySCAforJava"></A>Getting Started with Tuscany SCA for Java</H1>
+
+
+<H2><A name="GettingStarted-Overview"></A>Overview</H2>
+
+
+<H2><A name="GettingStarted-Setupthedevelopmentenvironment"></A>Set up the development environment</H2>
+
+<P>1) Repository</P>
+
+<P>Tuscany source code is hosted at Apache subversion repository. If you want to build Tuscany from source, you need to install a subversion client. </P>
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Where to download the subversion clients?</B><BR>Command line: <A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">http://subversion.tigris.org/</A> (1.4.2)<BR>
+Windows GUI: <A href="http://tortoisesvn.tigris.org/" class="external-link" rel="nofollow">http://tortoisesvn.tigris.org/</A> (1.4.1)</TD></TR></TABLE></DIV>
+<P>2) Build </P>
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Where to download maven?</B><BR>Maven 2: <A href="http://maven.apache.org/" class="external-link" rel="nofollow">http://maven.apache.org/</A> (2.0.4)</TD></TR></TABLE></DIV>
+<P>3) Development IDE </P>
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Where to download Eclipse/WTP?</B><BR>Eclipse: <A href="http://www.eclipse.org/" class="external-link" rel="nofollow">http://www.eclipse.org/</A> (3.2.1)<BR>
+Eclipse WTP: <A href="http://www.eclipse.org/webtools/" class="external-link" rel="nofollow">http://www.eclipse.org/webtools/</A> (1.5.2)</TD></TR></TABLE></DIV>
+
+<H2><A name="GettingStarted-Createasimpleprojectfromscratch"></A>Create a simple project from scratch</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn archetype:create -DgroupId=sample -DartifactId=helloworld
+</PRE>
+</DIV></DIV>
+
+<H2><A name="GettingStarted-Configuretheprojectformavenbuild"></A>Configure the project for maven build</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;project&gt;
+    &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+    &lt;groupId&gt;org.apache.tuscany.samples.sca&lt;/groupId&gt;
+    &lt;version&gt;1.0-incubator-SNAPSHOT&lt;/version&gt;
+    &lt;artifactId&gt;sample-mortgage&lt;/artifactId&gt;
+    &lt;packaging&gt;jar&lt;/packaging&gt;
+    &lt;name&gt;Tuscany Mortgage Sample&lt;/name&gt;
+    &lt;description&gt;A sample Mortgage application made of several SCA components wired together.&lt;/description&gt;
+
+    &lt;properties&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;tuscanyVersion&quot;</SPAN>&gt;1.0-incubator-SNAPSHOT&lt;/property&gt;
+    &lt;/properties&gt;
+
+    &lt;dependencies&gt;
+        &lt;dependency&gt;
+            &lt;groupId&gt;org.osoa&lt;/groupId&gt;
+            &lt;artifactId&gt;sca-api-r0.95&lt;/artifactId&gt;
+            &lt;version&gt;${tuscanyVersion}&lt;/version&gt;
+        &lt;/dependency&gt;
+        &lt;dependency&gt;
+            &lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt;
+            &lt;artifactId&gt;test&lt;/artifactId&gt;
+            &lt;version&gt;${tuscanyVersion}&lt;/version&gt;
+            &lt;scope&gt;test&lt;/scope&gt;
+        &lt;/dependency&gt;
+&lt;/project&gt;
+</PRE>
+</DIV></DIV>
+
+<H2><A name="GettingStarted-LoadtheprojectintoEclipse"></A>Load the project into Eclipse</H2>
+
+<P>1. Adding M2_REPO classpath variable</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo
+</PRE>
+</DIV></DIV>
+
+<P><SPAN class="image-wrap" style=""><IMG src="getting-started.data/eclipse_m2_repo.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>2. (Optional) Add maven as an external tool for Eclipse</P>
+
+<P>3. Create Eclispe metadata files</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<P>4. Import projects into Eclipse<BR>
+File --&gt; Import ... --&gt; Existing Projects into Workspace</P>
+
+<DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>&quot;Maven integration with Eclipse&quot;</B><BR><A href="http://maven.apache.org/guides/mini/guide-ide-eclipse.html" class="external-link" rel="nofollow">http://maven.apache.org/guides/mini/guide-ide-eclipse.html</A></TD></TR></TABLE></DIV>
+
+<H2><A name="GettingStarted-DevelopasimpleSCAapplication"></A>Develop a simple SCA application</H2>
+
+<P>1. Declare components in the SCDL</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>META-INF/sca/default.scdl</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+The SCDL file
+</PRE>
+</DIV></DIV>
+
+<P>2. Implement the components in java</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>CreditCheckImpl.java</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+The java file
+</PRE>
+</DIV></DIV>
+
+<H2><A name="GettingStarted-RuntheSCAapplication"></A>Run the SCA application </H2>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/getting-tuscanys-java-sca-implementation.html b/site/trunk/site-publish/getting-tuscanys-java-sca-implementation.html
new file mode 100644
index 0000000000..1237e0f72f
--- /dev/null
+++ b/site/trunk/site-publish/getting-tuscanys-java-sca-implementation.html
@@ -0,0 +1,134 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Getting Tuscany's Java SCA Implementation</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Tuscany's Java SCA Implementation">Getting Tuscany's Java SCA Implementation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Getting Tuscany's Java SCA Implementation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 09, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=44875&originalId=45032">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="GettingTuscany%27sJavaSCAImplementation-Choosingbetweenapackageruntimeandbuildingyourown"></A>Choosing between a package runtime and building your own</H1>
+
+<H1><A name="GettingTuscany%27sJavaSCAImplementation-Downloadingandinstallingarelease"></A>Downloading and installing a release</H1>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="pre-packaged-or-roll-your-own.html" title="Pre-packaged or roll your own?">Pre-packaged or roll your own?</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/getting-tuscnays-java-sca.html b/site/trunk/site-publish/getting-tuscnays-java-sca.html
new file mode 100644
index 0000000000..e25610ecbe
--- /dev/null
+++ b/site/trunk/site-publish/getting-tuscnays-java-sca.html
@@ -0,0 +1,118 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Getting Tuscnay's Java SCA</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Getting Tuscnay's Java SCA">Getting Tuscnay's Java SCA</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Getting Tuscnay's Java SCA</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 08, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/graph-merge.html b/site/trunk/site-publish/graph-merge.html
new file mode 100644
index 0000000000..a510810570
--- /dev/null
+++ b/site/trunk/site-publish/graph-merge.html
@@ -0,0 +1,123 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Graph Merge</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53925">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Graph Merge">Graph Merge</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="GraphMerge-GraphMerge"></A>Graph Merge</H1>
+
+<P>Graph Merger utility helps in managing DataObjects creation using DataObjectModel and merging multiple DataObjects into single DataObject. <BR>
+The RDBDAS can produce graphs of dynamic DataObjects as well as Static DataObjects.</P>
+
+<H3><A name="GraphMerge-EmptyGraphandDataObjectcreation"></A>Empty Graph and DataObject creation</H3>
+
+<P>When dealing in static way, DAS config's dataObjectModel attribute needs a valid value. Using this and SDO's TypeHelper, DAS can get Types for the Static DataObjects. With these SDO Types, DAS can create an empty DataGraph, add new DataObjects to it which can later be committed to database.</P>
+
+<H3><A name="GraphMerge-DataObjectsMerge"></A>DataObjects Merge</H3>
+
+<P>Also, two or more DataObjects can be merged into a single DataObject. For this the GraphMerge needs to know the primary key name for all the DataObjects getting merged. The DataObjects being merged can correspond to same or different database tables.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/haleh-sandbox.html b/site/trunk/site-publish/haleh-sandbox.html
new file mode 100644
index 0000000000..7a5e5d3543
--- /dev/null
+++ b/site/trunk/site-publish/haleh-sandbox.html
@@ -0,0 +1,127 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Haleh-Sandbox : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45888">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Haleh-Sandbox">Haleh-Sandbox</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>Welcome</B> to the open source Apache Tuscany project!  The Tuscany community is working together to create a robust infrastructure that aims to simplify the development of service oriented (SOA) systems. </P>
+
+<P>Tuscany is based on open standards defined by the <SPAN class="nobr"><A href="http://osoa.org/" title="Visit page outside Confluence" rel="nofollow">Open SOA Collaboration<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and is comprised of independent technologies designed to work well together based on:</P>
+
+<P>Apache Tuscany is based on independent technologies that together provide following:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> enables composition of service networks through assembly of existing and new services. As an example, a service can be implemented as JAX-WS service, Spring Bean or EJB and exposed as a web service. Tuscany SCA allows services to be implemented in variety of languages such as Java, JavaScript and C&#43;&#43;. The Tuscany SCA runtime is implemented in Java and C&#43;&#43; and can easily be extended to support any communication transport, qualities of service or programming model and can be used in conjunction with other technologies such as Spring, Axis and Celtix.</LI>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C+&#43; implementations for SDO.</LI>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS.</LI>
+</UL>
+
+
+
+<P>Please join us to develop this innovative infrastructure and/or provide feedback based on your experiences.  With your help Apache Tuscany will become a first class solution for simplifying the development of SOA-based systems.</P>
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The <SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">Apache Software Foundation (ASF)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/home-subpage.html b/site/trunk/site-publish/home-subpage.html
new file mode 100644
index 0000000000..63c8767328
--- /dev/null
+++ b/site/trunk/site-publish/home-subpage.html
@@ -0,0 +1,147 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Home Subpage</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=102074">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Home Subpage">Home Subpage</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+
+<P>In addition, Tuscany is integrated with various technologies and offers:</P>
+<UL>
+	<LI>a wide range of bindings (pluggable protocols)</LI>
+	<LI>various component types including and not limited to Java, C++, BPEL, Spring and scripting</LI>
+	<LI>an end to end service and data solution which includes support for Jaxb and SDO</LI>
+	<LI>a lightweight runtime that works standalone or with other application servers</LI>
+	<LI>a modular architecture that makes it easy to integrate with different technologies and to extend</LI>
+	<LI>Integration with web20 technologies</LI>
+</UL>
+
+
+<P>Apache Tuscany SCA is implemented in <A href="http://tuscany.apache.org/sca-java.html" class="external-link" rel="nofollow">Java</A> and <A href="http://tuscany.apache.org/sca-native.html" class="external-link" rel="nofollow">C+&#43; (referred to as Native) </A>. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Overview" class="external-link" rel="nofollow">Learn more about SCA </A></P>
+
+<P>Please join us to create a practical SOA infrastructure that addresses the challenges which small to large scale businesses face.</P>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD>
+<TD class="confluenceTd" valign="top" width="25%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0</B> <EM>(July, 2012)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.2</B> <EM>(April 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta2</B> <EM>(February, 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta1</B> <EM>(November, 2010)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.1</B> <EM>(November 2010)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-M5.1</B> <EM>(October, 2010)</EM></A></LI>
+	<LI><A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases"><B>SCA Java Travel Sample 1.0</B> <EM>(June 2010)</EM></A></LI>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.6</B> <EM>(Feb, 2010)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/home.data/Logo.png b/site/trunk/site-publish/home.data/Logo.png
new file mode 100644
index 0000000000..9b25eddb5d
--- /dev/null
+++ b/site/trunk/site-publish/home.data/Logo.png
diff --git a/site/trunk/site-publish/home.data/Logo.png.jpeg b/site/trunk/site-publish/home.data/Logo.png.jpeg
new file mode 100644
index 0000000000..f0cd122a0d
--- /dev/null
+++ b/site/trunk/site-publish/home.data/Logo.png.jpeg
diff --git a/site/trunk/site-publish/home.data/SCAMessage.JPG b/site/trunk/site-publish/home.data/SCAMessage.JPG
new file mode 100644
index 0000000000..d444c21949
--- /dev/null
+++ b/site/trunk/site-publish/home.data/SCAMessage.JPG
diff --git a/site/trunk/site-publish/home.data/SCAMessage.JPG.jpeg b/site/trunk/site-publish/home.data/SCAMessage.JPG.jpeg
new file mode 100644
index 0000000000..25f10ba6ee
--- /dev/null
+++ b/site/trunk/site-publish/home.data/SCAMessage.JPG.jpeg
diff --git a/site/trunk/site-publish/home.data/TitleC.png b/site/trunk/site-publish/home.data/TitleC.png
new file mode 100644
index 0000000000..1d7c1751a5
--- /dev/null
+++ b/site/trunk/site-publish/home.data/TitleC.png
diff --git a/site/trunk/site-publish/home.data/TitleC.png.jpeg b/site/trunk/site-publish/home.data/TitleC.png.jpeg
new file mode 100644
index 0000000000..5b6576ab0a
--- /dev/null
+++ b/site/trunk/site-publish/home.data/TitleC.png.jpeg
diff --git a/site/trunk/site-publish/home.data/Tuscany Logo.png b/site/trunk/site-publish/home.data/Tuscany Logo.png
new file mode 100644
index 0000000000..4e3073ff34
--- /dev/null
+++ b/site/trunk/site-publish/home.data/Tuscany Logo.png
diff --git a/site/trunk/site-publish/home.data/Tuscany Logo.png.jpeg b/site/trunk/site-publish/home.data/Tuscany Logo.png.jpeg
new file mode 100644
index 0000000000..8039fa4983
--- /dev/null
+++ b/site/trunk/site-publish/home.data/Tuscany Logo.png.jpeg
diff --git a/site/trunk/site-publish/home.html b/site/trunk/site-publish/home.html
new file mode 100644
index 0000000000..1a6e80c912
--- /dev/null
+++ b/site/trunk/site-publish/home.html
@@ -0,0 +1,192 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Home</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34462">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Home">Home</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Home-WelcometoApacheTuscany"></A>Welcome to Apache Tuscany</H3>
+<P>Apache Tuscany simplifies the task of developing <A href="http://en.wikipedia.org/wiki/Service-oriented_architecture" class="external-link" rel="nofollow">SOA</A> solutions by providing a comprehensive infrastructure for SOA development and management that is based on Service Component Architecture (SCA) standard. With SCA as it's foundation, Tuscany offers solution developers the following advantages: </P>
+<UL>
+	<LI>Provides a model for creating composite applications by defining the services in the fabric and their relationships with one another. The services can be implemented in any technology.</LI>
+	<LI>Enables service developers to create reusable services that only contain business logic. Protocols are pushed out of business logic and are handled through pluggable bindings. This lowers development cost.</LI>
+	<LI>Applications can easily adapt to infrastructure changes without recoding since protocols are handled via pluggable bindings and quality of services (transaction, security) are handled declaratively.</LI>
+	<LI>Existing applications can work with new SCA compositions. This allows for incremental growth towards a more flexible architecture, outsourcing or providing services to others.</LI>
+</UL>
+
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+
+<P>In addition, Tuscany is integrated with various technologies and offers:</P>
+<UL>
+	<LI>a wide range of bindings (pluggable protocols)</LI>
+	<LI>various component types including and not limited to Java, C++, BPEL, Spring and scripting</LI>
+	<LI>an end to end service and data solution which includes support for Jaxb and SDO</LI>
+	<LI>a lightweight runtime that works standalone or with other application servers</LI>
+	<LI>a modular architecture that makes it easy to integrate with different technologies and to extend</LI>
+	<LI>Integration with web20 technologies</LI>
+</UL>
+
+
+<P>Apache Tuscany SCA is implemented in <A href="http://tuscany.apache.org/sca-java.html" class="external-link" rel="nofollow">Java</A> and <A href="http://tuscany.apache.org/sca-native.html" class="external-link" rel="nofollow">C+&#43; (referred to as Native) </A>. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Overview" class="external-link" rel="nofollow">Learn more about SCA </A></P>
+
+<P>Please join us to create a practical SOA infrastructure that addresses the challenges which small to large scale businesses face.</P>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD>
+<TD class="confluenceTd" valign="top" width="25%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0</B> <EM>(July, 2012)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.2</B> <EM>(April 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta2</B> <EM>(February, 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta1</B> <EM>(November, 2010)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.1</B> <EM>(November 2010)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-M5.1</B> <EM>(October, 2010)</EM></A></LI>
+	<LI><A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases"><B>SCA Java Travel Sample 1.0</B> <EM>(June 2010)</EM></A></LI>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.6</B> <EM>(Feb, 2010)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/homenew.html b/site/trunk/site-publish/homenew.html
new file mode 100644
index 0000000000..a11eb14a0e
--- /dev/null
+++ b/site/trunk/site-publish/homenew.html
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Home_new : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=88987">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Home_new">Home_new</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="projects-using-tuscany.html" title="Projects Using Tuscany">User Feedback</A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Home_new-Overview"></A>Overview</H3>
+
+<P>Welcome to the Apache Tuscany project&#33; The Tuscany community is working to create a robust and easy to use infrastructure that simplifies the development of service-based application networks and addresses real business problems posed in SOA.</P>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<P>Tuscany is based on specifications defined by the <SPAN class="nobr"><A href="http://oasis-opencsa.org/" title="Visit page outside Confluence" rel="nofollow">OASIS Open CSA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>Member Section and the <SPAN class="nobr"><A href="http://osoa.org/" title="Visit page outside Confluence" rel="nofollow">Open SOA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>Collaboration:</P>
+
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> - An essential characteristic of SOA is the ability to assemble new and existing services to create brand new applications that may consist of different technologies. Service Component Architecture defines a simple, service-based model for construction, assembly and deployment of a network of services (existing and new ones) that are defined in a language-neutral way. Tuscany implements the <SPAN class="nobr"><A href="http://osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" title="Visit page outside Confluence" rel="nofollow">SCA Version 1.0<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>specifications. <A href="sca-overview.html" title="SCA Overview">Learn more about SCA</A></LI>
+</UL>
+
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+<DIV class="panel" style="border-style: solid; border-color: #BEBFD6; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #BEBFD6; background-color: #BEBFD6; "><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8; ">
+<UL>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.2.1-incubating</B> <EM>(June, 2008)</EM></A></LI>
+	<LI><A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating"><B>SDO Java 1.1-incubating</B></A> <EM><A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating"><EM>(Apr 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<UL>
+	<LI><B>Service Data Objects (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Tuscany implements the <SPAN class="nobr"><A href="http://osoa.org/display/Main/Service%20Data%20Objects%20Specifications" title="Visit page outside Confluence" rel="nofollow">SDO Version 2.1<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>specifications. <A href="sdo-overview.html" title="SDO Overview">Learn more about SDO</A></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. <A href="das-overview.html" title="DAS Overview">Learn more about DAS</A></LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="border-style: solid; border-color: #BEBFD6; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #BEBFD6; background-color: #BEBFD6; "><B>Get Involved</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8; ">
+<UL>
+	<LI><SPAN class="nobr"><A href="getting-involved-projects.html#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" title="Visit page outside Confluence" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="getting-involved-projects.html#GettingInvolved-Projects-DataFeeds%2526DataServices" title="Visit page outside Confluence" rel="nofollow"><B>Implement Data Services</B> <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="getting-involved-projects.html" title="Visit page outside Confluence" rel="nofollow"><B>And much more</B> <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+<P>The above mentioned technologies provide a full infrastructure for developing and running SOA based applications. They are not dependent on one another and can be used independently.</P>
+
+<P>Please join us to create a simple, practical, extensible SOA infrastructure to address the problems that large-scale applications and service networks are faced with. We look forward to your participation.</P>
+
+<H3><A name="Home_new-News"></A>News</H3>
+
+<UL>
+	<LI><B>June 08, 2008 -</B> <B><A href="sca-java-121-incubating.html" title="SCA Java 1.2.1-incubating"><B>Tuscany Java SCA 1.2.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>May 21, 2008 -</B> <B>Apache Tuscany is now an offical ASF project!</B><BR>
+The ASF board has <SPAN class="nobr"><A href="http://apache.markmail.org/message/2oa7uidwhqb66ydp" title="Visit page outside Confluence" rel="nofollow">approved graduation<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> from the Apache Incubator to be a fully endorsed ASF top level project.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>May 11, 2008 -</B> <B><SPAN class="nobr"><A href="http://www.pycon.it/pycon2/schedule" title="Visit page outside Confluence" rel="nofollow"><B>PyCon Italia Due</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><BR>
+Giorgio Zoppi presents <B>Python e Service Component Architecture</B>  covering Python in SCA</LI>
+</UL>
+
+
+<UL>
+	<LI><B>April 27, 2008 -</B> <B><A href="sca-java-12-incubating.html" title="SCA Java 1.2-incubating"><B>Tuscany Java SCA 1.2 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>April 15, 2008 -</B> <B><A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating"><B>Tuscany Java SDO 1.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Feb 05, 2008 -</B> <B><A href="sca-java-11-incubating.html" title="SCA Java 1.1-incubating"><B>Tuscany Java SCA 1.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Nov 12-13, 2007 -</B> <B><SPAN class="nobr"><A href="http://www.soaworld2007.com/" title="Visit page outside Confluence" rel="nofollow"><B>SOAWorld Conference &amp; Expo 2007 West</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><BR>
+Raymond Feng presents <B><SPAN class="nobr"><A href="http://www.soaworld2007.com/general/session1107.htm?id=20" title="Visit page outside Confluence" rel="nofollow"><B>Practical SOA with Apache Tuscany</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Oct 06, 2007 -</B> <B><A href="das-java-beta2.html" title="DAS Java Beta2"><B>Tuscany DAS Beta2 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Sept 24, 2007 -</B> <B><A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating"><B>Tuscany Java SCA 1.0 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Sept 12-13, 2007 -</B> <B><SPAN class="nobr"><A href="http://www4.java.no/web/show.do?page=153%3B252" title="Visit page outside Confluence" rel="nofollow"><B>Java Zone, Europe</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><BR>
+Simon Laws <SPAN class="nobr"><A href="news.data/BuildingSOAWithApacheTuscany.ppt" title="BuildingSOAWithApacheTuscany.ppt attached to News">presents<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> SCA and Tuscany</LI>
+</UL>
+
+
+<UL>
+	<LI>To view a <B>list of previous releases</B> please go to the download page of each subproject.</LI>
+	<LI><A href="news-past-events.html" title="News - Past Events">past Tuscany events</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/images/bad.gif b/site/trunk/site-publish/images/bad.gif
new file mode 100644
index 0000000000..825c2f8bc1
--- /dev/null
+++ b/site/trunk/site-publish/images/bad.gif
diff --git a/site/trunk/site-publish/images/border/border_bottom.gif b/site/trunk/site-publish/images/border/border_bottom.gif
new file mode 100644
index 0000000000..b93012ac2a
--- /dev/null
+++ b/site/trunk/site-publish/images/border/border_bottom.gif
diff --git a/site/trunk/site-publish/images/border/spacer.gif b/site/trunk/site-publish/images/border/spacer.gif
new file mode 100644
index 0000000000..fc2560981e
--- /dev/null
+++ b/site/trunk/site-publish/images/border/spacer.gif
diff --git a/site/trunk/site-publish/images/confluence_logo.gif b/site/trunk/site-publish/images/confluence_logo.gif
new file mode 100644
index 0000000000..c2ea306578
--- /dev/null
+++ b/site/trunk/site-publish/images/confluence_logo.gif
diff --git a/site/trunk/site-publish/images/confluence_logo_darkbg.gif b/site/trunk/site-publish/images/confluence_logo_darkbg.gif
new file mode 100644
index 0000000000..44a1682f1e
--- /dev/null
+++ b/site/trunk/site-publish/images/confluence_logo_darkbg.gif
diff --git a/site/trunk/site-publish/images/en_UK.gif b/site/trunk/site-publish/images/en_UK.gif
new file mode 100644
index 0000000000..9ee1ca7650
--- /dev/null
+++ b/site/trunk/site-publish/images/en_UK.gif
diff --git a/site/trunk/site-publish/images/encodingtest.jpg b/site/trunk/site-publish/images/encodingtest.jpg
new file mode 100644
index 0000000000..7f830ef60e
--- /dev/null
+++ b/site/trunk/site-publish/images/encodingtest.jpg
diff --git a/site/trunk/site-publish/images/good.gif b/site/trunk/site-publish/images/good.gif
new file mode 100644
index 0000000000..43c5d74ba7
--- /dev/null
+++ b/site/trunk/site-publish/images/good.gif
diff --git a/site/trunk/site-publish/images/icons/about_16.gif b/site/trunk/site-publish/images/icons/about_16.gif
new file mode 100644
index 0000000000..7e0720b7eb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/about_16.gif
diff --git a/site/trunk/site-publish/images/icons/about_16.png b/site/trunk/site-publish/images/icons/about_16.png
new file mode 100644
index 0000000000..1cdd2f26cf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/about_16.png
diff --git a/site/trunk/site-publish/images/icons/add_16.gif b/site/trunk/site-publish/images/icons/add_16.gif
new file mode 100644
index 0000000000..10cdf57be9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_blogentry_16.gif b/site/trunk/site-publish/images/icons/add_blogentry_16.gif
new file mode 100644
index 0000000000..05ceb847bb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_blogentry_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_blogentry_32.gif b/site/trunk/site-publish/images/icons/add_blogentry_32.gif
new file mode 100644
index 0000000000..e86cc8b08c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_blogentry_32.gif
diff --git a/site/trunk/site-publish/images/icons/add_comment_16.gif b/site/trunk/site-publish/images/icons/add_comment_16.gif
new file mode 100644
index 0000000000..e4b29fe096
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_comment_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_page_16.gif b/site/trunk/site-publish/images/icons/add_page_16.gif
new file mode 100644
index 0000000000..042e1f86c3
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_page_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_page_32.gif b/site/trunk/site-publish/images/icons/add_page_32.gif
new file mode 100644
index 0000000000..ae3118f65d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_page_32.gif
diff --git a/site/trunk/site-publish/images/icons/add_page_child_16.gif b/site/trunk/site-publish/images/icons/add_page_child_16.gif
new file mode 100644
index 0000000000..47c252b11b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_page_child_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_page_faded_16.gif b/site/trunk/site-publish/images/icons/add_page_faded_16.gif
new file mode 100644
index 0000000000..300532f10f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_page_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_page_notification_16.gif b/site/trunk/site-publish/images/icons/add_page_notification_16.gif
new file mode 100644
index 0000000000..cbac7b1b6d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_page_notification_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_space_16.gif b/site/trunk/site-publish/images/icons/add_space_16.gif
new file mode 100644
index 0000000000..35ea472d3a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_space_16.gif
diff --git a/site/trunk/site-publish/images/icons/add_space_32.gif b/site/trunk/site-publish/images/icons/add_space_32.gif
new file mode 100644
index 0000000000..a8f8d7ceda
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_space_32.gif
diff --git a/site/trunk/site-publish/images/icons/add_space_notification_16.gif b/site/trunk/site-publish/images/icons/add_space_notification_16.gif
new file mode 100644
index 0000000000..82cf5c31cf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/add_space_notification_16.gif
diff --git a/site/trunk/site-publish/images/icons/addbk_16.gif b/site/trunk/site-publish/images/icons/addbk_16.gif
new file mode 100644
index 0000000000..6968ef6713
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/addbk_16.gif
diff --git a/site/trunk/site-publish/images/icons/adfav_16.gif b/site/trunk/site-publish/images/icons/adfav_16.gif
new file mode 100644
index 0000000000..eb30554b99
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/adfav_16.gif
diff --git a/site/trunk/site-publish/images/icons/alarm_16.gif b/site/trunk/site-publish/images/icons/alarm_16.gif
new file mode 100644
index 0000000000..fa9c9c7b5f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/alarm_16.gif
diff --git a/site/trunk/site-publish/images/icons/apps_16.gif b/site/trunk/site-publish/images/icons/apps_16.gif
new file mode 100644
index 0000000000..e034484abb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/apps_16.gif
diff --git a/site/trunk/site-publish/images/icons/arrow_block_16.gif b/site/trunk/site-publish/images/icons/arrow_block_16.gif
new file mode 100644
index 0000000000..0b72031f8a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/arrow_block_16.gif
diff --git a/site/trunk/site-publish/images/icons/arrow_closed_active_16.gif b/site/trunk/site-publish/images/icons/arrow_closed_active_16.gif
new file mode 100644
index 0000000000..7fa57047d4
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/arrow_closed_active_16.gif
diff --git a/site/trunk/site-publish/images/icons/arrow_closing_active_16.gif b/site/trunk/site-publish/images/icons/arrow_closing_active_16.gif
new file mode 100644
index 0000000000..6fb1e0fc51
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/arrow_closing_active_16.gif
diff --git a/site/trunk/site-publish/images/icons/arrow_open_active_16.gif b/site/trunk/site-publish/images/icons/arrow_open_active_16.gif
new file mode 100644
index 0000000000..dce19c1322
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/arrow_open_active_16.gif
diff --git a/site/trunk/site-publish/images/icons/arrow_opening_active_16.gif b/site/trunk/site-publish/images/icons/arrow_opening_active_16.gif
new file mode 100644
index 0000000000..dce19c1322
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/arrow_opening_active_16.gif
diff --git a/site/trunk/site-publish/images/icons/atom.gif b/site/trunk/site-publish/images/icons/atom.gif
new file mode 100644
index 0000000000..cd7f56725c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/atom.gif
diff --git a/site/trunk/site-publish/images/icons/attach_file_16.gif b/site/trunk/site-publish/images/icons/attach_file_16.gif
new file mode 100644
index 0000000000..aa7466f1a7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attach_file_16.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/excel.gif b/site/trunk/site-publish/images/icons/attachments/excel.gif
new file mode 100644
index 0000000000..a7a65c4593
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/excel.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/file.gif b/site/trunk/site-publish/images/icons/attachments/file.gif
new file mode 100644
index 0000000000..358cdacf1a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/file.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/html.gif b/site/trunk/site-publish/images/icons/attachments/html.gif
new file mode 100644
index 0000000000..f5f727f6eb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/html.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/image.gif b/site/trunk/site-publish/images/icons/attachments/image.gif
new file mode 100644
index 0000000000..7f8722cfe7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/image.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/java.gif b/site/trunk/site-publish/images/icons/attachments/java.gif
new file mode 100644
index 0000000000..4a6832c60b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/java.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/pdf.gif b/site/trunk/site-publish/images/icons/attachments/pdf.gif
new file mode 100644
index 0000000000..5c20645898
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/pdf.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/powerpoint.gif b/site/trunk/site-publish/images/icons/attachments/powerpoint.gif
new file mode 100644
index 0000000000..5b5670a97d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/powerpoint.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/text.gif b/site/trunk/site-publish/images/icons/attachments/text.gif
new file mode 100644
index 0000000000..80bc8fca5a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/text.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/word.gif b/site/trunk/site-publish/images/icons/attachments/word.gif
new file mode 100644
index 0000000000..23e5b0265f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/word.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/xml.gif b/site/trunk/site-publish/images/icons/attachments/xml.gif
new file mode 100644
index 0000000000..43d9641219
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/xml.gif
diff --git a/site/trunk/site-publish/images/icons/attachments/zip.gif b/site/trunk/site-publish/images/icons/attachments/zip.gif
new file mode 100644
index 0000000000..1eb71ca726
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/attachments/zip.gif
diff --git a/site/trunk/site-publish/images/icons/back_16.gif b/site/trunk/site-publish/images/icons/back_16.gif
new file mode 100644
index 0000000000..dd752dfa8a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/back_16.gif
diff --git a/site/trunk/site-publish/images/icons/blogentry_16.gif b/site/trunk/site-publish/images/icons/blogentry_16.gif
new file mode 100644
index 0000000000..83d600d097
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/blogentry_16.gif
diff --git a/site/trunk/site-publish/images/icons/blogentry_faded_16.gif b/site/trunk/site-publish/images/icons/blogentry_faded_16.gif
new file mode 100644
index 0000000000..cd347b05ac
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/blogentry_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/browse_space.gif b/site/trunk/site-publish/images/icons/browse_space.gif
new file mode 100644
index 0000000000..f5a9946414
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/browse_space.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_blue.gif b/site/trunk/site-publish/images/icons/bullet_blue.gif
new file mode 100644
index 0000000000..25bfa0cf2b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_blue.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_creme.gif b/site/trunk/site-publish/images/icons/bullet_creme.gif
new file mode 100644
index 0000000000..a18cea17c6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_creme.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_creme_6.gif b/site/trunk/site-publish/images/icons/bullet_creme_6.gif
new file mode 100644
index 0000000000..d8a7de61d7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_creme_6.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_done.gif b/site/trunk/site-publish/images/icons/bullet_done.gif
new file mode 100644
index 0000000000..02c5ebc529
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_done.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_inprogress.gif b/site/trunk/site-publish/images/icons/bullet_inprogress.gif
new file mode 100644
index 0000000000..169c7d4557
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_inprogress.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_notdone.gif b/site/trunk/site-publish/images/icons/bullet_notdone.gif
new file mode 100644
index 0000000000..004a483eda
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_notdone.gif
diff --git a/site/trunk/site-publish/images/icons/bullet_red.gif b/site/trunk/site-publish/images/icons/bullet_red.gif
new file mode 100644
index 0000000000..05021c628a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/bullet_red.gif
diff --git a/site/trunk/site-publish/images/icons/cal_16.gif b/site/trunk/site-publish/images/icons/cal_16.gif
new file mode 100644
index 0000000000..a277a9adc8
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/cal_16.gif
diff --git a/site/trunk/site-publish/images/icons/calc_16.gif b/site/trunk/site-publish/images/icons/calc_16.gif
new file mode 100644
index 0000000000..243fe41718
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/calc_16.gif
diff --git a/site/trunk/site-publish/images/icons/cancl_16.gif b/site/trunk/site-publish/images/icons/cancl_16.gif
new file mode 100644
index 0000000000..c195996d22
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/cancl_16.gif
diff --git a/site/trunk/site-publish/images/icons/cart_16.gif b/site/trunk/site-publish/images/icons/cart_16.gif
new file mode 100644
index 0000000000..fc1addb563
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/cart_16.gif
diff --git a/site/trunk/site-publish/images/icons/cd_16.gif b/site/trunk/site-publish/images/icons/cd_16.gif
new file mode 100644
index 0000000000..d916884df6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/cd_16.gif
diff --git a/site/trunk/site-publish/images/icons/chart_16.gif b/site/trunk/site-publish/images/icons/chart_16.gif
new file mode 100644
index 0000000000..f6250cc02f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/chart_16.gif
diff --git a/site/trunk/site-publish/images/icons/close_16.gif b/site/trunk/site-publish/images/icons/close_16.gif
new file mode 100644
index 0000000000..d2d9d75e8f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/close_16.gif
diff --git a/site/trunk/site-publish/images/icons/comment_16.gif b/site/trunk/site-publish/images/icons/comment_16.gif
new file mode 100644
index 0000000000..6f76e86bd7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/comment_16.gif
diff --git a/site/trunk/site-publish/images/icons/confg_16.gif b/site/trunk/site-publish/images/icons/confg_16.gif
new file mode 100644
index 0000000000..85ad173a27
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/confg_16.gif
diff --git a/site/trunk/site-publish/images/icons/configure_icon_16.gif b/site/trunk/site-publish/images/icons/configure_icon_16.gif
new file mode 100644
index 0000000000..cbe90f9dad
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/configure_icon_16.gif
diff --git a/site/trunk/site-publish/images/icons/copy_16.gif b/site/trunk/site-publish/images/icons/copy_16.gif
new file mode 100644
index 0000000000..3ad03f3b3b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/copy_16.gif
diff --git a/site/trunk/site-publish/images/icons/cut_16.gif b/site/trunk/site-publish/images/icons/cut_16.gif
new file mode 100644
index 0000000000..5fc3bb5851
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/cut_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_16.gif b/site/trunk/site-publish/images/icons/del_16.gif
new file mode 100644
index 0000000000..fb9bf56243
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_blogentry_16.gif b/site/trunk/site-publish/images/icons/del_blogentry_16.gif
new file mode 100644
index 0000000000..4f29191ade
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_blogentry_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_comment_16.gif b/site/trunk/site-publish/images/icons/del_comment_16.gif
new file mode 100644
index 0000000000..ebeb35e00c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_comment_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_page_16.gif b/site/trunk/site-publish/images/icons/del_page_16.gif
new file mode 100644
index 0000000000..239ce7150c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_page_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_page_notification_16.gif b/site/trunk/site-publish/images/icons/del_page_notification_16.gif
new file mode 100644
index 0000000000..b172050b4c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_page_notification_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_space_16.gif b/site/trunk/site-publish/images/icons/del_space_16.gif
new file mode 100644
index 0000000000..79eb4f8c7f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_space_16.gif
diff --git a/site/trunk/site-publish/images/icons/del_space_notification_16.gif b/site/trunk/site-publish/images/icons/del_space_notification_16.gif
new file mode 100644
index 0000000000..56ba3465e1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/del_space_notification_16.gif
diff --git a/site/trunk/site-publish/images/icons/docs_16.gif b/site/trunk/site-publish/images/icons/docs_16.gif
new file mode 100644
index 0000000000..8a6368b8ea
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/docs_16.gif
diff --git a/site/trunk/site-publish/images/icons/document_attachment.png b/site/trunk/site-publish/images/icons/document_attachment.png
new file mode 100644
index 0000000000..f44cfcdf67
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/document_attachment.png
diff --git a/site/trunk/site-publish/images/icons/document_exchange.gif b/site/trunk/site-publish/images/icons/document_exchange.gif
new file mode 100644
index 0000000000..f27abbed06
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/document_exchange.gif
diff --git a/site/trunk/site-publish/images/icons/document_exchange.png b/site/trunk/site-publish/images/icons/document_exchange.png
new file mode 100644
index 0000000000..745916fcb9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/document_exchange.png
diff --git a/site/trunk/site-publish/images/icons/document_zoom_in_16.gif b/site/trunk/site-publish/images/icons/document_zoom_in_16.gif
new file mode 100644
index 0000000000..8c2759a3b1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/document_zoom_in_16.gif
diff --git a/site/trunk/site-publish/images/icons/document_zoom_in_16.png b/site/trunk/site-publish/images/icons/document_zoom_in_16.png
new file mode 100644
index 0000000000..44809fde6d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/document_zoom_in_16.png
diff --git a/site/trunk/site-publish/images/icons/down_16.gif b/site/trunk/site-publish/images/icons/down_16.gif
new file mode 100644
index 0000000000..9b8cc379da
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/down_16.gif
diff --git a/site/trunk/site-publish/images/icons/dummy.gif b/site/trunk/site-publish/images/icons/dummy.gif
new file mode 100644
index 0000000000..2f75b001f2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/dummy.gif
diff --git a/site/trunk/site-publish/images/icons/edit_16.gif b/site/trunk/site-publish/images/icons/edit_16.gif
new file mode 100644
index 0000000000..8b76d872ad
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/edit_16.gif
diff --git a/site/trunk/site-publish/images/icons/edit_blogentry_16.gif b/site/trunk/site-publish/images/icons/edit_blogentry_16.gif
new file mode 100644
index 0000000000..c5339fddcc
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/edit_blogentry_16.gif
diff --git a/site/trunk/site-publish/images/icons/edit_only_16.gif b/site/trunk/site-publish/images/icons/edit_only_16.gif
new file mode 100644
index 0000000000..8b76d872ad
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/edit_only_16.gif
diff --git a/site/trunk/site-publish/images/icons/edit_space_16.gif b/site/trunk/site-publish/images/icons/edit_space_16.gif
new file mode 100644
index 0000000000..dab223c142
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/edit_space_16.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/add.gif b/site/trunk/site-publish/images/icons/emoticons/add.gif
new file mode 100644
index 0000000000..0c00fe0d49
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/add.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/add.png b/site/trunk/site-publish/images/icons/emoticons/add.png
new file mode 100644
index 0000000000..ad794dc728
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/add.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/biggrin.gif b/site/trunk/site-publish/images/icons/emoticons/biggrin.gif
new file mode 100644
index 0000000000..ad04031985
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/biggrin.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/check.gif b/site/trunk/site-publish/images/icons/emoticons/check.gif
new file mode 100644
index 0000000000..28bb99943f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/check.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/check.png b/site/trunk/site-publish/images/icons/emoticons/check.png
new file mode 100644
index 0000000000..deefc129d2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/check.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/error.gif b/site/trunk/site-publish/images/icons/emoticons/error.gif
new file mode 100644
index 0000000000..6d68a8cc0b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/error.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/error.png b/site/trunk/site-publish/images/icons/emoticons/error.png
new file mode 100644
index 0000000000..24e2601846
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/error.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/forbidden.gif b/site/trunk/site-publish/images/icons/emoticons/forbidden.gif
new file mode 100644
index 0000000000..c6acdec605
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/forbidden.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/forbidden.png b/site/trunk/site-publish/images/icons/emoticons/forbidden.png
new file mode 100644
index 0000000000..d33897164e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/forbidden.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/help_16.gif b/site/trunk/site-publish/images/icons/emoticons/help_16.gif
new file mode 100644
index 0000000000..83387c25c6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/help_16.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/information.gif b/site/trunk/site-publish/images/icons/emoticons/information.gif
new file mode 100644
index 0000000000..072ab660fa
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/information.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/information.png b/site/trunk/site-publish/images/icons/emoticons/information.png
new file mode 100644
index 0000000000..c7c9a47819
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/information.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/lightbulb.gif b/site/trunk/site-publish/images/icons/emoticons/lightbulb.gif
new file mode 100644
index 0000000000..cd72409a47
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/lightbulb.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/lightbulb.png b/site/trunk/site-publish/images/icons/emoticons/lightbulb.png
new file mode 100644
index 0000000000..451834ce95
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/lightbulb.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.gif b/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.gif
new file mode 100644
index 0000000000..3768ef7d12
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.png b/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.png
new file mode 100644
index 0000000000..9e42542a24
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/lightbulb_on.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/sad.gif b/site/trunk/site-publish/images/icons/emoticons/sad.gif
new file mode 100644
index 0000000000..6aca31070f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/sad.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/smile.gif b/site/trunk/site-publish/images/icons/emoticons/smile.gif
new file mode 100644
index 0000000000..f8dc2782a0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/smile.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_blue.gif b/site/trunk/site-publish/images/icons/emoticons/star_blue.gif
new file mode 100644
index 0000000000..9b366cebeb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_blue.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_blue.png b/site/trunk/site-publish/images/icons/emoticons/star_blue.png
new file mode 100644
index 0000000000..2eb9db9868
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_blue.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_green.gif b/site/trunk/site-publish/images/icons/emoticons/star_green.gif
new file mode 100644
index 0000000000..42d27ec7e8
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_green.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_green.png b/site/trunk/site-publish/images/icons/emoticons/star_green.png
new file mode 100644
index 0000000000..0343b7f87e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_green.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_red.gif b/site/trunk/site-publish/images/icons/emoticons/star_red.gif
new file mode 100644
index 0000000000..c10acb9f7d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_red.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_red.png b/site/trunk/site-publish/images/icons/emoticons/star_red.png
new file mode 100644
index 0000000000..cffcdef945
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_red.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_yellow.gif b/site/trunk/site-publish/images/icons/emoticons/star_yellow.gif
new file mode 100644
index 0000000000..0f1d151a32
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_yellow.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/star_yellow.png b/site/trunk/site-publish/images/icons/emoticons/star_yellow.png
new file mode 100644
index 0000000000..9d695b19d6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/star_yellow.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/thumbs_down.gif b/site/trunk/site-publish/images/icons/emoticons/thumbs_down.gif
new file mode 100644
index 0000000000..855c748864
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/thumbs_down.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/thumbs_up.gif b/site/trunk/site-publish/images/icons/emoticons/thumbs_up.gif
new file mode 100644
index 0000000000..7c55feebd8
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/thumbs_up.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/tongue.gif b/site/trunk/site-publish/images/icons/emoticons/tongue.gif
new file mode 100644
index 0000000000..fe77df2fa2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/tongue.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/warning.gif b/site/trunk/site-publish/images/icons/emoticons/warning.gif
new file mode 100644
index 0000000000..1c9883b8f7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/warning.gif
diff --git a/site/trunk/site-publish/images/icons/emoticons/warning.png b/site/trunk/site-publish/images/icons/emoticons/warning.png
new file mode 100644
index 0000000000..56ad042e58
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/warning.png
diff --git a/site/trunk/site-publish/images/icons/emoticons/wink.gif b/site/trunk/site-publish/images/icons/emoticons/wink.gif
new file mode 100644
index 0000000000..24bdea9605
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/emoticons/wink.gif
diff --git a/site/trunk/site-publish/images/icons/exp_16.gif b/site/trunk/site-publish/images/icons/exp_16.gif
new file mode 100644
index 0000000000..edcaeee4b5
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/exp_16.gif
diff --git a/site/trunk/site-publish/images/icons/exp_32.gif b/site/trunk/site-publish/images/icons/exp_32.gif
new file mode 100644
index 0000000000..6c104e38bf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/exp_32.gif
diff --git a/site/trunk/site-publish/images/icons/fastf_16.gif b/site/trunk/site-publish/images/icons/fastf_16.gif
new file mode 100644
index 0000000000..184d42741a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/fastf_16.gif
diff --git a/site/trunk/site-publish/images/icons/favicon.ico b/site/trunk/site-publish/images/icons/favicon.ico
new file mode 100644
index 0000000000..bf3fe7269a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/favicon.ico
diff --git a/site/trunk/site-publish/images/icons/favicon.png b/site/trunk/site-publish/images/icons/favicon.png
new file mode 100644
index 0000000000..5109be5168
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/favicon.png
diff --git a/site/trunk/site-publish/images/icons/favs_16.gif b/site/trunk/site-publish/images/icons/favs_16.gif
new file mode 100644
index 0000000000..32525ee810
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/favs_16.gif
diff --git a/site/trunk/site-publish/images/icons/fax_16.gif b/site/trunk/site-publish/images/icons/fax_16.gif
new file mode 100644
index 0000000000..0dffbab6e0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/fax_16.gif
diff --git a/site/trunk/site-publish/images/icons/feed-icon-10x10.png b/site/trunk/site-publish/images/icons/feed-icon-10x10.png
new file mode 100644
index 0000000000..cc869bc617
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed-icon-10x10.png
diff --git a/site/trunk/site-publish/images/icons/feed-icon-12x12.png b/site/trunk/site-publish/images/icons/feed-icon-12x12.png
new file mode 100644
index 0000000000..291000eab2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed-icon-12x12.png
diff --git a/site/trunk/site-publish/images/icons/feed-icon-16x16.png b/site/trunk/site-publish/images/icons/feed-icon-16x16.png
new file mode 100644
index 0000000000..1679ab05b0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed-icon-16x16.png
diff --git a/site/trunk/site-publish/images/icons/feed-icon-24x24.png b/site/trunk/site-publish/images/icons/feed-icon-24x24.png
new file mode 100644
index 0000000000..00c896b422
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed-icon-24x24.png
diff --git a/site/trunk/site-publish/images/icons/feed-icon-32x32.png b/site/trunk/site-publish/images/icons/feed-icon-32x32.png
new file mode 100644
index 0000000000..ea50b84b7c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed-icon-32x32.png
diff --git a/site/trunk/site-publish/images/icons/feed_wizard.gif b/site/trunk/site-publish/images/icons/feed_wizard.gif
new file mode 100644
index 0000000000..e4419b635f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/feed_wizard.gif
diff --git a/site/trunk/site-publish/images/icons/flag_16.gif b/site/trunk/site-publish/images/icons/flag_16.gif
new file mode 100644
index 0000000000..d745cf10d6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/flag_16.gif
diff --git a/site/trunk/site-publish/images/icons/foldr_16.gif b/site/trunk/site-publish/images/icons/foldr_16.gif
new file mode 100644
index 0000000000..b476457795
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/foldr_16.gif
diff --git a/site/trunk/site-publish/images/icons/forwd_16.gif b/site/trunk/site-publish/images/icons/forwd_16.gif
new file mode 100644
index 0000000000..4afdf43b8d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/forwd_16.gif
diff --git a/site/trunk/site-publish/images/icons/forwd_24.png b/site/trunk/site-publish/images/icons/forwd_24.png
new file mode 100644
index 0000000000..c901e2ea0e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/forwd_24.png
diff --git a/site/trunk/site-publish/images/icons/games_16.gif b/site/trunk/site-publish/images/icons/games_16.gif
new file mode 100644
index 0000000000..a35e3ba6b2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/games_16.gif
diff --git a/site/trunk/site-publish/images/icons/go_16.gif b/site/trunk/site-publish/images/icons/go_16.gif
new file mode 100644
index 0000000000..003aa83398
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/go_16.gif
diff --git a/site/trunk/site-publish/images/icons/group_16.gif b/site/trunk/site-publish/images/icons/group_16.gif
new file mode 100644
index 0000000000..0c6637c86f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/group_16.gif
diff --git a/site/trunk/site-publish/images/icons/group_anyone_16.gif b/site/trunk/site-publish/images/icons/group_anyone_16.gif
new file mode 100644
index 0000000000..f2c70caf09
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/group_anyone_16.gif
diff --git a/site/trunk/site-publish/images/icons/hd_16.gif b/site/trunk/site-publish/images/icons/hd_16.gif
new file mode 100644
index 0000000000..d676539457
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/hd_16.gif
diff --git a/site/trunk/site-publish/images/icons/help_16.gif b/site/trunk/site-publish/images/icons/help_16.gif
new file mode 100644
index 0000000000..83387c25c6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/help_16.gif
diff --git a/site/trunk/site-publish/images/icons/help_24.gif b/site/trunk/site-publish/images/icons/help_24.gif
new file mode 100644
index 0000000000..2cadd7a836
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/help_24.gif
diff --git a/site/trunk/site-publish/images/icons/help_24.png b/site/trunk/site-publish/images/icons/help_24.png
new file mode 100644
index 0000000000..73817ffbe9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/help_24.png
diff --git a/site/trunk/site-publish/images/icons/hist_16.gif b/site/trunk/site-publish/images/icons/hist_16.gif
new file mode 100644
index 0000000000..93d0901757
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/hist_16.gif
diff --git a/site/trunk/site-publish/images/icons/history_16.gif b/site/trunk/site-publish/images/icons/history_16.gif
new file mode 100644
index 0000000000..759dc4cce5
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/history_16.gif
diff --git a/site/trunk/site-publish/images/icons/home_16.gif b/site/trunk/site-publish/images/icons/home_16.gif
new file mode 100644
index 0000000000..7a902b1be9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/home_16.gif
diff --git a/site/trunk/site-publish/images/icons/home_faded_16.gif b/site/trunk/site-publish/images/icons/home_faded_16.gif
new file mode 100644
index 0000000000..182d1de195
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/home_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/image_16.gif b/site/trunk/site-publish/images/icons/image_16.gif
new file mode 100644
index 0000000000..7c8e9d1716
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/image_16.gif
diff --git a/site/trunk/site-publish/images/icons/import_mbox_16.gif b/site/trunk/site-publish/images/icons/import_mbox_16.gif
new file mode 100644
index 0000000000..f40ed56fe9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/import_mbox_16.gif
diff --git a/site/trunk/site-publish/images/icons/impt_16.gif b/site/trunk/site-publish/images/icons/impt_16.gif
new file mode 100644
index 0000000000..2425ff8d38
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/impt_16.gif
diff --git a/site/trunk/site-publish/images/icons/label_16.gif b/site/trunk/site-publish/images/icons/label_16.gif
new file mode 100644
index 0000000000..22fbc1d6c6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/label_16.gif
diff --git a/site/trunk/site-publish/images/icons/layout_northwest.gif b/site/trunk/site-publish/images/icons/layout_northwest.gif
new file mode 100644
index 0000000000..21300e353f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/layout_northwest.gif
diff --git a/site/trunk/site-publish/images/icons/layout_northwest.png b/site/trunk/site-publish/images/icons/layout_northwest.png
new file mode 100644
index 0000000000..4c9761b29b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/layout_northwest.png
diff --git a/site/trunk/site-publish/images/icons/lgicn_16.gif b/site/trunk/site-publish/images/icons/lgicn_16.gif
new file mode 100644
index 0000000000..ad880d9a54
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/lgicn_16.gif
diff --git a/site/trunk/site-publish/images/icons/link_16.gif b/site/trunk/site-publish/images/icons/link_16.gif
new file mode 100644
index 0000000000..84631052c1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_16.gif
diff --git a/site/trunk/site-publish/images/icons/link_attachment_7.gif b/site/trunk/site-publish/images/icons/link_attachment_7.gif
new file mode 100644
index 0000000000..cb4c386368
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_attachment_7.gif
diff --git a/site/trunk/site-publish/images/icons/link_in_bot.gif b/site/trunk/site-publish/images/icons/link_in_bot.gif
new file mode 100644
index 0000000000..a03602d43c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_in_bot.gif
diff --git a/site/trunk/site-publish/images/icons/link_in_mid.gif b/site/trunk/site-publish/images/icons/link_in_mid.gif
new file mode 100644
index 0000000000..43967fbffb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_in_mid.gif
diff --git a/site/trunk/site-publish/images/icons/link_in_only.gif b/site/trunk/site-publish/images/icons/link_in_only.gif
new file mode 100644
index 0000000000..baa3ffd4b3
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_in_only.gif
diff --git a/site/trunk/site-publish/images/icons/link_in_top.gif b/site/trunk/site-publish/images/icons/link_in_top.gif
new file mode 100644
index 0000000000..579bf97bf3
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_in_top.gif
diff --git a/site/trunk/site-publish/images/icons/link_out_bot.gif b/site/trunk/site-publish/images/icons/link_out_bot.gif
new file mode 100644
index 0000000000..f8e8502991
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_out_bot.gif
diff --git a/site/trunk/site-publish/images/icons/link_out_mid.gif b/site/trunk/site-publish/images/icons/link_out_mid.gif
new file mode 100644
index 0000000000..b26e786bc1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_out_mid.gif
diff --git a/site/trunk/site-publish/images/icons/link_out_top.gif b/site/trunk/site-publish/images/icons/link_out_top.gif
new file mode 100644
index 0000000000..b26e786bc1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/link_out_top.gif
diff --git a/site/trunk/site-publish/images/icons/linkext7.gif b/site/trunk/site-publish/images/icons/linkext7.gif
new file mode 100644
index 0000000000..f2dd2dcfa9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/linkext7.gif
diff --git a/site/trunk/site-publish/images/icons/list_blogentries_32.gif b/site/trunk/site-publish/images/icons/list_blogentries_32.gif
new file mode 100644
index 0000000000..74d2583047
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_blogentries_32.gif
diff --git a/site/trunk/site-publish/images/icons/list_blogposts_32.gif b/site/trunk/site-publish/images/icons/list_blogposts_32.gif
new file mode 100644
index 0000000000..74d2583047
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_blogposts_32.gif
diff --git a/site/trunk/site-publish/images/icons/list_less_pages_16.gif b/site/trunk/site-publish/images/icons/list_less_pages_16.gif
new file mode 100644
index 0000000000..f0e258644f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_less_pages_16.gif
diff --git a/site/trunk/site-publish/images/icons/list_mail_32.gif b/site/trunk/site-publish/images/icons/list_mail_32.gif
new file mode 100644
index 0000000000..69ff75cc80
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_mail_32.gif
diff --git a/site/trunk/site-publish/images/icons/list_mail_content_16.gif b/site/trunk/site-publish/images/icons/list_mail_content_16.gif
new file mode 100644
index 0000000000..1ada2fe2f1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_mail_content_16.gif
diff --git a/site/trunk/site-publish/images/icons/list_mail_faded_16.gif b/site/trunk/site-publish/images/icons/list_mail_faded_16.gif
new file mode 100644
index 0000000000..6c7c047550
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_mail_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/list_pages_16.gif b/site/trunk/site-publish/images/icons/list_pages_16.gif
new file mode 100644
index 0000000000..66281b6cf9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_pages_16.gif
diff --git a/site/trunk/site-publish/images/icons/list_pages_32.gif b/site/trunk/site-publish/images/icons/list_pages_32.gif
new file mode 100644
index 0000000000..6ab121c83b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_pages_32.gif
diff --git a/site/trunk/site-publish/images/icons/list_pages_faded_16.gif b/site/trunk/site-publish/images/icons/list_pages_faded_16.gif
new file mode 100644
index 0000000000..2c64bc9a67
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/list_pages_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/lock_16.gif b/site/trunk/site-publish/images/icons/lock_16.gif
new file mode 100644
index 0000000000..2b946af8e1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/lock_16.gif
diff --git a/site/trunk/site-publish/images/icons/locked_pages_16.gif b/site/trunk/site-publish/images/icons/locked_pages_16.gif
new file mode 100644
index 0000000000..3ea6bd847b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/locked_pages_16.gif
diff --git a/site/trunk/site-publish/images/icons/logo_add_16.gif b/site/trunk/site-publish/images/icons/logo_add_16.gif
new file mode 100644
index 0000000000..4a786ff724
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/logo_add_16.gif
diff --git a/site/trunk/site-publish/images/icons/mail.png b/site/trunk/site-publish/images/icons/mail.png
new file mode 100644
index 0000000000..0b7c44cb25
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail.png
diff --git a/site/trunk/site-publish/images/icons/mail_16.gif b/site/trunk/site-publish/images/icons/mail_16.gif
new file mode 100644
index 0000000000..0386c0d105
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail_16.gif
diff --git a/site/trunk/site-publish/images/icons/mail_content_16.gif b/site/trunk/site-publish/images/icons/mail_content_16.gif
new file mode 100644
index 0000000000..c98214868f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail_content_16.gif
diff --git a/site/trunk/site-publish/images/icons/mail_delete.png b/site/trunk/site-publish/images/icons/mail_delete.png
new file mode 100644
index 0000000000..0c6d791f5b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail_delete.png
diff --git a/site/trunk/site-publish/images/icons/mail_small.gif b/site/trunk/site-publish/images/icons/mail_small.gif
new file mode 100644
index 0000000000..a3b7d9f06f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail_small.gif
diff --git a/site/trunk/site-publish/images/icons/mail_thread_16.gif b/site/trunk/site-publish/images/icons/mail_thread_16.gif
new file mode 100644
index 0000000000..e4ec117231
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/mail_thread_16.gif
diff --git a/site/trunk/site-publish/images/icons/move_16.gif b/site/trunk/site-publish/images/icons/move_16.gif
new file mode 100644
index 0000000000..1d4eb88a4c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/move_16.gif
diff --git a/site/trunk/site-publish/images/icons/music_16.gif b/site/trunk/site-publish/images/icons/music_16.gif
new file mode 100644
index 0000000000..b22f819b94
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/music_16.gif
diff --git a/site/trunk/site-publish/images/icons/nav_down.gif b/site/trunk/site-publish/images/icons/nav_down.gif
new file mode 100644
index 0000000000..a7e67f5ef8
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/nav_down.gif
diff --git a/site/trunk/site-publish/images/icons/nav_up.gif b/site/trunk/site-publish/images/icons/nav_up.gif
new file mode 100644
index 0000000000..28b3e823e7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/nav_up.gif
diff --git a/site/trunk/site-publish/images/icons/new_16.gif b/site/trunk/site-publish/images/icons/new_16.gif
new file mode 100644
index 0000000000..f9530c8edf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/new_16.gif
diff --git a/site/trunk/site-publish/images/icons/news.gif b/site/trunk/site-publish/images/icons/news.gif
new file mode 100644
index 0000000000..4b270ddd35
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/news.gif
diff --git a/site/trunk/site-publish/images/icons/notep_16.gif b/site/trunk/site-publish/images/icons/notep_16.gif
new file mode 100644
index 0000000000..663666b5c0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/notep_16.gif
diff --git a/site/trunk/site-publish/images/icons/ntwrk_16.gif b/site/trunk/site-publish/images/icons/ntwrk_16.gif
new file mode 100644
index 0000000000..a6e4fd81e4
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/ntwrk_16.gif
diff --git a/site/trunk/site-publish/images/icons/open_16.gif b/site/trunk/site-publish/images/icons/open_16.gif
new file mode 100644
index 0000000000..d19cf5492f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/open_16.gif
diff --git a/site/trunk/site-publish/images/icons/opnbr_16.gif b/site/trunk/site-publish/images/icons/opnbr_16.gif
new file mode 100644
index 0000000000..7a14b15c30
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/opnbr_16.gif
diff --git a/site/trunk/site-publish/images/icons/opts_16.gif b/site/trunk/site-publish/images/icons/opts_16.gif
new file mode 100644
index 0000000000..de7a76a547
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/opts_16.gif
diff --git a/site/trunk/site-publish/images/icons/page_hierarchy_16.gif b/site/trunk/site-publish/images/icons/page_hierarchy_16.gif
new file mode 100644
index 0000000000..f4486c6464
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/page_hierarchy_16.gif
diff --git a/site/trunk/site-publish/images/icons/paint_16.gif b/site/trunk/site-publish/images/icons/paint_16.gif
new file mode 100644
index 0000000000..2896984f5c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/paint_16.gif
diff --git a/site/trunk/site-publish/images/icons/paste_16.gif b/site/trunk/site-publish/images/icons/paste_16.gif
new file mode 100644
index 0000000000..ec009352dc
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/paste_16.gif
diff --git a/site/trunk/site-publish/images/icons/pause_16.gif b/site/trunk/site-publish/images/icons/pause_16.gif
new file mode 100644
index 0000000000..c8ad8b398a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/pause_16.gif
diff --git a/site/trunk/site-publish/images/icons/phone_16.gif b/site/trunk/site-publish/images/icons/phone_16.gif
new file mode 100644
index 0000000000..e4d72a732c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/phone_16.gif
diff --git a/site/trunk/site-publish/images/icons/photo_scenery.gif b/site/trunk/site-publish/images/icons/photo_scenery.gif
new file mode 100644
index 0000000000..890e7a5f8a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/photo_scenery.gif
diff --git a/site/trunk/site-publish/images/icons/picts_16.gif b/site/trunk/site-publish/images/icons/picts_16.gif
new file mode 100644
index 0000000000..718b8896fb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/picts_16.gif
diff --git a/site/trunk/site-publish/images/icons/play_16.gif b/site/trunk/site-publish/images/icons/play_16.gif
new file mode 100644
index 0000000000..d35ebd68dd
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/play_16.gif
diff --git a/site/trunk/site-publish/images/icons/plus.gif b/site/trunk/site-publish/images/icons/plus.gif
new file mode 100644
index 0000000000..a19d15f48a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/plus.gif
diff --git a/site/trunk/site-publish/images/icons/prefs_16.gif b/site/trunk/site-publish/images/icons/prefs_16.gif
new file mode 100644
index 0000000000..88b41298a7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/prefs_16.gif
diff --git a/site/trunk/site-publish/images/icons/print_16.gif b/site/trunk/site-publish/images/icons/print_16.gif
new file mode 100644
index 0000000000..c0da9b9dcf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/print_16.gif
diff --git a/site/trunk/site-publish/images/icons/profilepics/angel.png b/site/trunk/site-publish/images/icons/profilepics/angel.png
new file mode 100644
index 0000000000..028d9fb0bf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/angel.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/businessman.png b/site/trunk/site-publish/images/icons/profilepics/businessman.png
new file mode 100644
index 0000000000..ec92d12d18
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/businessman.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/businessman2.png b/site/trunk/site-publish/images/icons/profilepics/businessman2.png
new file mode 100644
index 0000000000..ea039f8a3c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/businessman2.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/default.png b/site/trunk/site-publish/images/icons/profilepics/default.png
new file mode 100644
index 0000000000..991e6364b2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/default.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/devil.png b/site/trunk/site-publish/images/icons/profilepics/devil.png
new file mode 100644
index 0000000000..67a3aa5a84
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/devil.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/doctor.png b/site/trunk/site-publish/images/icons/profilepics/doctor.png
new file mode 100644
index 0000000000..4ede78e368
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/doctor.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/dude1.png b/site/trunk/site-publish/images/icons/profilepics/dude1.png
new file mode 100644
index 0000000000..751b36ee6b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/dude1.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/dude2.png b/site/trunk/site-publish/images/icons/profilepics/dude2.png
new file mode 100644
index 0000000000..ba49463014
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/dude2.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/dude3.png b/site/trunk/site-publish/images/icons/profilepics/dude3.png
new file mode 100644
index 0000000000..4878d0f472
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/dude3.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/dude4.png b/site/trunk/site-publish/images/icons/profilepics/dude4.png
new file mode 100644
index 0000000000..e14d171d80
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/dude4.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/dude5.png b/site/trunk/site-publish/images/icons/profilepics/dude5.png
new file mode 100644
index 0000000000..07fc86d1e4
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/dude5.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/ghost.png b/site/trunk/site-publish/images/icons/profilepics/ghost.png
new file mode 100644
index 0000000000..2f0b3929d5
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/ghost.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/security_agent.png b/site/trunk/site-publish/images/icons/profilepics/security_agent.png
new file mode 100644
index 0000000000..9920fe51ee
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/security_agent.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/user1.png b/site/trunk/site-publish/images/icons/profilepics/user1.png
new file mode 100644
index 0000000000..49e2a5f55c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/user1.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/user2.png b/site/trunk/site-publish/images/icons/profilepics/user2.png
new file mode 100644
index 0000000000..92f17d83be
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/user2.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/user3.png b/site/trunk/site-publish/images/icons/profilepics/user3.png
new file mode 100644
index 0000000000..c3128be276
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/user3.png
diff --git a/site/trunk/site-publish/images/icons/profilepics/user_headphones.png b/site/trunk/site-publish/images/icons/profilepics/user_headphones.png
new file mode 100644
index 0000000000..c2da457a5d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/profilepics/user_headphones.png
diff --git a/site/trunk/site-publish/images/icons/prtpv_16.gif b/site/trunk/site-publish/images/icons/prtpv_16.gif
new file mode 100644
index 0000000000..def722ec9e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/prtpv_16.gif
diff --git a/site/trunk/site-publish/images/icons/redo_116.gif b/site/trunk/site-publish/images/icons/redo_116.gif
new file mode 100644
index 0000000000..06d01fd67c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/redo_116.gif
diff --git a/site/trunk/site-publish/images/icons/ref_16.gif b/site/trunk/site-publish/images/icons/ref_16.gif
new file mode 100644
index 0000000000..c0848758f9
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/ref_16.gif
diff --git a/site/trunk/site-publish/images/icons/refresh_16.png b/site/trunk/site-publish/images/icons/refresh_16.png
new file mode 100644
index 0000000000..c7567da63d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/refresh_16.png
diff --git a/site/trunk/site-publish/images/icons/refresh_24.png b/site/trunk/site-publish/images/icons/refresh_24.png
new file mode 100644
index 0000000000..9add1322eb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/refresh_24.png
diff --git a/site/trunk/site-publish/images/icons/remov_16.gif b/site/trunk/site-publish/images/icons/remov_16.gif
new file mode 100644
index 0000000000..9a4ce81b65
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/remov_16.gif
diff --git a/site/trunk/site-publish/images/icons/rewnd_16.gif b/site/trunk/site-publish/images/icons/rewnd_16.gif
new file mode 100644
index 0000000000..9700058c62
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/rewnd_16.gif
diff --git a/site/trunk/site-publish/images/icons/rss.gif b/site/trunk/site-publish/images/icons/rss.gif
new file mode 100644
index 0000000000..d86174e6d4
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/rss.gif
diff --git a/site/trunk/site-publish/images/icons/rss10.gif b/site/trunk/site-publish/images/icons/rss10.gif
new file mode 100644
index 0000000000..430842e5a1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/rss10.gif
diff --git a/site/trunk/site-publish/images/icons/rss20.gif b/site/trunk/site-publish/images/icons/rss20.gif
new file mode 100644
index 0000000000..99d1a2a8f0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/rss20.gif
diff --git a/site/trunk/site-publish/images/icons/rss_32.gif b/site/trunk/site-publish/images/icons/rss_32.gif
new file mode 100644
index 0000000000..a51f148bad
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/rss_32.gif
diff --git a/site/trunk/site-publish/images/icons/run_test_fail_16.gif b/site/trunk/site-publish/images/icons/run_test_fail_16.gif
new file mode 100644
index 0000000000..abd8919578
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/run_test_fail_16.gif
diff --git a/site/trunk/site-publish/images/icons/run_test_pass_16.gif b/site/trunk/site-publish/images/icons/run_test_pass_16.gif
new file mode 100644
index 0000000000..df29cad086
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/run_test_pass_16.gif
diff --git a/site/trunk/site-publish/images/icons/savas_16.gif b/site/trunk/site-publish/images/icons/savas_16.gif
new file mode 100644
index 0000000000..5723c67f8f
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/savas_16.gif
diff --git a/site/trunk/site-publish/images/icons/save_16.gif b/site/trunk/site-publish/images/icons/save_16.gif
new file mode 100644
index 0000000000..10d632357c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/save_16.gif
diff --git a/site/trunk/site-publish/images/icons/sinfo_16.gif b/site/trunk/site-publish/images/icons/sinfo_16.gif
new file mode 100644
index 0000000000..b47b545046
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/sinfo_16.gif
diff --git a/site/trunk/site-publish/images/icons/skipb_16.gif b/site/trunk/site-publish/images/icons/skipb_16.gif
new file mode 100644
index 0000000000..38ea581cb1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/skipb_16.gif
diff --git a/site/trunk/site-publish/images/icons/skipf_16.gif b/site/trunk/site-publish/images/icons/skipf_16.gif
new file mode 100644
index 0000000000..b151af2bf4
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/skipf_16.gif
diff --git a/site/trunk/site-publish/images/icons/smicn_16.gif b/site/trunk/site-publish/images/icons/smicn_16.gif
new file mode 100644
index 0000000000..79384c3719
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/smicn_16.gif
diff --git a/site/trunk/site-publish/images/icons/splay_16.gif b/site/trunk/site-publish/images/icons/splay_16.gif
new file mode 100644
index 0000000000..2e34a54a23
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/splay_16.gif
diff --git a/site/trunk/site-publish/images/icons/srch_16.gif b/site/trunk/site-publish/images/icons/srch_16.gif
new file mode 100644
index 0000000000..64fdbc0b6b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/srch_16.gif
diff --git a/site/trunk/site-publish/images/icons/star_grey.gif b/site/trunk/site-publish/images/icons/star_grey.gif
new file mode 100644
index 0000000000..f9b3348da6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/star_grey.gif
diff --git a/site/trunk/site-publish/images/icons/star_yellow.gif b/site/trunk/site-publish/images/icons/star_yellow.gif
new file mode 100644
index 0000000000..0f1d151a32
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/star_yellow.gif
diff --git a/site/trunk/site-publish/images/icons/stop_16.gif b/site/trunk/site-publish/images/icons/stop_16.gif
new file mode 100644
index 0000000000..ea413a740e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/stop_16.gif
diff --git a/site/trunk/site-publish/images/icons/subtract_16.gif b/site/trunk/site-publish/images/icons/subtract_16.gif
new file mode 100644
index 0000000000..071c1a9254
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/subtract_16.gif
diff --git a/site/trunk/site-publish/images/icons/text_abc.gif b/site/trunk/site-publish/images/icons/text_abc.gif
new file mode 100644
index 0000000000..bbb80434f2
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_abc.gif
diff --git a/site/trunk/site-publish/images/icons/text_abc_16.gif b/site/trunk/site-publish/images/icons/text_abc_16.gif
new file mode 100644
index 0000000000..ff4fc11876
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_abc_16.gif
diff --git a/site/trunk/site-publish/images/icons/text_bold.gif b/site/trunk/site-publish/images/icons/text_bold.gif
new file mode 100644
index 0000000000..6446ca7562
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_bold.gif
diff --git a/site/trunk/site-publish/images/icons/text_bold_16.png b/site/trunk/site-publish/images/icons/text_bold_16.png
new file mode 100644
index 0000000000..4fb8dd90eb
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_bold_16.png
diff --git a/site/trunk/site-publish/images/icons/text_italics.gif b/site/trunk/site-publish/images/icons/text_italics.gif
new file mode 100644
index 0000000000..a47ee4cf7c
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_italics.gif
diff --git a/site/trunk/site-publish/images/icons/text_tree.png b/site/trunk/site-publish/images/icons/text_tree.png
new file mode 100644
index 0000000000..eccf03e544
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_tree.png
diff --git a/site/trunk/site-publish/images/icons/text_tree_16.png b/site/trunk/site-publish/images/icons/text_tree_16.png
new file mode 100644
index 0000000000..4ab4288272
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_tree_16.png
diff --git a/site/trunk/site-publish/images/icons/text_underlined.gif b/site/trunk/site-publish/images/icons/text_underlined.gif
new file mode 100644
index 0000000000..ef84f4c20e
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_underlined.gif
diff --git a/site/trunk/site-publish/images/icons/text_view.png b/site/trunk/site-publish/images/icons/text_view.png
new file mode 100644
index 0000000000..fa05c76c8a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_view.png
diff --git a/site/trunk/site-publish/images/icons/text_view_16.png b/site/trunk/site-publish/images/icons/text_view_16.png
new file mode 100644
index 0000000000..d9b861b655
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/text_view_16.png
diff --git a/site/trunk/site-publish/images/icons/thread.png b/site/trunk/site-publish/images/icons/thread.png
new file mode 100644
index 0000000000..6dab998e8d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/thread.png
diff --git a/site/trunk/site-publish/images/icons/tools_16.gif b/site/trunk/site-publish/images/icons/tools_16.gif
new file mode 100644
index 0000000000..d6b7f86553
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/tools_16.gif
diff --git a/site/trunk/site-publish/images/icons/trafficlight_green_16.png b/site/trunk/site-publish/images/icons/trafficlight_green_16.png
new file mode 100644
index 0000000000..63bc3088a1
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/trafficlight_green_16.png
diff --git a/site/trunk/site-publish/images/icons/trafficlight_green_24.png b/site/trunk/site-publish/images/icons/trafficlight_green_24.png
new file mode 100644
index 0000000000..a170730f03
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/trafficlight_green_24.png
diff --git a/site/trunk/site-publish/images/icons/trafficlight_red_16.png b/site/trunk/site-publish/images/icons/trafficlight_red_16.png
new file mode 100644
index 0000000000..2325af01aa
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/trafficlight_red_16.png
diff --git a/site/trunk/site-publish/images/icons/trafficlight_red_24.png b/site/trunk/site-publish/images/icons/trafficlight_red_24.png
new file mode 100644
index 0000000000..e023a991a6
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/trafficlight_red_24.png
diff --git a/site/trunk/site-publish/images/icons/trash_16.gif b/site/trunk/site-publish/images/icons/trash_16.gif
new file mode 100644
index 0000000000..a3f272e899
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/trash_16.gif
diff --git a/site/trunk/site-publish/images/icons/tree_minus.gif b/site/trunk/site-publish/images/icons/tree_minus.gif
new file mode 100644
index 0000000000..608bc2908d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/tree_minus.gif
diff --git a/site/trunk/site-publish/images/icons/tree_plus.gif b/site/trunk/site-publish/images/icons/tree_plus.gif
new file mode 100644
index 0000000000..87ccefe9d7
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/tree_plus.gif
diff --git a/site/trunk/site-publish/images/icons/tree_square.gif b/site/trunk/site-publish/images/icons/tree_square.gif
new file mode 100644
index 0000000000..369070e7e3
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/tree_square.gif
diff --git a/site/trunk/site-publish/images/icons/ulock_16.gif b/site/trunk/site-publish/images/icons/ulock_16.gif
new file mode 100644
index 0000000000..ee710dd49b
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/ulock_16.gif
diff --git a/site/trunk/site-publish/images/icons/undo_16.gif b/site/trunk/site-publish/images/icons/undo_16.gif
new file mode 100644
index 0000000000..b89cad2302
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/undo_16.gif
diff --git a/site/trunk/site-publish/images/icons/up_16.gif b/site/trunk/site-publish/images/icons/up_16.gif
new file mode 100644
index 0000000000..6eb38d1f47
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/up_16.gif
diff --git a/site/trunk/site-publish/images/icons/user_12.gif b/site/trunk/site-publish/images/icons/user_12.gif
new file mode 100644
index 0000000000..d41511f1b8
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/user_12.gif
diff --git a/site/trunk/site-publish/images/icons/user_16.gif b/site/trunk/site-publish/images/icons/user_16.gif
new file mode 100644
index 0000000000..f5a2fb6a3a
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/user_16.gif
diff --git a/site/trunk/site-publish/images/icons/user_bw_16.gif b/site/trunk/site-publish/images/icons/user_bw_16.gif
new file mode 100644
index 0000000000..207524b571
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/user_bw_16.gif
diff --git a/site/trunk/site-publish/images/icons/wait.gif b/site/trunk/site-publish/images/icons/wait.gif
new file mode 100644
index 0000000000..085ccaecaf
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/wait.gif
diff --git a/site/trunk/site-publish/images/icons/watch_16.gif b/site/trunk/site-publish/images/icons/watch_16.gif
new file mode 100644
index 0000000000..8bd75d7633
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/watch_16.gif
diff --git a/site/trunk/site-publish/images/icons/watch_32.gif b/site/trunk/site-publish/images/icons/watch_32.gif
new file mode 100644
index 0000000000..6c204038e0
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/watch_32.gif
diff --git a/site/trunk/site-publish/images/icons/watch_cancel_16.gif b/site/trunk/site-publish/images/icons/watch_cancel_16.gif
new file mode 100644
index 0000000000..80f466e669
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/watch_cancel_16.gif
diff --git a/site/trunk/site-publish/images/icons/watch_cancel_32.gif b/site/trunk/site-publish/images/icons/watch_cancel_32.gif
new file mode 100644
index 0000000000..e53872b296
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/watch_cancel_32.gif
diff --git a/site/trunk/site-publish/images/icons/web_16.gif b/site/trunk/site-publish/images/icons/web_16.gif
new file mode 100644
index 0000000000..99a19c4e71
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/web_16.gif
diff --git a/site/trunk/site-publish/images/icons/web_faded_16.gif b/site/trunk/site-publish/images/icons/web_faded_16.gif
new file mode 100644
index 0000000000..74b7433673
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/web_faded_16.gif
diff --git a/site/trunk/site-publish/images/icons/wiz_16.gif b/site/trunk/site-publish/images/icons/wiz_16.gif
new file mode 100644
index 0000000000..9214433b9d
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/wiz_16.gif
diff --git a/site/trunk/site-publish/images/icons/zoomi_16.gif b/site/trunk/site-publish/images/icons/zoomi_16.gif
new file mode 100644
index 0000000000..f2f6aca447
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/zoomi_16.gif
diff --git a/site/trunk/site-publish/images/icons/zoomo_16.gif b/site/trunk/site-publish/images/icons/zoomo_16.gif
new file mode 100644
index 0000000000..0191d45b46
--- /dev/null
+++ b/site/trunk/site-publish/images/icons/zoomo_16.gif
diff --git a/site/trunk/site-publish/images/logo.gif b/site/trunk/site-publish/images/logo.gif
new file mode 100644
index 0000000000..a95eb33c2d
--- /dev/null
+++ b/site/trunk/site-publish/images/logo.gif
diff --git a/site/trunk/site-publish/images/logo2.gif b/site/trunk/site-publish/images/logo2.gif
new file mode 100644
index 0000000000..4dcbd34539
--- /dev/null
+++ b/site/trunk/site-publish/images/logo2.gif
diff --git a/site/trunk/site-publish/images/raw/arrow_block.png b/site/trunk/site-publish/images/raw/arrow_block.png
new file mode 100644
index 0000000000..58b8152642
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/arrow_block.png
diff --git a/site/trunk/site-publish/images/raw/arrow_closing_active.png b/site/trunk/site-publish/images/raw/arrow_closing_active.png
new file mode 100644
index 0000000000..1247788c29
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/arrow_closing_active.png
diff --git a/site/trunk/site-publish/images/raw/arrow_opening_active.png b/site/trunk/site-publish/images/raw/arrow_opening_active.png
new file mode 100644
index 0000000000..59c655200d
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/arrow_opening_active.png
diff --git a/site/trunk/site-publish/images/raw/attach-file.png b/site/trunk/site-publish/images/raw/attach-file.png
new file mode 100644
index 0000000000..7ea7a2e657
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/attach-file.png
diff --git a/site/trunk/site-publish/images/raw/attachment-icons.png b/site/trunk/site-publish/images/raw/attachment-icons.png
new file mode 100644
index 0000000000..0c4dfa746f
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/attachment-icons.png
diff --git a/site/trunk/site-publish/images/raw/blogentry.png b/site/trunk/site-publish/images/raw/blogentry.png
new file mode 100644
index 0000000000..659dc5ac7b
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/blogentry.png
diff --git a/site/trunk/site-publish/images/raw/blogentry_24.png b/site/trunk/site-publish/images/raw/blogentry_24.png
new file mode 100644
index 0000000000..cd5475f780
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/blogentry_24.png
diff --git a/site/trunk/site-publish/images/raw/blogentry_add_32.png b/site/trunk/site-publish/images/raw/blogentry_add_32.png
new file mode 100644
index 0000000000..936741b51a
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/blogentry_add_32.png
diff --git a/site/trunk/site-publish/images/raw/blogentry_faded_16.png b/site/trunk/site-publish/images/raw/blogentry_faded_16.png
new file mode 100644
index 0000000000..fc13c64a7d
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/blogentry_faded_16.png
diff --git a/site/trunk/site-publish/images/raw/bullet_done.png b/site/trunk/site-publish/images/raw/bullet_done.png
new file mode 100644
index 0000000000..a1d9a11c3a
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/bullet_done.png
diff --git a/site/trunk/site-publish/images/raw/bullet_inprogress.png b/site/trunk/site-publish/images/raw/bullet_inprogress.png
new file mode 100644
index 0000000000..bc2f5cad45
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/bullet_inprogress.png
diff --git a/site/trunk/site-publish/images/raw/bullet_notdone.png b/site/trunk/site-publish/images/raw/bullet_notdone.png
new file mode 100644
index 0000000000..5bbcdcea28
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/bullet_notdone.png
diff --git a/site/trunk/site-publish/images/raw/comment-add.png b/site/trunk/site-publish/images/raw/comment-add.png
new file mode 100644
index 0000000000..bf99fdf984
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/comment-add.png
diff --git a/site/trunk/site-publish/images/raw/comment-del.png b/site/trunk/site-publish/images/raw/comment-del.png
new file mode 100644
index 0000000000..04fb743da8
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/comment-del.png
diff --git a/site/trunk/site-publish/images/raw/comment.png b/site/trunk/site-publish/images/raw/comment.png
new file mode 100644
index 0000000000..57a88d19ce
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/comment.png
diff --git a/site/trunk/site-publish/images/raw/configure_icon_16.png b/site/trunk/site-publish/images/raw/configure_icon_16.png
new file mode 100644
index 0000000000..2958966b11
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/configure_icon_16.png
diff --git a/site/trunk/site-publish/images/raw/discussion-large.png b/site/trunk/site-publish/images/raw/discussion-large.png
new file mode 100644
index 0000000000..c44a99e7da
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/discussion-large.png
diff --git a/site/trunk/site-publish/images/raw/edit_16.png b/site/trunk/site-publish/images/raw/edit_16.png
new file mode 100644
index 0000000000..bb8dcc2526
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/edit_16.png
diff --git a/site/trunk/site-publish/images/raw/edit_only_16.png b/site/trunk/site-publish/images/raw/edit_only_16.png
new file mode 100644
index 0000000000..47628b6f29
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/edit_only_16.png
diff --git a/site/trunk/site-publish/images/raw/group-anyone.png b/site/trunk/site-publish/images/raw/group-anyone.png
new file mode 100644
index 0000000000..b11a740ac2
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/group-anyone.png
diff --git a/site/trunk/site-publish/images/raw/history_arrow.png b/site/trunk/site-publish/images/raw/history_arrow.png
new file mode 100644
index 0000000000..6de6af20ca
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/history_arrow.png
diff --git a/site/trunk/site-publish/images/raw/home_16_faded.png b/site/trunk/site-publish/images/raw/home_16_faded.png
new file mode 100644
index 0000000000..44b1208853
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/home_16_faded.png
diff --git a/site/trunk/site-publish/images/raw/import_mbox_16.png b/site/trunk/site-publish/images/raw/import_mbox_16.png
new file mode 100644
index 0000000000..187b451c36
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/import_mbox_16.png
diff --git a/site/trunk/site-publish/images/raw/left-nav-theme.png b/site/trunk/site-publish/images/raw/left-nav-theme.png
new file mode 100644
index 0000000000..b1400e766f
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/left-nav-theme.png
diff --git a/site/trunk/site-publish/images/raw/link-attachment.png b/site/trunk/site-publish/images/raw/link-attachment.png
new file mode 100644
index 0000000000..3d85098e55
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/link-attachment.png
diff --git a/site/trunk/site-publish/images/raw/link-external.png b/site/trunk/site-publish/images/raw/link-external.png
new file mode 100644
index 0000000000..3bd2cba422
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/link-external.png
diff --git a/site/trunk/site-publish/images/raw/list-pages-large.png b/site/trunk/site-publish/images/raw/list-pages-large.png
new file mode 100644
index 0000000000..c3267cc3c4
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list-pages-large.png
diff --git a/site/trunk/site-publish/images/raw/list-pages.png b/site/trunk/site-publish/images/raw/list-pages.png
new file mode 100644
index 0000000000..db994aa68a
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list-pages.png
diff --git a/site/trunk/site-publish/images/raw/list-pages_faded_16.png b/site/trunk/site-publish/images/raw/list-pages_faded_16.png
new file mode 100644
index 0000000000..3397bafaad
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list-pages_faded_16.png
diff --git a/site/trunk/site-publish/images/raw/list_blogentries_32.png b/site/trunk/site-publish/images/raw/list_blogentries_32.png
new file mode 100644
index 0000000000..9b4e59dd5f
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list_blogentries_32.png
diff --git a/site/trunk/site-publish/images/raw/list_less_pages_16.png b/site/trunk/site-publish/images/raw/list_less_pages_16.png
new file mode 100644
index 0000000000..758a541d20
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list_less_pages_16.png
diff --git a/site/trunk/site-publish/images/raw/list_mail_16.png b/site/trunk/site-publish/images/raw/list_mail_16.png
new file mode 100644
index 0000000000..77f1f4fbbf
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list_mail_16.png
diff --git a/site/trunk/site-publish/images/raw/list_mail_32.png b/site/trunk/site-publish/images/raw/list_mail_32.png
new file mode 100644
index 0000000000..d11da48576
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list_mail_32.png
diff --git a/site/trunk/site-publish/images/raw/list_mail_faded_16.png b/site/trunk/site-publish/images/raw/list_mail_faded_16.png
new file mode 100644
index 0000000000..b367ad581d
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/list_mail_faded_16.png
diff --git a/site/trunk/site-publish/images/raw/locked-pages_16.png b/site/trunk/site-publish/images/raw/locked-pages_16.png
new file mode 100644
index 0000000000..87010e2c13
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/locked-pages_16.png
diff --git a/site/trunk/site-publish/images/raw/mail_16.png b/site/trunk/site-publish/images/raw/mail_16.png
new file mode 100644
index 0000000000..d6f57305f0
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/mail_16.png
diff --git a/site/trunk/site-publish/images/raw/mail_small.png b/site/trunk/site-publish/images/raw/mail_small.png
new file mode 100644
index 0000000000..4df5ebd19d
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/mail_small.png
diff --git a/site/trunk/site-publish/images/raw/mail_thread_16.png b/site/trunk/site-publish/images/raw/mail_thread_16.png
new file mode 100644
index 0000000000..e9470a98bb
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/mail_thread_16.png
diff --git a/site/trunk/site-publish/images/raw/main-theme.png b/site/trunk/site-publish/images/raw/main-theme.png
new file mode 100644
index 0000000000..7517e23887
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/main-theme.png
diff --git a/site/trunk/site-publish/images/raw/open-active.png b/site/trunk/site-publish/images/raw/open-active.png
new file mode 100644
index 0000000000..38b287347a
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/open-active.png
diff --git a/site/trunk/site-publish/images/raw/page-add-child.png b/site/trunk/site-publish/images/raw/page-add-child.png
new file mode 100644
index 0000000000..431b360098
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-add-child.png
diff --git a/site/trunk/site-publish/images/raw/page-add-large.png b/site/trunk/site-publish/images/raw/page-add-large.png
new file mode 100644
index 0000000000..d7a9597592
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-add-large.png
diff --git a/site/trunk/site-publish/images/raw/page-add.png b/site/trunk/site-publish/images/raw/page-add.png
new file mode 100644
index 0000000000..436f2dce7e
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-add.png
diff --git a/site/trunk/site-publish/images/raw/page-add_faded_16.png b/site/trunk/site-publish/images/raw/page-add_faded_16.png
new file mode 100644
index 0000000000..b8a2ba45a9
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-add_faded_16.png
diff --git a/site/trunk/site-publish/images/raw/page-del.png b/site/trunk/site-publish/images/raw/page-del.png
new file mode 100644
index 0000000000..01f80e7b78
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-del.png
diff --git a/site/trunk/site-publish/images/raw/page-hierarchy-large.png b/site/trunk/site-publish/images/raw/page-hierarchy-large.png
new file mode 100644
index 0000000000..5ca7520b7b
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-hierarchy-large.png
diff --git a/site/trunk/site-publish/images/raw/page-hierarchy.png b/site/trunk/site-publish/images/raw/page-hierarchy.png
new file mode 100644
index 0000000000..371d6a6a23
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-hierarchy.png
diff --git a/site/trunk/site-publish/images/raw/page-history.png b/site/trunk/site-publish/images/raw/page-history.png
new file mode 100644
index 0000000000..ac85c07e3a
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-history.png
diff --git a/site/trunk/site-publish/images/raw/page-notification.png b/site/trunk/site-publish/images/raw/page-notification.png
new file mode 100644
index 0000000000..eb0c9d73d0
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/page-notification.png
diff --git a/site/trunk/site-publish/images/raw/plus_sign.png b/site/trunk/site-publish/images/raw/plus_sign.png
new file mode 100644
index 0000000000..e2f8774b24
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/plus_sign.png
diff --git a/site/trunk/site-publish/images/raw/rss.png b/site/trunk/site-publish/images/raw/rss.png
new file mode 100644
index 0000000000..0765b6f3c9
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/rss.png
diff --git a/site/trunk/site-publish/images/raw/rss_32.png b/site/trunk/site-publish/images/raw/rss_32.png
new file mode 100644
index 0000000000..f200b24633
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/rss_32.png
diff --git a/site/trunk/site-publish/images/raw/space-add-large.png b/site/trunk/site-publish/images/raw/space-add-large.png
new file mode 100644
index 0000000000..1f048f1ebf
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/space-add-large.png
diff --git a/site/trunk/site-publish/images/raw/space-add.png b/site/trunk/site-publish/images/raw/space-add.png
new file mode 100644
index 0000000000..4338ac5a36
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/space-add.png
diff --git a/site/trunk/site-publish/images/raw/space-del.png b/site/trunk/site-publish/images/raw/space-del.png
new file mode 100644
index 0000000000..eddf94c1b7
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/space-del.png
diff --git a/site/trunk/site-publish/images/raw/space-edit.png b/site/trunk/site-publish/images/raw/space-edit.png
new file mode 100644
index 0000000000..7113adb1c6
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/space-edit.png
diff --git a/site/trunk/site-publish/images/raw/space-notification.png b/site/trunk/site-publish/images/raw/space-notification.png
new file mode 100644
index 0000000000..c16afa08b0
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/space-notification.png
diff --git a/site/trunk/site-publish/images/raw/test-ran-green.png b/site/trunk/site-publish/images/raw/test-ran-green.png
new file mode 100644
index 0000000000..43e13371e2
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/test-ran-green.png
diff --git a/site/trunk/site-publish/images/raw/test-ran-red.png b/site/trunk/site-publish/images/raw/test-ran-red.png
new file mode 100644
index 0000000000..2c26dc76ff
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/test-ran-red.png
diff --git a/site/trunk/site-publish/images/raw/tree_square.png b/site/trunk/site-publish/images/raw/tree_square.png
new file mode 100644
index 0000000000..869c87d973
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/tree_square.png
diff --git a/site/trunk/site-publish/images/raw/uat-test-theme.png b/site/trunk/site-publish/images/raw/uat-test-theme.png
new file mode 100644
index 0000000000..ddbe239079
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/uat-test-theme.png
diff --git a/site/trunk/site-publish/images/raw/user_small.png b/site/trunk/site-publish/images/raw/user_small.png
new file mode 100644
index 0000000000..6272d9ab6c
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/user_small.png
diff --git a/site/trunk/site-publish/images/raw/watch-large.png b/site/trunk/site-publish/images/raw/watch-large.png
new file mode 100644
index 0000000000..560d038c16
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/watch-large.png
diff --git a/site/trunk/site-publish/images/raw/watch_16.png b/site/trunk/site-publish/images/raw/watch_16.png
new file mode 100644
index 0000000000..9c445a6cbe
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/watch_16.png
diff --git a/site/trunk/site-publish/images/raw/web_faded_16.png b/site/trunk/site-publish/images/raw/web_faded_16.png
new file mode 100644
index 0000000000..d6fd7140e4
--- /dev/null
+++ b/site/trunk/site-publish/images/raw/web_faded_16.png
diff --git a/site/trunk/site-publish/images/themes/left-nav-theme.gif b/site/trunk/site-publish/images/themes/left-nav-theme.gif
new file mode 100644
index 0000000000..47fe1a7ab9
--- /dev/null
+++ b/site/trunk/site-publish/images/themes/left-nav-theme.gif
diff --git a/site/trunk/site-publish/images/themes/main-theme.gif b/site/trunk/site-publish/images/themes/main-theme.gif
new file mode 100644
index 0000000000..01a04b4883
--- /dev/null
+++ b/site/trunk/site-publish/images/themes/main-theme.gif
diff --git a/site/trunk/site-publish/images/themes/no-icon.gif b/site/trunk/site-publish/images/themes/no-icon.gif
new file mode 100644
index 0000000000..f0f5efe178
--- /dev/null
+++ b/site/trunk/site-publish/images/themes/no-icon.gif
diff --git a/site/trunk/site-publish/images/xtree/I.png b/site/trunk/site-publish/images/xtree/I.png
new file mode 100644
index 0000000000..e8512fb911
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/I.png
diff --git a/site/trunk/site-publish/images/xtree/L.png b/site/trunk/site-publish/images/xtree/L.png
new file mode 100644
index 0000000000..eb334edaea
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/L.png
diff --git a/site/trunk/site-publish/images/xtree/Lminus.png b/site/trunk/site-publish/images/xtree/Lminus.png
new file mode 100644
index 0000000000..f7c43c0aa3
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/Lminus.png
diff --git a/site/trunk/site-publish/images/xtree/Lplus.png b/site/trunk/site-publish/images/xtree/Lplus.png
new file mode 100644
index 0000000000..848ec2fc3b
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/Lplus.png
diff --git a/site/trunk/site-publish/images/xtree/T.png b/site/trunk/site-publish/images/xtree/T.png
new file mode 100644
index 0000000000..3017325406
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/T.png
diff --git a/site/trunk/site-publish/images/xtree/Thumbs.db b/site/trunk/site-publish/images/xtree/Thumbs.db
new file mode 100644
index 0000000000..34d625a329
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/Thumbs.db
diff --git a/site/trunk/site-publish/images/xtree/Tminus.png b/site/trunk/site-publish/images/xtree/Tminus.png
new file mode 100644
index 0000000000..2260e4248c
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/Tminus.png
diff --git a/site/trunk/site-publish/images/xtree/Tplus.png b/site/trunk/site-publish/images/xtree/Tplus.png
new file mode 100644
index 0000000000..2c8d8f4fd3
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/Tplus.png
diff --git a/site/trunk/site-publish/images/xtree/blank.png b/site/trunk/site-publish/images/xtree/blank.png
new file mode 100644
index 0000000000..cee9cd37a1
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/blank.png
diff --git a/site/trunk/site-publish/images/xtree/file.png b/site/trunk/site-publish/images/xtree/file.png
new file mode 100644
index 0000000000..a20c6fa0c8
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/file.png
diff --git a/site/trunk/site-publish/images/xtree/foldericon.png b/site/trunk/site-publish/images/xtree/foldericon.png
new file mode 100644
index 0000000000..2684748b0a
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/foldericon.png
diff --git a/site/trunk/site-publish/images/xtree/new.png b/site/trunk/site-publish/images/xtree/new.png
new file mode 100644
index 0000000000..a20c6fa0c8
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/new.png
diff --git a/site/trunk/site-publish/images/xtree/openfoldericon.png b/site/trunk/site-publish/images/xtree/openfoldericon.png
new file mode 100644
index 0000000000..15fcd56711
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/openfoldericon.png
diff --git a/site/trunk/site-publish/images/xtree/pspbrwse.jbf b/site/trunk/site-publish/images/xtree/pspbrwse.jbf
new file mode 100644
index 0000000000..1485c07673
--- /dev/null
+++ b/site/trunk/site-publish/images/xtree/pspbrwse.jbf
diff --git a/site/trunk/site-publish/implementationscript.html b/site/trunk/site-publish/implementationscript.html
new file mode 100644
index 0000000000..8d12d08459
--- /dev/null
+++ b/site/trunk/site-publish/implementationscript.html
@@ -0,0 +1,136 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>implementation.script : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55156">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="implementation.script">implementation.script</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<A href="sca-java-whats-new.html" title="SCA Java Whats New">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-extension-guide.html" title="SCA Java Extension Guide">Extension Guide</A><BR>
+<A href="java-sca-architecture-guide.html" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development.html" title="SCA Java Development">Developer Guide</A><BR>
+<A href="java-sca-extension-developer-guide.html" title="Java SCA Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="implementation.script-%3Cimplementation.script%3E"></A>&lt;implementation.script&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports implementing SCA components in a wide variety of dynamic or scripting languages by using the &lt;implementation.script&gt; SCDL extension.</P>
+
+<P>Any language that supports the &quot;Scripting for Java&quot; APIs defined by JSR-223 is supported, this includes Groovy, JavaScript, JRuby, Jython, and many others.</P>
+
+<P>To use these languages the SCA assembly SCDL is extended with an &quot;implementation.script&quot; element which has the following options:</P>
+
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script [ script=<SPAN class="code-quote">&quot;&quot; | language=&quot;</SPAN>&quot; ] &gt;
+     [inline src]
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+<P>The source code for the script maybe defined in a seperate file pointed to by the 'script=' attribute, or the source code maybe embedded within the SCDL inline inside the &lt;implementation.script&gt; element.</P>
+
+<P>The 'language=' attribute defines the language of the program. The language attribute is optional when the source code is in a separate file in which case the file extension of the file is used to determine the language.</P>
+
+<H4><A name="implementation.script-Someexamples%3A"></A>Some examples:</H4>
+
+
+<P>A Ruby program defined in a file 'myScript.rb' in a folder named 'test':</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script script=<SPAN class="code-quote">&quot;test/myScript.rb&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+
+
+<P>A JavaScript program defined inline:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;
+      function sayHello(name) {
+         <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;Hello &quot;</SPAN> + name;
+      }
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+
+<P>When using inline scripts which contain special characters such as XML markup you may need to enclose the source within a CDATA region, for example:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+      function sayHello(inXML) {
+         <SPAN class="code-keyword">return</SPAN> &lt;sayHelloResponse&gt;Hello { inXML..name }&lt;/sayHelloResponse&gt;;
+      }
+]]&gt;&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libraries.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libraries.png
new file mode 100644
index 0000000000..6d45c34a9d
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libraries.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png
new file mode 100644
index 0000000000..112e04fd99
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png.jpeg b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png.jpeg
new file mode 100644
index 0000000000..4c60fe104a
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png.jpeg
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png
new file mode 100644
index 0000000000..a49d800983
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png.jpeg b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png.jpeg
new file mode 100644
index 0000000000..b432e7aac0
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png.jpeg
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png
new file mode 100644
index 0000000000..f6ed9e0909
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png.jpeg b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png.jpeg
new file mode 100644
index 0000000000..4d4d731c4a
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project.png.jpeg
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png
new file mode 100644
index 0000000000..f6ed9e0909
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png.jpeg b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png.jpeg
new file mode 100644
index 0000000000..4d4d731c4a
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png.jpeg
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png
new file mode 100644
index 0000000000..af4ef71404
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png.jpeg b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png.jpeg
new file mode 100644
index 0000000000..9aa8c97c36
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png.jpeg
diff --git a/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.html b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.html
new file mode 100644
index 0000000000..0aee9df74d
--- /dev/null
+++ b/site/trunk/site-publish/import-existing-tuscany-sca-projects-into-eclipse.html
@@ -0,0 +1,293 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Import existing Tuscany SCA projects into Eclipse</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337381">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Import existing Tuscany SCA projects into Eclipse">Import existing Tuscany SCA projects into Eclipse</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>There is already a page that describes how to <A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">get started with Eclipse</A> by building a new Tuscany SCA project from scratch. How do you though use the various existing samples and examples that are provided with Tuscany from within Eclipse? Here we'll provide some instructions about how to do just that for both the Maven user and the non-Maven user. As an example we'll look specifically at how to import the introducing-trips contributions and the jumpstart launcher that runs it from the <A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases">Tuscany SCA Travel Sample</A>.  We'll also explain how to use the same approach to import other samples such as the samples in the Tuscany SCA Java binary distribution and the complete travel sample code.</P>
+
+<P>These instructions assume that the sample code being loaded into Eclipse has been downloaded and unzipped and the sample modules have already been compiled using Maven or Ant following the instructions in the sample's README. This is important because some of the source in sample modules is generated during the compile stage and you'll need to import that into Eclipse along with the other source code and resources that the sample modules contain. These instructions were written using Eclipse 3.5.2.</P>
+
+<P>Both of the approaches described below import the sample modules into Eclipse without copying them. This means that any edits to the sample resources that you make in Eclipse will result in changes in the directories where you unzipped the sample, and you won't see copies of these projects appear in the Eclipse workspace directory on disc. This is generally a useful approach as it lets you work directly on projects outside of the Eclipse workspace. In the case of the travel sample it's particularly important because there are some cross references between the various modules in the sample. If you copy the projects out of the sample structure they won't run properly without further editing.</P>
+
+
+<H1><A name="ImportexistingTuscanySCAprojectsintoEclipse-1FortheMavenuser"></A>1 - For the Maven user</H1>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-1.1CreatingEclipseprojectfiles"></A>1.1 - Creating Eclipse project files</H2>
+
+<P>Maven has a <A href="http://maven.apache.org/guides/mini/guide-ide-eclipse.html" class="external-link" rel="nofollow">plugin</A> which will convert a Maven project into an Eclipse project. For example, to load the travel sample's introducing-trips contribution into Eclipse as a project first do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd travelsample/contributions/introducing-trips
+mvn eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<P>That generates, amongst other things, .classpath and .project files into the introducing-trips directory. These files effectively make the introducing-trips module an Eclipse project that can be loaded directly into Eclipse. This Eclipse project will reference dependencies in the local Maven repository, based on the contents of the pom.xml file. These dependency references are constructed using an Eclipse classpath variable called M2_REPO.</P>
+
+<P>The previous example shows how to run a <TT>mvn</TT> command to create a single Eclipse project. It's often useful to run a single <TT>mvn</TT> command from a top-level directory to create multiple Eclipse projects. For example, to create Eclipse projects for all the samples in the Tuscany SCA Java 1.6.1 (or later 1.x) binary distribution, you can do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd samples
+mvn eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<P>This runs the <TT>mvn eclipse:eclipse</TT> command for all the samples under the top-level <TT>samples</TT> directory. As well as being more convenient than running a <TT>mvn eclipse:eclipse</TT> command for each sample, using a single <TT>mvn eclipse:eclipse</TT> command from a top-level directory enables the Maven plugin to discover any dependency relationships between the samples and create corresponding dependency relationships between the generated Eclipse projects. You can do this for the complete travel sample by doing the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd travelsample
+mvn eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-1.2SettingtheM2REPOvariable"></A>1.2 - Setting the M2_REPO variable</H2>
+
+<P>Before loading the project into Eclipse you need to set M2_REPO as a classpath variable in your workspace to tell it where the Maven repository is.</P>
+
+<P>You can do this with Maven using the following command.</P>
+
+<P><TT>mvn &#45;Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</TT></P>
+
+<P>Alternatively you can do it manually by opening the Eclipse workspace you&rsquo;re going to use and then:</P>
+
+<P>Select Window/Preferences<BR class="atl-forced-newline">
+From the resulting &ldquo;Preferences&rdquo; dialog select Java/Build Path/Classpath Variables<BR class="atl-forced-newline">
+Select the &ldquo;New&hellip;&rdquo; button<BR class="atl-forced-newline">
+In the &ldquo;Name:&rdquo; field type M2_REPO<BR class="atl-forced-newline">
+In the &ldquo;Path:&rdquo; field type &lt;path to your maven repo&gt;</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-1.3LoadinganexistingprojectintoEclipse"></A>1.3 - Loading an existing project into Eclipse</H2>
+
+<P>Once M2_REPO is set you can load the project(s) into Eclipse by opening the Eclipse workspace you&rsquo;re going to use and then:</P>
+
+<P>Select menu File/Import&hellip;<BR class="atl-forced-newline">
+From the resulting &ldquo;Select&rdquo; dialog box select General/Existing Projects into Workspace<BR class="atl-forced-newline">
+From the resulting &ldquo;Import Projects&rdquo; dialog box select the &ldquo;Browse&hellip;&rdquo; button to locate the directory containing the project(s) to import<BR class="atl-forced-newline">
+Select &ldquo;Finish&rdquo;</P>
+
+<P>For example, to load the contributions/introducing-trips project from the travel sample, you would select the <TT>travelsample/contributions/introducing-trips</TT> directory. To load all the Tuscany binary distribution samples you would select the <TT>samples</TT> directory, and to load the complete travel sample you would select the <TT>travelsample</TT> directory.</P>
+
+<P>The project should now appear in your workspace.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-1.4Runningthesample"></A>1.4 - Running the sample</H2>
+
+<P>Now you have introducing-trips loaded you can repeat the process for the travel sample launchers/jumpstart module. Repeat step 1.1 for launchers/jumpstart and then load it into Eclipse with step 1.3. You don't need to repeat step 1.2 as M2_REPO will remain set.</P>
+
+<P>Now open up the scatours-launcher-jumpstart project in Eclipse (the project name comes from the Maven module name specified in the pom.xml file) and look for the JumpstartLauncher.java file. If you right click on that file and select Run As Application the sample should run. Alternatively you can select Debug As Application if you want to set debugging breakpoints.</P>
+
+<P>You can run other samples by finding the main class and selecting Run As Application.</P>
+
+<H1><A name="ImportexistingTuscanySCAprojectsintoEclipse-2ForthenonMavenuser"></A>2 - For the non-Maven user</H1>
+
+<P>Maven gives a fair bit of help in creating Eclipse projects from existing project. Most of the effort is involved in working out what the dependencies are.</P>
+
+<P>To import projects without using Maven you first need to make all of the Tuscany libraries available to the SCA projects you'll be loading into Eclipse. You can do this by creating a TUSCANY library variable. Once you have this set you can create new projects, load existing resources into them and associate them with the TUSCANY variable so that all the dependencies are satisfied.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.1InstalltheTuscanydistribution"></A>2.1 - Install the Tuscany distribution</H2>
+
+<P>Follow the steps detailing in the &quot;Install the Tuscany distribution&quot; section of the page that discussed how to <A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">get started with Eclipse</A>. For the travel sample you'll need to install the 1.6 (or later 1.x) release of the Tuscany SCA Java runtime.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.2SetupEclipseforTuscany"></A>2.2 - Setup Eclipse for Tuscany</H2>
+
+<P>Follow the steps detailing in the &quot;Setup Eclipse for Tuscany&quot; section of the page that discussed how to <A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">get started with Eclipse</A>. For the travel sample you'll need to install the 1.6 (or later 1.x) release of the Tuscany SCA Java runtime. It's at this stage that the TUSCANY library variable gets set.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.3CreateaJavaprojecttocontaintheSCAartifacts"></A>2.3 - Create a Java project to contain the SCA artifacts</H2>
+
+<P>Select File/New/Java Project to open the &quot;Create a Java Project&quot; dialog and the give the project a sensible name.<BR>
+<SPAN class="image-wrap" style=""><IMG src="import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project2.png" style="border: 1px solid black"></SPAN></P>
+
+<P>Note that the &quot;Create project from existing source&quot; option is selected and the location of the introducing-trips project has been specified.</P>
+
+<P>Now press the &quot;Next &gt;&quot; button</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.4ImporttheSCAartifacts"></A>2.4 - Import the SCA artifacts</H2>
+
+<P>The next panel allows you to set up the structure of the new project. The source tab allows you to determine where the source code and other resources can be found. <SPAN class="image-wrap" style=""><IMG src="import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-sources.png" style="border: 1px solid black"></SPAN><BR>
+In this case you can just leave the defaults. You'll need to configure the introducing-trips/src/main/resources folder as a source folder for the project but it's easier to do this once the project has been created.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.5Specifyingdependencyprojects"></A>2.5 - Specifying dependency projects</H2>
+
+<P>The Projects tab allows you to specify which other projects this project depends on. Some of the travel sample modules rely on other other modules, for example, the contributions/common module. However this is not the case here so you can just leave this tab with the default setting.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.6Specifyingotherdependencies"></A>2.6 - Specifying other dependencies</H2>
+
+<P>The Libraries tab allows you to specify the Tuscany jars that are required to compile this module.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="import-existing-tuscany-sca-projects-into-eclipse.data/create-java-project-libs.png" style="border: 1px solid black"></SPAN></P>
+
+<P>You've already configured the TUSCANY library in step 2.2 so you can select this using the Add Library button an selecting User Library in the resulting dialog.</P>
+
+<P>Once that's done you can press the Finish button at the bottom of the dialog. The result should be an introducing-trips project.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.7Addingextrasourcefolders"></A>2.7 - Adding extra source folders</H2>
+
+<P>Eclipse doesn't automatically pick up some of the folders that have been configured in the Maven modules. These are usually:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+src/main/resources
+src/test/resources
+target/jaxws-source
+</PRE>
+</DIV></DIV>
+
+<P>You need to configure these manually as source directories. Right click on the project and select &quot;Properties&quot; options. </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="import-existing-tuscany-sca-projects-into-eclipse.data/project-properties.png" style="border: 1px solid black"></SPAN></P>
+
+<P>Now press the &quot;Add Folder&quot; button and select the project folder that you want to include as a source folder, in this case src/main/resources. Press OK to return.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-2.8Runningthesample"></A>2.8 - Running the sample</H2>
+
+<P>To run the sample you need to import launchers/jumpstart by repeating steps 2.3, 2.4, 2.5, 2.6 and 2.7 for the jumpstart project. There is extra work required at step 2.6 this time though. The jumpstart module has unit tests that depend on the junit-4.5.jar that ships in the tuscany-scatours-1.0\lib\junit directory. Add this as a dependency of the project using the &quot;Add External Jars...&quot; button.</P>
+
+<P>Once done you should have a jumpstart project that compiles without errors.</P>
+
+<P>Now open up the scatours-launcher-jumpstart project in Eclipse (the project name comes from the Maven module name specified in the pom.xml file) and look for the JumpstartLauncher.java file. If you right click on that file and select Run As Application the sample should run.</P>
+
+<H1><A name="ImportexistingTuscanySCAprojectsintoEclipse-3UsingtheMavenpluginforEclipse"></A>3 - Using the Maven plugin for Eclipse</H1>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-3.1Installthem2eclipsepluginintoEclipse"></A>3.1 - Install the m2eclipse plugin into Eclipse</H2>
+
+<P><A href="http://m2eclipse.sonatype.org/" class="external-link" rel="nofollow">m2eclipse</A> offers integration of Maven with the Eclipse platform. It provides two plugins which give you different levels of integration:</P>
+
+<UL>
+	<LI>m2eclipse Core - will be installing of the core Wizards, the POM Editor, Maven Repository integration, and Maven integration.</LI>
+	<LI>m2eclipse Extras - will be installing more features like Maven SCM integration, Eclipse Web Tools Platform integration and others.</LI>
+</UL>
+
+
+<P>In order to install the plugins, open Eclipse and go to Help -&gt; <B>Install New Software...</B>. In the newly opened window click <B>Add...</B> from the <B>Work with</B> area and enter the following update sites:</P>
+
+<UL>
+	<LI><A href="http://m2eclipse.sonatype.org/sites/m2e" class="external-link" rel="nofollow">http://m2eclipse.sonatype.org/sites/m2e</A> for m2eclipse core</LI>
+	<LI><A href="http://m2eclipse.sonatype.org/sites/m2e-extras" class="external-link" rel="nofollow">http://m2eclipse.sonatype.org/sites/m2e-extras</A> for m2eclipse extras</LI>
+</UL>
+
+
+<P>Continue installation by selecting which modules to install and accepting terms of agreement.</P>
+
+<P>m2eclipse uses an embedded installation of Maven by default. This can be changed with a specific instance of Maven found on the disk by entering the <B>Windows -&gt; Preferences</B> menu in Eclipse. Click the <B>Maven</B> section and all the Maven integration related options will be displayed. In the <B>Installations</B> category, changes can be performed regarding the Maven instance and configuration file to use.</P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-3.2ImporttheSCAartifacts"></A>3.2 - Import the SCA artifacts</H2>
+
+<P>Go to <B>File -&gt; Import...</B> in the Eclipse menu. From the <B>Maven</B> category, choose <B>Existing Maven Projects</B> and click <B>Next</B>. In the next step, choose a root directory and the plugin will show you all the Maven projects inside it and it's subdirectories. Choose one of them and click <B>Next</B>. From here on, m2eclipse will take care of resolving the dependencies, generating the Eclipse specific files. </P>
+
+<P>Notice the project icon containing an <B>M</B> in the top left corner indicating the Maven nature of the project. To disable the Maven nature of a project, right click on the project, go to the <B>Maven</B> context menu and click <B>Disable Dependency Management</B>. </P>
+
+<H2><A name="ImportexistingTuscanySCAprojectsintoEclipse-3.3RunningSCAcontributionsandwebapps"></A>3.3 - Running SCA contributions and webapps</H2>
+
+<P>Once imported, Maven projects can be run in Eclipse using the well-known context menu <B>Run As</B> and choosing the appropriate category. </P>
+
+<P>Also, Maven related tasks (goals like compile, test, package, install, etc.) can be run by using the project context menu and going to the <B>Maven</B> sub-menu. </P>
+
+<P>Web applications can also be run from inside the <B>Servers</B> view as the m2eclipse extras plugin provides integration with Eclipse WTP. This enables Eclipse to recognize web applications managed by Maven. To add an application to a server, right click the server in the <B>Servers</B> view and go to <B>Add and Remove...</B>. Select which apps to publish to a particular server. Managing server state (starting, stopping, restarting, starting in debug mode) can be done using the provided buttons in the <B>Servers</B> view. Source code or resource changes are automatically synchronized with the published version on the server. The view also indicates if the application server needs to be restarted in order to apply major changes.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/incubator-m2.html b/site/trunk/site-publish/incubator-m2.html
new file mode 100644
index 0000000000..a1f5b92e3d
--- /dev/null
+++ b/site/trunk/site-publish/incubator-m2.html
@@ -0,0 +1,185 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Incubator-M2 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56279">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-releases.html" title="SCA Releases">SCA Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Incubator-M2">Incubator-M2</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>The SCA Java Incubator-M2 was released in Nov 2006.</P>
+
+<H3><A name="Incubator-M2-Windows"></A>Windows</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR clear="all"> </TH>
+<TH class="confluenceTh"> Signature <BR clear="all"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-bin.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA Samples <BR clear="all"> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-samples.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 <BR clear="all"> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="Incubator-M2-Linux"></A>Linux</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR clear="all"> </TH>
+<TH class="confluenceTh"> File <BR clear="all"> </TH>
+<TH class="confluenceTh"> Signature <BR clear="all"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0--incubator-M2-bin.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA Samples </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-samples.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">PGP <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <BR clear="all"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">PGP <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="Incubator-M2-JavaDocsArchive"></A>JavaDocs Archive</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Description  </TH>
+<TH class="confluenceTh"> File <BR clear="all"> </TH>
+<TH class="confluenceTh"> Signature <BR clear="all"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany M2 SCA Javadocs </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-sca-1.0-incubator-M2-javadoc.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR clear="all"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip" title="Visit page outside Confluence" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip.asc" title="Visit page outside Confluence" rel="nofollow">PGP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR clear="all"> </TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/incubator-report-may-2007.html b/site/trunk/site-publish/incubator-report-may-2007.html
new file mode 100644
index 0000000000..5f0cc09060
--- /dev/null
+++ b/site/trunk/site-publish/incubator-report-may-2007.html
@@ -0,0 +1,115 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Incubator report - May 2007 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=53671">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="incubator-reports.html" title="Incubator Reports">Incubator Reports</A>&nbsp;&gt;&nbsp;<A href="" title="Incubator report - May 2007">Incubator report - May 2007</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>iPMC Reviewers: dims, jerenkrantz, yoavs, jukka, twl </P>
+
+<P>Tuscany provides infrastructure for developing service-oriented applications based on Service Component Architecture (SCA) specification and Service Data Objects (SDO) specifications.  These specifications were submitted to OASIS in March 2007 by OSOA (www.osoa.org)</P>
+
+
+<P>Top issue?  Need to get back on track with agreed project goals, provide a stable codebase/SPIs, and follow up with regular releases.  This should create an environment that will attract a growing and diverse community of users and developers. We are working towards this.</P>
+
+<P>Community aspects:</P>
+
+<UL>
+	<LI>Voted in Adriano Crestani, an individual contributor,  as a committer for his contributions to DAS project.</LI>
+	<LI>Voted in Andy Grove from RogueWave as a committer for his lengthy list of contributions to the SDO project.</LI>
+	<LI>Have been receiving many good user questions and have received good feedback on quality of responses that were provided.</LI>
+	<LI>Enhanced Tuscany website to improve information sharing. We are working on user and architecture guides for contributors or users of Tuscany.</LI>
+	<LI>Integration with Apache projects
+	<UL>
+		<LI>Working with Apache Directory to provide DAS LDAP.</LI>
+		<LI>Integrated with BSF and Axis2.</LI>
+	</UL>
+	</LI>
+	<LI>Fractal is working on integration with Tuscany SCA Java</LI>
+	<LI>3 of the commmitters (Jeremy Boynes, Jim Marino and Meeraj)chose to start a new open source project called Fabric3 in March 2007.</LI>
+</UL>
+
+
+<P>Code:</P>
+<UL>
+	<LI>Released M3 incubator release of Native SCA and SDO C++ in early May.</LI>
+	<LI>Formed Community Test Suite for SDO which has been receiving many contributions, over 300 tests.</LI>
+	<LI>In the process of releasing Java SDO Beta1 incubator release. It has community approval and is going through IPMC approval.</LI>
+	<LI>In the process of releasing SCA Java. This release is focused on improved usability, stability (stable SPIs) and modularity. Stable and simple SPIs and modularity enhance  extensibility of SCA for integration with other open source projects.</LI>
+</UL>
+
+
+<P>Note:  OSOA is a collaboration group where the first version of SCA and SDO spec were developed, see:  <SPAN class="nobr"><A href="http://www.osoa.org/" title="Visit page outside Confluence" rel="nofollow">http://www.osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </P>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/incubator-reports.html b/site/trunk/site-publish/incubator-reports.html
new file mode 100644
index 0000000000..a0134a71b6
--- /dev/null
+++ b/site/trunk/site-publish/incubator-reports.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Incubator Reports : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55499">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Incubator Reports">Incubator Reports</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/index.html b/site/trunk/site-publish/index.html
new file mode 100644
index 0000000000..75cdfb095c
--- /dev/null
+++ b/site/trunk/site-publish/index.html
@@ -0,0 +1,192 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Index</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52586">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Index">Index</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Index-WelcometoApacheTuscany"></A>Welcome to Apache Tuscany</H3>
+<P>Apache Tuscany simplifies the task of developing <A href="http://en.wikipedia.org/wiki/Service-oriented_architecture" class="external-link" rel="nofollow">SOA</A> solutions by providing a comprehensive infrastructure for SOA development and management that is based on Service Component Architecture (SCA) standard. With SCA as it's foundation, Tuscany offers solution developers the following advantages: </P>
+<UL>
+	<LI>Provides a model for creating composite applications by defining the services in the fabric and their relationships with one another. The services can be implemented in any technology.</LI>
+	<LI>Enables service developers to create reusable services that only contain business logic. Protocols are pushed out of business logic and are handled through pluggable bindings. This lowers development cost.</LI>
+	<LI>Applications can easily adapt to infrastructure changes without recoding since protocols are handled via pluggable bindings and quality of services (transaction, security) are handled declaratively.</LI>
+	<LI>Existing applications can work with new SCA compositions. This allows for incremental growth towards a more flexible architecture, outsourcing or providing services to others.</LI>
+</UL>
+
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+
+<P>In addition, Tuscany is integrated with various technologies and offers:</P>
+<UL>
+	<LI>a wide range of bindings (pluggable protocols)</LI>
+	<LI>various component types including and not limited to Java, C++, BPEL, Spring and scripting</LI>
+	<LI>an end to end service and data solution which includes support for Jaxb and SDO</LI>
+	<LI>a lightweight runtime that works standalone or with other application servers</LI>
+	<LI>a modular architecture that makes it easy to integrate with different technologies and to extend</LI>
+	<LI>Integration with web20 technologies</LI>
+</UL>
+
+
+<P>Apache Tuscany SCA is implemented in <A href="http://tuscany.apache.org/sca-java.html" class="external-link" rel="nofollow">Java</A> and <A href="http://tuscany.apache.org/sca-native.html" class="external-link" rel="nofollow">C+&#43; (referred to as Native) </A>. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Overview" class="external-link" rel="nofollow">Learn more about SCA </A></P>
+
+<P>Please join us to create a practical SOA infrastructure that addresses the challenges which small to large scale businesses face.</P>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD>
+<TD class="confluenceTd" valign="top" width="25%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0</B> <EM>(July, 2012)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.2</B> <EM>(April 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta2</B> <EM>(February, 2011)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-Beta1</B> <EM>(November, 2010)</EM></A></LI>
+	<LI><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.6.1</B> <EM>(November 2010)</EM></A></LI>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-M5.1</B> <EM>(October, 2010)</EM></A></LI>
+	<LI><A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases"><B>SCA Java Travel Sample 1.0</B> <EM>(June 2010)</EM></A></LI>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.6</B> <EM>(Feb, 2010)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/introduction.html b/site/trunk/site-publish/introduction.html
new file mode 100644
index 0000000000..03e1a5ecdf
--- /dev/null
+++ b/site/trunk/site-publish/introduction.html
@@ -0,0 +1,124 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Introduction</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Introduction">Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A> on Feb 09, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="Introduction-WhatIsSCA%3F"></A>What Is SCA?</H1>
+
+<P>Service Component Architecture (SCA) is a simple model for creating service-oriented applications.</P>
+
+<P>Service Oriented Architecture (SOA) is an architectural approach driven by the need to overcome the challenges of tightly coupled and department-specific applications. SOA promises benefits such as improved business agility, improved flexibility, cost reduction, and the easy sharing of information in heterogeneous and distributed environments.</P>
+
+<P>Service Component Architecture (SCA) addresses the complexity of developing an SOA solution through its simple model for creating service-oriented applications for the whole enterprise - from the client to the back-end. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/issue-management.html b/site/trunk/site-publish/issue-management.html
new file mode 100644
index 0000000000..6db23de728
--- /dev/null
+++ b/site/trunk/site-publish/issue-management.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Issue Management</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48696">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Issue Management">Issue Management</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>SDO Java Issues are managed in our <A href="http://issues.apache.org/jira/browse/TUSCANY" class="external-link" rel="nofollow">JIRA</A> environment.  The components for the Tuscany SDO implementation are &quot;Java SDO Implementation&quot;, &quot;Java SDO Tools&quot; and &quot;Java SDO Samples&quot;</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/issue-tracking.html b/site/trunk/site-publish/issue-tracking.html
new file mode 100644
index 0000000000..7bebd196f1
--- /dev/null
+++ b/site/trunk/site-publish/issue-tracking.html
@@ -0,0 +1,180 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Issue Tracking</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47521">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Issue Tracking">Issue Tracking</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="IssueTracking-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="IssueTracking-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="IssueTracking-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="IssueTracking-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/j2se-sample.html b/site/trunk/site-publish/j2se-sample.html
new file mode 100644
index 0000000000..80f36e97c3
--- /dev/null
+++ b/site/trunk/site-publish/j2se-sample.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : J2SE Sample</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53964">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="J2SE Sample">J2SE Sample</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="J2SESample-RDBDASCustomerSample"></A>RDB DAS Customer Sample</H1>
+
+<P>This stand-alone sample demonstrates the RDB Data Access Service in the context of a simple java application.<BR>
+So, this simple application covers all CRUD operations. The sample runs on Eclipse or from the command line, and employs a Derby database accessed via a DriverManager.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-das-please-remove.html b/site/trunk/site-publish/java-das-please-remove.html
new file mode 100644
index 0000000000..ffcbb52726
--- /dev/null
+++ b/site/trunk/site-publish/java-das-please-remove.html
@@ -0,0 +1,118 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java DAS - please remove</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Java DAS - please remove">Java DAS - please remove</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java DAS - please remove</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47935">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47935">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47935">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Mar 06, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-das.html b/site/trunk/site-publish/java-das.html
new file mode 100644
index 0000000000..62936184e6
--- /dev/null
+++ b/site/trunk/site-publish/java-das.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java DAS</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Java DAS">Java DAS</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java DAS</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47935">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47935">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47935">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47935">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Mar 07, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47935&originalId=47936">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-implementation-model-for-event-processing.html b/site/trunk/site-publish/java-implementation-model-for-event-processing.html
new file mode 100644
index 0000000000..f1e560b58a
--- /dev/null
+++ b/site/trunk/site-publish/java-implementation-model-for-event-processing.html
@@ -0,0 +1,207 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java Implementation Model for Event Processing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99635">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-event-processing.html" title="SCA Java Event Processing">SCA Java Event Processing</A>&nbsp;&gt;&nbsp;<A href="" title="Java Implementation Model for Event Processing">Java Implementation Model for Event Processing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page describes the Java Implementation for Event Processing.</P>
+
+<P>The Java Implementation for Event Processing is an extension of the standard SCA Java Implementation model.  All the standard SCA Java implementation features continue to be available to Java implementations.  The following features are added:</P>
+<UL>
+	<LI>Ability to define one or more methods of the implementation class to be <B><EM>consumer methods</EM></B>, consuming one or more <B><EM>event types</EM></B></LI>
+	<LI>Ability to define a field or setter method of the implementation class as an event <B><EM>producer</EM></B>, with one or more business methods producing one or more <B><EM>event types&nbsp;</EM></B></LI>
+	<LI>Ability to define <B><EM>event types</EM></B> as Java POJO classes</LI>
+</UL>
+
+
+<H2><A name="JavaImplementationModelforEventProcessing-EventTypes"></A>Event Types</H2>
+
+<P>Event types are defined through Java classes which are annotated with a @EventType annotation.&nbsp; The @EventType annotation has a single parameter which is the <B><EM>name</EM></B> of the event type.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">@EventType(ExampleEvent)
+<SPAN class="code-keyword">public</SPAN> class ExampleEvent {
+
+     <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> eventData;
+
+} <SPAN class="code-comment">// end class ExampleEvent</SPAN>
+</PRE>
+</DIV></DIV>
+<P>The name may be:</P>
+<UL>
+	<LI><B><EM>unqualified</EM></B>, in which case the EventType name is qualified by the package name of the class itself</LI>
+	<LI><B><EM>qualified</EM></B>, in which case the EventType name is used as it is declared</LI>
+</UL>
+
+
+<P>Note that the Event Type name maps to an XSD QName using the Java-to-WSDL mapping as defined by JAX-WS.</P>
+
+<P>The Event type(s) handled by a consumer method or a producer method is defined in one of two ways:</P>
+<OL>
+	<LI>The method has a parameter that is of a class annotated with the @EventType annotation (of a single event type)</LI>
+	<LI>The method is itself annotated with the @EventTypes annotation for one or more event types - where the method parameter is of some generic type such as java.lang.Object which does not specify an EventType</LI>
+</OL>
+
+
+<H2><A name="JavaImplementationModelforEventProcessing-EventConsumermethods"></A>Event Consumer methods</H2>
+
+<P>Each method of the implementation that is a consumer for events is annotated with a @Consumer annotation.&nbsp; Each method must have a <B><EM>void</EM></B> return type and a single parameter that is either a specific event type or a superclass of one or more event types, including java.lang.Object, which is treated as the supertype of all event types.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"><SPAN class="code-keyword">public</SPAN> class ConsumerrExample {
+
+    <SPAN class="code-keyword">private</SPAN> ExampleProducer eventProducer;
+
+    @Consumer(ExampleConsumer)
+&nbsp;   <SPAN class="code-keyword">public</SPAN> void someBusinessMethod( ExampleEvent theEvent ) {
+        <SPAN class="code-object">String</SPAN> businessData = theEvent.eventData;
+        <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> business processing...
+</SPAN>    } <SPAN class="code-comment">// end method someBusinessMethod
+</SPAN>
+} <SPAN class="code-comment">// end class</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="JavaImplementationModelforEventProcessing-EventProducers"></A>Event Producers</H2>
+
+<P>Event Producers are identified as a Field or a Setter method annotated with a @Producer annotation</P>
+
+<P>It is required that the Field or Setter method is typed by a Java interface.&nbsp; The Java interface must have one or more methods, each of which has a <B><EM>void</EM></B> return type and a single parameter that is either a specific event type or a superclass of one or more event types, including java.lang.Object, which is treated as the supertype of all event types.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ExampleProducer {
+
+    void produceExampleEvent( ExampleEvent theEvent);
+
+} <SPAN class="code-comment">// end <SPAN class="code-keyword">interface</SPAN> ExampleProducer
+</SPAN>
+@EventType(ExampleEvent)
+<SPAN class="code-keyword">public</SPAN> class ExampleEvent {
+
+     <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> eventData;
+
+} <SPAN class="code-comment">// end class ExampleEvent
+</SPAN>
+
+<SPAN class="code-keyword">public</SPAN> class ProducerExample {
+
+    <SPAN class="code-keyword">private</SPAN> ExampleProducer eventProducer;
+
+    @Producer(ExampleEvent)
+    <SPAN class="code-keyword">public</SPAN> void setEventProducer( ExampleProducer theProducer ) {
+        eventProducer = theProducer;
+        <SPAN class="code-keyword">return</SPAN>;
+    } <SPAN class="code-comment">// end method setEventProducer
+</SPAN>
+    <SPAN class="code-keyword">public</SPAN> void someBusinessMethod() {
+        theEvent = <SPAN class="code-keyword">new</SPAN> ExampleEvent();
+        theEvent.eventData = <SPAN class="code-quote">&quot;Some Data&quot;</SPAN>;
+        eventProducer.produceExampleEvent( theEvent );
+    } <SPAN class="code-comment">// end method someBusinessMethod
+</SPAN>
+} <SPAN class="code-comment">// end class</SPAN>
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-implementation.html b/site/trunk/site-publish/java-implementation.html
new file mode 100644
index 0000000000..48cc93dba9
--- /dev/null
+++ b/site/trunk/site-publish/java-implementation.html
@@ -0,0 +1,175 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java Implementation</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46813">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java Implementation">Java Implementation</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>Here is a really simple SCA component implemented in Java:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Orange {  
+  <SPAN class="code-comment">// methods
+</SPAN>}
+<SPAN class="code-keyword">public</SPAN> class AppleImpl <SPAN class="code-keyword">implements</SPAN> Apple {  
+  <SPAN class="code-keyword">private</SPAN> Orange orange;  
+  <SPAN class="code-keyword">public</SPAN> AppleImpl(Orange orange) {    
+    <SPAN class="code-keyword">this</SPAN>.orange = orange;  
+  }
+  <SPAN class="code-comment">// other methods
+</SPAN>}
+</PRE>
+</DIV></DIV>
+<P>Yes, this is the same as the simplest possible <A href="http://docs.codehaus.org/display/PICO/Inversion%20of%20Control" class="external-link" rel="nofollow">Pico component</A> and it really is a fully functional SCA implementation. Tuscany uses the following conventions to figure out how to run this when you include it in an SCA assembly:</P>
+<UL>
+	<LI>the class implements a single interface &quot;Apple&quot;, so there is one service defined by that interface</LI>
+	<LI>there is a single constructor with a value that is not a simple type, we treat that as a reference to the &quot;Orange&quot; service</LI>
+	<LI>there are no properties or intents to deal with</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-090-release-contents.html b/site/trunk/site-publish/java-sca-090-release-contents.html
new file mode 100644
index 0000000000..f8748ca8f2
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-090-release-contents.html
@@ -0,0 +1,283 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA 0.90 Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52557">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA 0.90 Release Contents">Java SCA 0.90 Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="JavaSCA0.90ReleaseContents-NextJavaSCAReleaseContents"></A>Next Java SCA Release Contents</H3>
+
+<P>This page outlines the features being planned for the next Java SCA release.</P>
+
+<P>The next release is targted for mid May 2007. A focus will be on the stability and consumability for the runtime core functions</P>
+<H3><A name="JavaSCA0.90ReleaseContents-Workingon"></A>Working on</H3>
+<UL>
+	<LI>tidy up runtime after all the recent rewrite/refactors
+	<UL class="alternate" type="square">
+		<LI>Composite component wiring and promotion hierarchy (jsdelfino)</LI>
+		<LI>Package/Class naming consistency across modules
+		<UL class="alternate" type="square">
+			<LI>rename the core-spi package (Venkat)</LI>
+		</UL>
+		</LI>
+		<LI>Package dependencies</LI>
+		<LI>Setting data bindings on interfaces
+		<UL class="alternate" type="square">
+			<LI>using the contribution service to remove the need of import.sdo (rfeng)</LI>
+		</UL>
+		</LI>
+		<LI>Type scoping and contexts</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>define a clear set of runtime and extension APIs which we can keep stable over future releases
+	<UL class="alternate" type="square">
+		<LI>working out the invocation chain based on the new SPIs (rfeng)</LI>
+		<LI>refactor extensions (Java, script, axis2, rmi etc) to use new SPIs</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>logging stratergy and better error reporting
+	<UL class="alternate" type="square">
+		<LI>in the assembly model (jsdelfino)</LI>
+		<LI>in the contribution service (lresende)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>manage lifecycle</LI>
+</UL>
+
+
+<UL>
+	<LI>Tomcat and Jetty http
+	<UL class="alternate" type="square">
+		<LI>which port to start an http connector</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>work on a Domain concept (drops out of this releases)</LI>
+</UL>
+
+
+<UL>
+	<LI>better integration with App Servers</LI>
+	<LI>web app support including tomcat deep integration</LI>
+</UL>
+
+
+<UL>
+	<LI>Java components</LI>
+	<LI>script components (JavaScript/JRuby/Jython/...?)</LI>
+	<LI>Axis2 Web service binding</LI>
+</UL>
+
+
+<UL>
+	<LI>what samples?
+	<UL class="alternate" type="square">
+		<LI>a web app sample (lresende)</LI>
+		<LI>a script language sample</LI>
+		<LI>das-service sample</LI>
+		<LI>example Ant build script for sample (slaws)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>decide on distributions, create build scripts (ant, and...?)
+	<UL class="alternate" type="square">
+		<LI>try out the distributions (slaws, and...?)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Add text to the varrious readme type docs included in the distributions
+	<UL class="alternate" type="square">
+		<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A></LI>
+		<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL" class="external-link" rel="nofollow">INSTALL</A></LI>
+		<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING" class="external-link" rel="nofollow">BUILDING</A></LI>
+		<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/distribution/src/main/release/README" class="external-link" rel="nofollow">README</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>good documentation for all the above on the website
+	<UL class="alternate" type="square">
+		<LI>Start of user guide  -  Haleh</LI>
+		<LI>Extension developers guide (once we've sorted out the SPIs) - (ant, and...?)</LI>
+		<LI>What else?</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="JavaSCA0.90ReleaseContents-Alreadyinthetrunkandwillbeincludedintherelease"></A>Already in the trunk and will be included in the release</H3>
+<P>What is new over M2 Release? Things that have been worked on already?</P>
+<UL class="alternate" type="square">
+	<LI>Improved databinding</LI>
+	<LI>Contribution Services<BR>
+..</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-091-release-contents.html b/site/trunk/site-publish/java-sca-091-release-contents.html
new file mode 100644
index 0000000000..f5f3f759d2
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-091-release-contents.html
@@ -0,0 +1,184 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA 0.91 Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60144">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA 0.91 Release Contents">Java SCA 0.91 Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="JavaSCA0.91ReleaseContents-0.91JavaSCAReleaseContents"></A>0.91 Java SCA Release Contents</H3>
+
+<P>This page outlines the features being planned for the 0.91 Java SCA release.</P>
+
+<P>The 0.91 is targeted for early July 2007, this follows on from the <A href="java-sca-090-release-contents.html" title="Java SCA 0.90 Release Contents">0.90 release</A> in June.</P>
+
+<H3><A name="JavaSCA0.91ReleaseContents-Workingon"></A>Working on</H3>
+
+<UL>
+	<LI>Improvements to the dynamic language and scripting support
+	<UL>
+		<LI>remove requirement for .componentType side files</LI>
+		<LI>support for language specific XML representations (eg E4X)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>new &lt;binding.ajax&gt; and allignment with &lt;binding.jsonrpc&gt;</LI>
+</UL>
+
+
+<UL>
+	<LI>new simplified SPI for implementing binding and implementation extensions</LI>
+</UL>
+
+
+<UL>
+	<LI>cotribution import/export <B>(lresende - under investigation)</B></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-099-release-contents.html b/site/trunk/site-publish/java-sca-099-release-contents.html
new file mode 100644
index 0000000000..0a5b7bd30b
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-099-release-contents.html
@@ -0,0 +1,222 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA 0.99 Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64938">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA 0.99 Release Contents">Java SCA 0.99 Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="JavaSCA0.99ReleaseContents-0.99JavaSCAReleaseContents"></A>0.99 Java SCA Release Contents</H3>
+
+<P>This page outlines the features being planned for the 0.99 Java SCA release.</P>
+
+<P>The 0.99 release is targeted for August 2007, this follows on from the <A href="java-sca-091-release-contents.html" title="Java SCA 0.91 Release Contents">0.91 release</A> in July.</P>
+
+<H3><A name="JavaSCA0.99ReleaseContents-Workingon"></A>Working on</H3>
+
+<UL>
+	<LI>Improvements to the Web services support / Axis2 binding (very rough list, more desired than actually working on yet)
+	<UL>
+		<LI>work without pre-existing wsdl doc</LI>
+		<LI>support attachments</LI>
+		<LI>support accessing/setting SOAP headers</LI>
+		<LI>WS-RM and WS-Security</LI>
+		<LI>support WSA EPR in &lt; binding.ws&gt;</LI>
+		<LI>async</LI>
+		<LI>conversational</LI>
+		<LI>Fix open jira's about ?wsdl and endpoint url</LI>
+		<LI>support setting some optional stuff like Axis2 handlers, chunking, soap version etc</LI>
+		<LI>Axis2 rest style / pox over http support</LI>
+		<LI>Sort out our WSDL tooling story - get SDO integrated into Axis2?</LI>
+		<LI>support WSDL 2.0</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Policy Framework Implementation  (Venkat)
+	<UL>
+		<LI>(I'll fill up the specifics soon)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Distributed Domain support (SimonL)
+	<UL>
+		<LI>SCA Binding</LI>
+		<LI>Topology model</LI>
+		<LI>Distributed domain</LI>
+		<LI>Node implementation</LI>
+		<LI>Management assembly (can be used for other management tasks also)</LI>
+		<LI>Also I need some of the ws items, in particular the ability to run without wsdl, so can help out there.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Logging, error handling and events
+	<UL>
+		<LI>To improve the usability of the runtime we need a proper story on logging and error handling. This has been discussed previously on the list but not yet actioned. The management assembly has a role to play here.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>JMS Binding
+	<UL>
+		<LI>I'd like to see the JMS binding in the release but can't commit to doing lots more work on including spec features. It's been working fine for me in my limited synchronous/rpc scenario. If I get time I'll take a look to see what it will take to add minimum asynch support but if anyone else fancies having a go at this then it's a good way to learn about Tuscany extensions.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-10-release-contents.html b/site/trunk/site-publish/java-sca-10-release-contents.html
new file mode 100644
index 0000000000..40522e310b
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-10-release-contents.html
@@ -0,0 +1,169 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA 1.0 Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64939">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA 1.0 Release Contents">Java SCA 1.0 Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Please provide input for the content of this release by updating this page.</P>
+
+<H3><A name="JavaSCA1.0ReleaseContents-1.0JavaSCAReleaseContents"></A>1.0 Java SCA Release Contents</H3>
+
+<P>This page outlines the features being planned for the 1.0 Java SCA release.</P>
+
+<P>The 1.0 release (0.9x?) is targeted for September 2007, this follows on from the 0.99 release in August.</P>
+
+
+<H3><A name="JavaSCA1.0ReleaseContents-Forconsideration"></A>For consideration </H3>
+<P>Raised by Tuscany users: JIRAs 1666, 1667, 1668, 1669</P>
+
+
+<H3><A name="JavaSCA1.0ReleaseContents-Workingon"></A>Working on</H3>
+<P>Policy Framework.. security<BR>
+OSGI</P>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.doc b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.doc
new file mode 100644
index 0000000000..ea6ffe669e
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.doc
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg
new file mode 100644
index 0000000000..0c9f07c9f5
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg.jpeg
new file mode 100644
index 0000000000..0182bbcd46
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/architectureOverview.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg
new file mode 100644
index 0000000000..5a00bda9e6
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg.jpeg
new file mode 100644
index 0000000000..ab6277356c
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/assembly.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg
new file mode 100644
index 0000000000..af8e30deae
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg.jpeg
new file mode 100644
index 0000000000..bdaf3f1277
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg
new file mode 100644
index 0000000000..f222230cf4
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg.jpeg
new file mode 100644
index 0000000000..c5b7fb2288
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/bootstrap_seq.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg
new file mode 100644
index 0000000000..ed8ac08425
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg.jpeg
new file mode 100644
index 0000000000..29195ebba1
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/component.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg
new file mode 100644
index 0000000000..e54dc7904f
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg.jpeg
new file mode 100644
index 0000000000..680b96a1c4
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/contribution_overview.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg
new file mode 100644
index 0000000000..ecbf04798f
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg.jpeg
new file mode 100644
index 0000000000..b7f4e64b84
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/model.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg
new file mode 100644
index 0000000000..e43c97848a
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg.jpeg
new file mode 100644
index 0000000000..99999c7a20
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-model.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg
new file mode 100644
index 0000000000..1a4b48cd35
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg.jpeg
new file mode 100644
index 0000000000..6ecf8ef3cd
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/runtime-wire.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg
new file mode 100644
index 0000000000..fd1f8d4318
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
new file mode 100644
index 0000000000..a4e3e2b1e3
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg
new file mode 100644
index 0000000000..0c47a208b1
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg.jpeg b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg.jpeg
new file mode 100644
index 0000000000..96806ed1e7
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.data/tuscany_layers.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-architecture-guide.html b/site/trunk/site-publish/java-sca-architecture-guide.html
new file mode 100644
index 0000000000..e75b13fa25
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-guide.html
@@ -0,0 +1,367 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA Architecture Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Architecture Guide">Java SCA Architecture Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="java-sca-extension-developer-guide.html" title="Java SCA Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+<UL>
+	<LI><A href="#JavaSCAArchitectureGuide-Overview" title="Overview on Java SCA Architecture Guide">Overview</A>
+	<UL>
+		<LI><A href="#JavaSCAArchitectureGuide-CoreDefinition" title="Core Definition on Java SCA Architecture Guide">Core</A></LI>
+		<LI><A href="#JavaSCAArchitectureGuide-ExtensionDefinition" title="Extension Definition on Java SCA Architecture Guide">Extension</A></LI>
+		<LI><A href="#JavaSCAArchitectureGuide-RuntimeDefinition" title="Runtime Definition on Java SCA Architecture Guide">Runtime</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#JavaSCAArchitectureGuide-InternalsHighLevelView" title="Internals High Level View on Java SCA Architecture Guide">Internals High Level View</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-Bootstrap" title="Bootstrap on Java SCA Architecture Guide">Bootstrap</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-Metadata" title="Metadata on Java SCA Architecture Guide">Metadata</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-Contribution" title="Contribution on Java SCA Architecture Guide">Contribution</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-BindingExtension" title="Binding Extension on Java SCA Architecture Guide">Binding Extension</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-ComponentImplementationExtension" title="Component Implementation Extension on Java SCA Architecture Guide">Component Implementation Extension</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-DataBindingExtension" title="Data Binding Extension on Java SCA Architecture Guide">Data Binding Extension</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-Wiring" title="Wiring on Java SCA Architecture Guide">Wiring</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-LoadingSCAassemblies" title="Loading SCA assemblies on Java SCA Architecture Guide">Loading SCA assemblies</A></LI>
+	<LI><A href="#JavaSCAArchitectureGuide-SpringIntegration" title="Spring Integration on Java SCA Architecture Guide">Spring Integration</A>
+	<UL>
+		<LI><A href="#JavaSCAArchitectureGuide-Springascomponentimplementation" title="Spring as component implementation on Java SCA Architecture Guide">Spring as component implementation</A></LI>
+		<LI><A href="#JavaSCAArchitectureGuide-SpringasIOCcontainer" title="Spring as IOC container on Java SCA Architecture Guide">Spring as IOC container</A></LI>
+	</UL>
+	</LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-Overview"></A> <FONT color="#0099cc">Overview</FONT></H3>
+
+<P>The SCA Java runtime is composed of core and extensions. The core is essentially a multi-VM wiring engine that connects components together using the principles of <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Dependency_injection" title="Visit page outside Confluence" rel="nofollow">Dependency Injection<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, or <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Inversion_of_control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H4><A name="JavaSCAArchitectureGuide-Core"></A><A name="JavaSCAArchitectureGuide-CoreDefinition"></A> Core</H4>
+
+<P>The Core is designed to be simple and limited in its capabilities. It wires functional units together and provides SPIs that extensions can interact with. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions.</P>
+
+<H4><A name="JavaSCAArchitectureGuide-Extension"></A><A name="JavaSCAArchitectureGuide-ExtensionDefinition"></A> Extension</H4>
+
+<P>Extensions enhance SCA runtime functionality. Extension types are not fixed and core is designed to be as flexible as possible by providing an open-ended extension model. However, there are a number of known extension types defined including:</P>
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+	<LI><B>Interface Binding types</B>, e.g. WSDL, Java</LI>
+</UL>
+
+
+<P>Details of how to implement an extension can be can be found in the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Extension%20Developer%20Guide&linkCreation=true&fromPageId=45023" title="Create Page: SCA Java Extension Developer Guide" class="createlink">Extensions Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H4><A name="JavaSCAArchitectureGuide-Runtime"></A><A name="JavaSCAArchitectureGuide-RuntimeDefinition"></A> Runtime</H4>
+
+<P>The core is designed to be embedded in, or provisioned to, a number of different host environments. For example, the core may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or J2EE application server. Runtime capabilities may vary based on the host environment.</P>
+
+<P></P>
+
+<H4><A name="JavaSCAArchitectureGuide-HighleveloverviewofJavaSCAruntime"></A>High level overview of Java SCA runtime</H4>
+
+<P>The diagram shown below is a high level view of the SCA runtime which consists of the following key modules/packages:</P>
+<OL>
+	<LI>SCA Spec API: The APIs defined by the SCA Java Client and Implementation Spec</LI>
+	<LI>API: Tuscany APIs which extend the SCA spec APIs</LI>
+	<LI>Core: The runtime implementation and the SPIs to extend it</LI>
+	<LI>Extensions:
+	<OL>
+		<LI>Container implementation - For extending language support, for example BPEL, Python, C++, Ruby,..</LI>
+		<LI>Binding - for extending protocol support, for example Axis2, CXF,..</LI>
+		<LI>Interface Binding - for service definition, for example WSDL, Java, ...</LI>
+		<LI>Databinding - for extending data support, for example SDO, JAXB, ...</LI>
+	</OL>
+	</LI>
+	<LI>Host Platforms: The environments that host the Tuscany runtime.</LI>
+</OL>
+
+
+<P><IMG src="java-sca-architecture-guide.data/architectureOverview.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-InternalsHighLevelView"></A><FONT color="#0099cc">Internals High Level View</FONT></H3>
+
+<P>[Note: Do we want to link to <A href="java-sca-modulization-design-discussions.html" title="Java SCA Modulization Design Discussions">Kernel-Structure</A>]?</P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-Bootstrap"></A><FONT color="#0099cc">Bootsrap</FONT></H3>
+
+<P>Bootstrap process is controlled by Host environment. The default process is implemented in DefaultBootstrapper.<BR>
+The runtime processes service assemblies serialized using SCA Assembly XML which can take other forms.</P>
+<UL>
+	<LI>The load phase processes SCDL and creates an in-memory model and produces corresponding runtime artifacts (e.g. components, services, references)</LI>
+	<LI>The connect/wire phase wires references to services</LI>
+</UL>
+
+
+<P><IMG src="java-sca-architecture-guide.data/bootstrap.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-Metadata"></A><FONT color="#0099cc">Metadata</FONT></H3>
+
+<P><IMG src="java-sca-architecture-guide.data/assembly.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-Contribution"></A><FONT color="#0099cc">Contribution</FONT></H3>
+
+<P><IMG src="java-sca-architecture-guide.data/contribution_overview.jpg" align="absmiddle" border="0"></P>
+
+<UL>
+	<LI>Package processors scans the contribution being installed and generate a list of artifacts that needs to be processed. Currently there is support for folder/file system and jar contribution packages. In order to be available to the contribution service, a package processors needs to register itself with the package processor extension.</LI>
+</UL>
+
+
+<UL>
+	<LI>Artifact processors are used to process each artifact available on the contribution. In order to be available to the contribution service, a artifact processor needs to register itself with the artifact processor extension. An artifact processor will be called for each artifact in two phases :</LI>
+</UL>
+
+
+<UL>
+	<LI>
+	<UL>
+		<LI>read phase : This is where you read an artifact (a document, an XML element, classes etc.), populate a model representing the artifact and return it. The SCA contribution service calls ArtifactProcessor.read() on all artifacts that have an ArtifactProcessor registered for them. If your model points to other models, instead of trying to load these other models right away, you should just keep the information representing that reference, which you'll turn into a pointer to the referenced model in the resolve() phase. Note that you don't necessarily need to fully read and populate your model at this point, you can choose to complete it later.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>
+	<UL>
+		<LI>resolve phase : This phase gives you the opportunity to resolve references to other models (a WSDL, a class, another composite, a componentType). At this point, all models representing the artifacts in your SCA contribution have been read, registered in the contribution's ArtifactResolver, and are ready to be resolved.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>All deployable composites should be now ready to get deployed to the SCA Domain</LI>
+</UL>
+
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-BindingExtension"></A><FONT color="#0099cc">Binding Extension</FONT></H3>
+
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-ComponentImplementationExtension"></A><FONT color="#0099cc">Component Implementation Extension</FONT></H3>
+
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-DataBindingExtension"></A><FONT color="#0099cc">Data Binding Extension</FONT></H3>
+
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-Wiring"></A><FONT color="#0099cc">Wiring</FONT></H3>
+
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=This%20section%20needs%20to%20be%20updated&linkCreation=true&fromPageId=45023" title="Create Page: This section needs to be updated" class="createlink">This section needs to be updated<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+To understand how wiring works, we need to detail how Components function in the system. Let's start with Atomic Components and then discuss Composite Components.<IMG src="java-sca-architecture-guide.data/runtime-wire.jpg" align="absmiddle" border="0"></P>
+
+<H4><A name="JavaSCAArchitectureGuide-AtomicComponent"></A>Atomic Component</H4>
+
+<P>AtomicComponent is the most basic component form. It corresponds to the spec concept which offers services, has references and properties</P>
+<UL>
+	<LI>Implementation types e.g. Java, XSLT, etc.</LI>
+	<LI>Are wired</LI>
+	<LI>Have properties</LI>
+</UL>
+
+
+<P>Atomic Components have implementation instances. Instances are associated with a scope: e.g. request, conversation, composite. A SCDL entry is used to define a Component.</P>
+
+<P>Atomic components use a ScopeContainer to manage implementation instances:</P>
+<UL>
+	<LI>Composite, HTTP Session, Request, Stateless</LI>
+	<LI>ScopeContainers track implementation instances by scope id and the AtomicComponent instance identity</LI>
+	<LI>Instances are stored in an InstanceWrapper which is specific to the component implementation type (e.g. PojoInstanceWrapper.java)</LI>
+</UL>
+
+
+<H4><A name="JavaSCAArchitectureGuide-ComponentWiring"></A>Component Wiring</H4>
+
+<P>Component references are connected to services through wires</P>
+<UL>
+	<LI>Two sides
+	<UL>
+		<LI>InboundWire - handles the source side of a wire, including policy</LI>
+		<LI>OutboundWire - handles the target side of a wire, including policy</LI>
+	</UL>
+	</LI>
+	<LI>The runtime connects inbound and outbound wires, performing optimizations if possible
+	<UL>
+		<LI>Inbound and outbound wires may be associated with different service contracts</LI>
+		<LI>Different implementation types</LI>
+		<LI>&quot;Standard&quot; wires contain invocation chains that have Interceptors that perform some form of mediation (e.g. policy)</LI>
+		<LI>Other wire types exist that, for example, do not perform mediations</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H4><A name="JavaSCAArchitectureGuide-InvocationChains"></A>Invocation Chains</H4>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> is &quot;around-style&quot; mediation an accepted term. If so what does it mean. Googling it doesn't return anything appropriate.<BR>
+A wire has an InvocationChain per service operation. An InvocationChain may have interceptors - &quot;around-style&quot; mediation. Component implementation instances access a wire through a WireInvocationHandler associated with a reference.</P>
+<UL>
+	<LI>WireInvocationHandlers may (or may not depending on the component type) be fronted by a proxy</LI>
+	<LI>WireInvocationHandlers dispatch an invocation to the correct chain<BR>
+A wire has a TargetInvoker that is created from the target side AtomicComponent or Reference and is stored on the source wire invocation handler. The TargetInvoker is resposnible for dispatching the request to the target instance when the message hits the end of the target invocation chain.</LI>
+</UL>
+
+
+<H4><A name="JavaSCAArchitectureGuide-InvocationOverview"></A>Invocation Overview</H4>
+
+<UL>
+	<LI>An invocation is dispatched to the WireInvocationHandler</LI>
+	<LI>The WireInvocationHandler looks up the correct InvocationChain</LI>
+	<LI>It then creates a message, sets the payload, sets the TargetInvoker, and passes the message down the chain</LI>
+	<LI>When the message reaches the end of the chain, the TargetInvoker is called, which in turn is responsible for dispatching to the target</LI>
+	<LI>Having the TargetInvoker stored on the outbound side allows it to cache the target instance when the wire source has a scope of equal or lesser value than the target (e.g. request--&gt;composite</LI>
+</UL>
+
+
+<P>The runtime provides components with InboundWires and OutboundWires. InvocationChains are held in component wires and are therefore stateless which allows for dynamic behavior such as introduction of new interceptors or re-wiring.</P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-LoadingSCAassemblies"></A><FONT color="#0099cc">Loading SCA assemblies</FONT></H3>
+
+
+<H4><A name="JavaSCAArchitectureGuide-ArtifactProcessor"></A>Artifact Processor</H4>
+
+<P>Artifact processors are responsible for processing each artifact available in a contribution package, these processors are going to be invoked in two phases</P>
+
+<UL>
+	<LI>read phase : This is where you read an artifact (a document, an XML element, classes etc.), populate a model representing the artifact and return it. The SCA contribution service calls ArtifactProcessor.read() on all artifacts that have an ArtifactProcessor registered for them. If your model points to other models, instead of trying to load these other models right away, you should just keep the information representing that reference, which you'll turn into a pointer to the referenced model in the resolve() phase. Note that you don't necessarily need to fully read and populate your model at this point, you can choose to complete it later.</LI>
+</UL>
+
+
+<UL>
+	<LI>resolve phase : This phase gives you the opportunity to resolve references to other models (a WSDL, a class, another composite, a componentType). At this point, all models representing the artifacts in your SCA contribution have been read, registered in the contribution's ArtifactResolver, and are ready to be resolved.</LI>
+</UL>
+
+
+<H3><A name="JavaSCAArchitectureGuide-LoadingJavaSCA"></A>Loading Java SCA</H3>
+
+<P>SCA service assemblies are deployed to the SCA domain in the format of SCDL files. Tuscany runtime artifact processor loads the SCDLs into model objects which are a set of java beans to hold the metadata.</P>
+
+<P>There are two types of loaders:</P>
+<UL>
+	<LI>StAXElementLoader: Load the XML element from the StAX events</LI>
+	<LI>ComponentTypeLoader: Load the Component Type for an implementation either by introspection or paring a side file</LI>
+</UL>
+
+
+<H3><A name="JavaSCAArchitectureGuide-LoadingComponentType"></A>Loading Component Type</H3>
+
+<P>Loads the component type definition for a specific implementation</P>
+<UL>
+	<LI>How it does this is implementation-specific</LI>
+	<LI>May load XML sidefile (location set by implementation)</LI>
+	<LI>May introspect an implementation artifact (e.g. Java annotations)</LI>
+	<LI>... or anything else</LI>
+</UL>
+
+
+<P>Loading Composite ComponentType Loader</P>
+<UL>
+	<LI>Load SCDL from supplied URL</LI>
+	<LI>Extract and load SCDL from composite package</LI>
+</UL>
+
+
+<P>POJO ComponentType Loader</P>
+<UL>
+	<LI>Introspect Java annotations</LI>
+	<LI>Uses a pluggable &quot;annotation processing&quot; framework to introspect Java classes</LI>
+</UL>
+
+
+<H3><A name="JavaSCAArchitectureGuide-Classdiagramfortheruntimeartifacts"></A>Class diagram for the runtime artifacts</H3>
+
+<P><IMG src="java-sca-architecture-guide.data/runtime-model.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAArchitectureGuide-"></A><A name="JavaSCAArchitectureGuide-SpringIntegration"></A><FONT color="#0099cc">Spring Integration</FONT></H3>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf b/site/trunk/site-publish/java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf
new file mode 100644
index 0000000000..aa2f5ffe41
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-overview.data/TuscanyJAVASCAM2.pdf
diff --git a/site/trunk/site-publish/java-sca-architecture-overview.html b/site/trunk/site-publish/java-sca-architecture-overview.html
new file mode 100644
index 0000000000..a55273589a
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture-overview.html
@@ -0,0 +1,201 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Architecture Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Architecture Overview">Java SCA Architecture Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Architecture Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 27, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47661&originalId=52760">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Architecture</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+At the moment we are pulling different pieces of information in one place and then we'll decide on how to organize the information.</P>
+<UL>
+	<LI><A href="#JavaSCAArchitectureOverview-ArchitectureOverview" title="Architecture Overview on Java SCA Architecture Overview">Architecture Overview</A></LI>
+	<LI><A href="#JavaSCAArchitectureOverview-KernelDefinition" title="Kernel Definition on Java SCA Architecture Overview">Core</A>
+	<UL>
+		<LI><SPAN class="nobr"><A href="java-sca-kernel-architecture-guide.html" title="Visit page outside Confluence" rel="nofollow">Kernel Architecture<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+		<LI><SPAN class="nobr"><A href="sandbox-sca-java.data/TuscanyJAVASCA.pdf" title="Visit page outside Confluence" rel="nofollow">How it looked in M2 release?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	</UL>
+	</LI>
+	<LI><A href="#JavaSCAArchitectureOverview-ExtensionDefinition" title="Extension Definition on Java SCA Architecture Overview">Extension</A></LI>
+	<LI><A href="#JavaSCAArchitectureOverview-RuntimeDefinition" title="Runtime Definition on Java SCA Architecture Overview">Runtime</A></LI>
+	<LI><A href="#JavaSCAArchitectureOverview-Mediator" title="Mediator on Java SCA Architecture Overview">Data Binding </A></LI>
+</UL>
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="JavaSCAArchitectureOverview-"></A><A name="JavaSCAArchitectureOverview-ArchitectureOverview"></A><FONT color="#0099cc">Architecture Overview</FONT></H3>
+<P>The SCA Java runtime is composed of a <EM>kernel</EM> and extensions. The kernel is essentially a multi-VM wiring engine that connects components together using the principles of <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Dependency_injection" title="Visit page outside Confluence" rel="nofollow">Dependency Injection<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, or <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Inversion_of_control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H3><A name="JavaSCAArchitectureOverview-"></A><A name="JavaSCAArchitectureOverview-KernelDefinition"></A><FONT color="#0099cc">Kernel</FONT></H3>
+<P>The kernel is designed to be simple and limited in its capabilities: it wires functional units together. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions. The kernel extension model is based on the SCA 1.0 Java programming and assembly model. In otherwords, the kernel uses SCA to bootstrap itself. The mechanics of how this is done are described in detail in <SPAN class="nobr"><A href="java-sca-kernel-architecture-guide.html" title="Visit page outside Confluence" rel="nofollow">Kernel Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. </P>
+
+<P>The kernel is divided into a number of modules: <EM>api</EM>, <EM>host_api</EM>, <EM>spi</EM> and <EM>core</EM>. The <EM>api</EM> module defines Tuscany proprietary programming model annotations and APIs. The <EM>host_api</EM> module defines APIs for interacting with the kernel. The <EM>spi</EM> module defines extension points and abstract helper classes. The <EM>core</EM> module contains the kernel implementation. </P>
+
+<H3><A name="JavaSCAArchitectureOverview-"></A><A name="JavaSCAArchitectureOverview-ExtensionDefinition"></A><FONT color="#0099cc">Extension</FONT></H3>
+<P>Extensions enhance the kernel with specific sets of functionality. Extension types are not fixed and the kernel is designed to be as flexible as possible by providing an open-ended extension model. From the kernel perspective, extensions are just a set of SCA components. However, there are a number of known extension types defined by the <EM>spi</EM> module, including:</P>
+
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+</UL>
+
+
+<P>There are also a number of add-on extensions that do not correspond to a well-know type:</P>
+
+<UL>
+	<LI>The JPA extension for O/R mapping</LI>
+	<LI>The Geronimo Transaction Manager extension for transactional support in the runtime</LI>
+	<LI>The HOWL-based Persistent Store extension for high-throughput persistence of conversational state</LI>
+</UL>
+
+
+<P>More detail can be found in the <A href="java-sca-extension-guide.html" title="Java SCA Extension Guide">Extensions Guide</A>.</P>
+
+<H3><A name="JavaSCAArchitectureOverview-"></A><A name="JavaSCAArchitectureOverview-RuntimeDefinition"></A><FONT color="#0099cc">Runtime</FONT></H3>
+<P>The kernel is designed to be embedded in, or provisioned to, a number of different host environments. For example, the kernel may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or JEE application server. There is even a Maven runtime that embeds kernel for integration testing. Runtime capabilities may vary based on the host environment.     </P>
+
+
+<H3><A name="JavaSCAArchitectureOverview-"></A><A name="JavaSCAArchitectureOverview-mediator"></A><FONT color="#0099cc">Data Binding </FONT></H3>
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Not sure if this belongs to this page or not</P>
+
+<P>Data  provides transparent data mapping between different types of data that can be exchanged between caller of a service and the service itself given the format of the data that will be supplied by the client. Data Mediator will do this transformation given the following information:</P>
+<OL>
+	<LI>format of the data that can be consumed by the service</LI>
+	<LI>format of the data that will be sent by the client</LI>
+</OL>
+
+
+<P>You can find more detailed information about databinding at this <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/display/~rfeng/Tuscany%20Databinding" title="Visit page outside Confluence" rel="nofollow">link<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P></P>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="sca-java-architecture.html" title="SCA Java Architecture">SCA Java Architecture</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="java-sca-runtime-component-hierarchy.html" title="Java SCA Runtime Component Hierarchy">Java SCA Runtime Component Hierarchy</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-architecture.html b/site/trunk/site-publish/java-sca-architecture.html
new file mode 100644
index 0000000000..b737ed7349
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-architecture.html
@@ -0,0 +1,196 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Architecture</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Architecture">Java SCA Architecture</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Architecture</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A> on Mar 03, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47661&originalId=47688">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="JavaSCAArchitecture-Overview"></A>Overview</H3>
+
+<P>The SCA Java runtime is composed of a <EM>kernel</EM> and extensions. The kernel is essentially a multi-VM wiring engine that connects components together using the principles of <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Dependency_injection" title="Visit page outside Confluence" rel="nofollow">Dependency Injection<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, or <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Inversion_of_control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H3><A name="JavaSCAArchitecture-Kernel"></A>Kernel</H3>
+
+<P>The kernel is designed to be simple and limited in its capabilities: it wires functional units together. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions. The kernel extension model is based on the SCA 1.0 Java programming and assembly model. In otherwords, the kernel uses SCA to bootstrap itself. The mechanics of how this is done are described in detail elsewhere <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Kernel%20Architecture&linkCreation=true&fromPageId=47661" title="Create Page: Kernel Architecture" class="createlink">Kernel Architecture<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. </P>
+
+<P>The kernel is divided into a number of modules: <EM>api</EM>, <EM>host_api</EM>, <EM>spi</EM> and <EM>core</EM>. The <EM>api</EM> module defines Tuscany proprietary programming model annotations and APIs. The <EM>host_api</EM> module defines APIs for interacting with the kernel. The <EM>spi</EM> module defines extension points and abstract helper classes. The <EM>core</EM> module contains the kernel implementation. </P>
+
+<H3><A name="JavaSCAArchitecture-Extensions"></A>Extensions</H3>
+
+<P>Extensions enhance the kernel with specific sets of functionality. Extension types are not fixed and the kernel is designed to be as flexible as possible by providing an open-ended extension model. From the kernel perspective, extensions are just a set of SCA components. However, there are a number of known extension types defined by the <EM>spi</EM> module, including:</P>
+
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+</UL>
+
+
+<P>There are also a number of add-on extensions that do not correspond to a well-know type:</P>
+
+<UL>
+	<LI>The JPA extension for O/R mapping</LI>
+	<LI>The Geronimo Transaction Manager extension for transactional support in the runtime</LI>
+	<LI>The HOWL-based Persistent Store extension for high-throughput persistence of conversational state</LI>
+</UL>
+
+
+<P>More detail can be found in the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Extensions%20Guide&linkCreation=true&fromPageId=47661" title="Create Page: Extensions Guide" class="createlink">Extensions Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> section, but a few high-level best practices for designing extensions are listed here:</P>
+
+<UL>
+	<LI>Make sure you are familiar with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.osoa.org&linkCreation=true&fromPageId=47661" title="Create Page: www.osoa.org" class="createlink">www.osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+</UL>
+
+
+<UL>
+	<LI>Never reference any classes in <EM>core</EM>. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use autowire when assembling extension components.</LI>
+</UL>
+
+
+<UL>
+	<LI>Do not mess with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<UL>
+	<LI>Preferrably use <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.easymock.org&linkCreation=true&fromPageId=47661" title="Create Page: www.easymock.org" class="createlink">EasyMock<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for mocking kernel functionality during extension unit testing.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20iTest%20Plugin%20Maven%2BPlugins&linkCreation=true&fromPageId=47661" title="Create Page: Tuscany iTest Plugin Maven+Plugins" class="createlink">Tuscany iTest Plugin Maven&#43;Plugins<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing the extension.</LI>
+</UL>
+
+
+<UL>
+	<LI>Preferrably use <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.easymock.org&linkCreation=true&fromPageId=47661" title="Create Page: www.easymock.org" class="createlink">EasyMock<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for mocking kernel functionality during extension unit testing.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20iTest%20Plugin%20Maven%2BPlugins&linkCreation=true&fromPageId=47661" title="Create Page: Tuscany iTest Plugin Maven+Plugins" class="createlink">Tuscany iTest Plugin Maven&#43;Plugins<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing the extension.</LI>
+</UL>
+
+
+<H3><A name="JavaSCAArchitecture-Runtimes"></A>Runtimes</H3>
+
+<P>The kernel is designed to be embedded in, or provisioned to, a number of different host environments. For example, the kernel may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or JEE application server. There is even a Maven runtime that embeds kernel for integration testing. Runtime capabilities may vary based on the host environment.     </P>
+
+
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-developer-guide.html b/site/trunk/site-publish/java-sca-developer-guide.html
new file mode 100644
index 0000000000..449aad8e83
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-developer-guide.html
@@ -0,0 +1,281 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Developer Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51313">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Developer Guide">Java SCA Developer Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA. Some of our principles include: </P>
+
+<UL>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>We build runtimes that are distributed under the Apache Software License.</LI>
+	<LI>We believe developing highly scalable service-based systems should be easier than it currently is.</LI>
+	<LI>We believe in providing users with flexibility and choice. We do not dictate programming models but support many. Our runtimes are designed to be highly extensible so users may customize them to fit their needs.</LI>
+	<LI>We provide frequent releases of our software so users can experience the newest features and have access to the latest bug fixes.</LI>
+</UL>
+
+
+<P>For those looking at or developing the Tuscany Java SCA source code this page provides some description of the code structure and associated conventions that are used.</P>
+
+<H3><A name="JavaSCADeveloperGuide-GettingtheSourceSubversionAccess"></A>Getting the Source - Subversion Access</H3>
+
+<P>The Java SCA project Subversion repository is located at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/sca</A>.</P>
+
+<P>The respository can also be viewed online at <A href="http://svn.apache.org/viewvc/incubator/tuscany/java/" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/incubator/tuscany/java/</A></P>
+
+<P>Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so. </P>
+
+<P><B>Checking out from Subversion</B></P>
+
+<P>Use a command like:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/sca</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P><B>Committing Changes to Subversion</B><BR>
+Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.</P>
+
+<P>Once your password is set, you can use a command like this to commit:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn commit
+</PRE>
+</DIV></DIV>
+
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn --username &lt;name&gt; commit
+</PRE>
+</DIV></DIV>
+
+<P>Subversion will prompt you for a password, and once you enter it once, it will remember it for you. Note this is the password you configured with svnpasswd, not your shell or other password.</P>
+
+<H3><A name="JavaSCADeveloperGuide-GettingSetupforDevelopment"></A>Getting Setup for Development</H3>
+
+<P><B>Prerequisites</B><BR>
+Java SCA requires the following:</P>
+
+<UL>
+	<LI><A href="http://java.sun.com/j2se/1.5.0" class="external-link" rel="nofollow">JDK 5.0+ (J2SE 1.5.0+)</A></LI>
+	<LI><A href="http://maven.apache.org/" class="external-link" rel="nofollow">Apache Maven (2.0.4+)</A></LI>
+	<LI><A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">Subversion (1.2+)</A></LI>
+</UL>
+
+
+<H3><A name="JavaSCADeveloperGuide-SomeDefinitions"></A>Some Definitions</H3>
+
+<P>Module - we use the term module to refer to a leaf of the maven build tree. I.e a directory containing source code and resources that will be compiled to a releasable artifact, e.g. a jar file. </P>
+
+<P>...</P>
+
+<H3><A name="JavaSCADeveloperGuide-SourceandBuildStructure"></A>Source and Build Structure</H3>
+<P>Looking at the source code for <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/sca/" class="external-link" rel="nofollow">Java SCA</A> you will see the following directory structure. </P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>java/
+ pom/parent/pom.xml
+ ...
+ sca/
+   pom.xml - The maven pom that builds all of the releasable Tuscany Java SCA modules
+
+   contrib/ - A temporary direcoty that holds modules not currently being developed or targetted for a release
+     ...
+
+   doc/ - Tuscany Java SCA documentation that will be included with the release
+     ...
+
+   itest/ - Integration tests that test system performace using combinations of Tuscany Java features
+     pom.xml
+     ...
+
+   modules/ - A flat direcory structure holding all of the separate modules that make up Tuscany Java SCA. 
+     pom.xml
+     ...
+
+   samples/ - Tuscany Java SCA samples which show how to use the various features of the software
+     build.xml &lt;-- Samples build with Ant as well as Maven - TBD
+     pom.xml
+     ...
+</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCADeveloperGuide-NamingConventions"></A>Naming Conventions</H4>
+<UL class="alternate" type="square">
+	<LI>Use all lowercases and dashes in folder names (like in the jar names)</LI>
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+	<LI>Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, the module</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java/sca/module/implementation-java
+</PRE>
+</DIV></DIV>
+
+<P>contains code in the package structure</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.implementation.java.*
+</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCADeveloperGuide-ModuleLocation"></A>Module Location</H4>
+<P>If people want to work on some new modules that won't be part of the<BR>
+next release and are not included in the top-down build, that's fine, we can<BR>
+just avoid listing these modules in java/sca/modules/pom.xml. So, they<BR>
+can be there in the same source tree but they won't break the release<BR>
+top-down build, and they won't have to be building at all times.</P>
+
+<H4><A name="JavaSCADeveloperGuide-MavenBuildStructure"></A>Maven Build Structure</H4>
+<UL class="alternate" type="square">
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group ids:<BR>
+  org.apache.tuscany.sca <BR>
+  org.apache.tuscany.sca.samples,<BR>
+  org.apache.tuscany.sca.itest</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn -Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H3><A name="JavaSCADeveloperGuide-BuildingFromTheSource"></A>Building From The Source </H3>
+<P>First of all check out all of the java source code.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Building the SCA source code is simple</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd java/sca
+mvn
+</PRE>
+</DIV></DIV>
+
+<P>It should work even if you start with an empty Maven local repository, and it should always work. This assumes that maven is able to retrieve a SNAPSHOT version of SDO (and of course the rest of software that SCA depends on) as we haven't built anything other than SCA here. There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.  </P>
+
+<H3><A name="JavaSCADeveloperGuide-CodingstyleandTesting"></A>Coding style and Testing</H3>
+
+<P>Tuscany has some basic coding standards - use spaces not tabs, keep a reasonable line length, and include enough comments in the code. Tests are good, both unit and functional testing is encouraged. When modifying existing code try to use the style already in place or if necessary reformat the whole file so the style is consistent. </P>
+
+<P>The ASF has some requirements on the license header that should be included in most files, for details see <A href="http://www.apache.org/legal/src-headers.html" class="external-link" rel="nofollow">http://www.apache.org/legal/src-headers.html</A>.</P>
+
+<P>In the Tuscany SVN there is a folder tuscany/java/etc which contains various templates that can be used to configure your development environment, for example, codestyle template files which can be imported into the Eclipse or IDEA IDE's. Some Tuscany modules are set up to use the Maven Checkstyle facility which may be run using the Maven -Psourcecheck option.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-distributed.html b/site/trunk/site-publish/java-sca-distributed.html
new file mode 100644
index 0000000000..850b909dfa
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-distributed.html
@@ -0,0 +1,210 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Distributed</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=107027">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Distributed">Java SCA Distributed</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=note&linkCreation=true&fromPageId=107027" class="createlink">note</A> moved all node related content from the old user doc to here. This page can explain node in the context of distributed calculator.</P>
+
+
+<H3><A name="JavaSCADistributed-TuscanySCANode"></A>Tuscany SCA Node</H3>
+<P>In order to run an SCA application Tuscany SCA Java provides a runtime that is wrapped up in a Node. The runtime itself is made up of many of the modules that are present in the modules directory of the Tuscany SCA Java distribution. As you might expect there are functions that read XML, create an in memory mode model of the SCA assembly, create the components and wire them together ready to process incoming messages. All of these functions are wrapped up in a Node. A node is configured using SCA contributions and will run a single composite. When running standalone the node also defines the scope of component services that references can target by name. SCA defines the term Domain to describe this scope. <SPAN class="error">Unable to render embedded object: File (calculator2.png) not found.</SPAN><BR>
+A node runs within a single JVM. A JVM can run many Nodes.</P>
+
+<H3><A name="JavaSCADistributed-hostembedded"></A>host embedded</H3>
+<P>For a long time in Tuscany we have had a modules called <A href="sca-java-hostembedded.html" title="SCA JAVA host.embedded">host.embedded</A> that contains the code required to get the runtime up and running in standalone configuration. This was developed before the distributed domain support was added but the main interface here is called an SCADomain. It's just a very small domain with only one node inside it. You can't see the node and you configure and access it via the SCADomain interface. The majority of samples and tests use this today. However the new SCA Node implementation can work in both standalone and distributed configuration so may be more appropriate in situations other than the simple Tuscany samples and tests. We will convert more samples ant tests to this approach over time to show the benefit of using the node implementation.</P>
+
+<H3><A name="JavaSCADistributed-TuscanySCANodeImplementation"></A>Tuscany SCA Node Implementation</H3>
+<P>Available from release 1.2 there is a new domain/node implementation. The node part of this can be run either stand alone or as part of a distributed domain. Most of the sample and test code has not started using this implementation yet and there may be more changes to the API.</P>
+
+<H4><A name="JavaSCADistributed-CreatingandConfiguringNode"></A>Creating and Configuring Node</H4>
+
+<P>Creating a node in code is straightforward. For example,</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromClassLoader(<SPAN class="code-quote">&quot;calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">null</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>The node uses current classes classloader to located the named composite file. The location of the composite file is assumed to be the location if the SCA contribution. The assumption here is that only one contribution is required. </P>
+
+<P>If more contributions must be loaded by the node the following interface can be used.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2  node = SCANode2Factory.newInstance().createSCANode(<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>,
+        		                               <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>),
+                                                       <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution2&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution2&quot;</SPAN>));
+</PRE>
+</DIV></DIV>
+<P>Where</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Is the explicit location of the composite file to be run and</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+        		        <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Shows how to provide contribution details. Multiple contributions can be specified. You might have multiple contributions if, for example,  you have chosen to separate common artifacts from those specific to this composite. The contribution containing common artifacts can then be used in other SCA applications without change.</P>
+
+<H4><A name="JavaSCADistributed-StartingaNode"></A>Starting a Node</H4>
+
+<P>Once the node is created it is configured and ready for use. It can be started as follows.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.start();
+</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCADistributed-LocatingServices"></A>Locating Services</H4>
+
+<P>A local service reference can be retrieved in the following way.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+calculatorService = ((SCAClient)node).getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCADistributed-StoppingaNode"></A>Stopping a Node</H4>
+
+<P>If you are done with the node or need to stop is processing messages use the following.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.stop();
+</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCADistributed-"></A><A name="JavaSCADistributed-HostingTuscanySCANodes"></A></H4>
+
+<DIV class="" style="background-color: #C3CDA1;">Hosting Tuscany SCA Nodes</DIV>
+
+<P>You can run SCA applications in many different ways but the same underlying runtime is used but packaged in slightly different ways as follows</P>
+
+<H4><A name="JavaSCADistributed-CommandLine"></A>Command Line</H4>
+
+<P>Most of the samples that are shipped with the Tuscany SCA Java distribution run from the command line by driving the Node API or old SCADomain API programmatically.</P>
+
+<P>There is a pre-packaed launcher that has a mainline for starting nodes. When run from the command line it expects to be running in the context of the binary distribution where &quot;modules&quot; and &quot;lib&quot; directories are present.</P>
+
+<P>It loads all of the jars from</P>
+
+<P>1) the directory where the launcher class is found.<BR>
+2) the ../modules directory<BR>
+3) the ../libs directory</P>
+
+<P>It then repeats the process looking for ../modules and ../lib dirs based on the contents of  a TUSCANY_HOME environment variable</P>
+
+<P>With the final list it creates a URLClassLoader with the current classloader as the parent and enforces a parent first classloading strategy.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO - how does it find the composite file to run?</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-documentation-menu.html b/site/trunk/site-publish/java-sca-documentation-menu.html
new file mode 100644
index 0000000000..2b7305c6b6
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-documentation-menu.html
@@ -0,0 +1,205 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47710">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+<H2><A name="JavaSCADocumentationMenu-SCAJavaDocumentationfor1.x"></A>SCA Java Documentation for 1.x</H2>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Getting Started with Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides help you to get setup in Tuscany, develop and run a simple application using comand line or Eclipse.</P>
+
+<UL>
+	<LI><A href="getting-started-with-tuscany-using-the-command-line.html" title="Getting Started with Tuscany ( using the Command Line)">Get Started with Tuscany using Command Line</A><BR>
+This is a quick getting started guide that shows you how to download the latest release, run the calculator sample and then how to use the calculator sample project as a basis for you own projects</LI>
+	<LI><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Get Started with Tuscany using Eclipse</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany SCA distribution manually installed into Eclipse</LI>
+	<LI><A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Get Started with Tuscany using Tuscany Eclipse plugins</A><BR>
+This quick guide goes trough the steps of building the store scenario using Tuscany Eclipse plugins.</LI>
+	<LI><A href="build-your-first-web-services-with-tuscany.html" title="Build your first Web Services with Tuscany">Building your first web services using Tuscany</A><BR>
+This is a quick guide that go trough the steps of exposing your pojo component as web services.</LI>
+	<LI><A href="import-existing-tuscany-sca-projects-into-eclipse.html" title="Import existing Tuscany SCA projects into Eclipse">Importing existing Tuscany SCA projects into Eclipse</A><BR>
+This is a quick guide to show you how to import Tuscany samples and tests into the Eclipse environment.</LI>
+</UL>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Introduction</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>provides a quick introduction to SCA and links to the SCA specifications <BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Quick%2BGuide%2Bto%2BSCA&linkCreation=true&fromPageId=47710" class="createlink">Introduction to SCA</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA User Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides provide the following information:</P>
+<UL>
+	<LI>How to develop and run applications using Tuscany in a single node or multi node environment<BR>
+<A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A></LI>
+	<LI>What are the available Tuscany extensions and how to use them? This includes bindings, impelementation types, interface types, policies, databindings.<BR>
+<A href="sca-java-user-reference.html" title="SCA Java User Reference">Extension Guide</A></LI>
+	<LI>Available development and management tools for Tuscany<BR>
+<A href="sca-java-tools-guides.html" title="SCA Java Tools Guides">SCA Java Tools Guides</A></LI>
+</UL>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA Extension Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>Although Tuscany provides many <A href="sca-java-user-reference.html" title="SCA Java User Reference">extensions</A>, you might be interested to add an extension that is not available today. This guide helps you understand how to develop extensions such <BR>
+as new bindings, implementation types, interfaces, policies, etc.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> You are welcome to contribute these new extensions to Tuscany and make them available to others in the community.</P>
+
+<UL>
+	<LI><A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Adding a new extension</A></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Databinding%20Guide&linkCreation=true&fromPageId=47710" class="createlink">Adding a new data binding</A></LI>
+</UL>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany SCA Java Development Guides</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>These guides help you learn more about Tuscany architecture and how to get involved in the <BR>
+development of Tuscnay. We look forward to your help.</P>
+<UL>
+	<LI><A href="sca-java-development-guide.html" title="SCA Java Development Guide">Development Guide</A><BR>
+If you would like to contribute to the project, this guide explains how to build Java SCA and how to contribute code back to the project.</LI>
+	<LI><A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+This guide provides a high level view of SCA Java architecture.</LI>
+	<LI><A href="security-aware-programming-in-tuscany.html" title="Security Aware Programming in Tuscany">Security aware programming guide</A>  This guide shows the Tuscany developer how to write core and extension code that correctly employs the Java security features<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Also available in <A href="http://vcasmo.com/video/beckerdo/2750" class="external-link" rel="nofollow"><B>Video</B></A>, use tuscany passcode</LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Build%20Your%20Own%20Tuscany%20Distribution" class="external-link" rel="nofollow">Build Your Own Distribution </A></LI>
+	<LI><A href="http://tuscany.apache.org/doc/javadoc/java-sca-1.4/" class="external-link" rel="nofollow">JavaDocs API Documentation (Tuscany 1.4) </A> See classes and methods you can use in your Tuscany applications.</LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-documentation-toc.html b/site/trunk/site-publish/java-sca-documentation-toc.html
new file mode 100644
index 0000000000..bea83c896c
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-documentation-toc.html
@@ -0,0 +1,157 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Documentation TOC</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105089">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Documentation TOC">Java SCA Documentation TOC</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page provides you with links to resources about SCA and Tuscany.</P>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java User Documentations</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="http://tuscany.apache.org/quick-guide-to-sca.html" class="external-link" rel="nofollow">Introduction to SCA</A></LI>
+	<LI>Run a sample</LI>
+	<LI>Develop applications</LI>
+</UL>
+</DIV></DIV></TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.devx.com/IBMSCA/Article/39358" class="external-link" rel="nofollow"><B>Your First SCA application</B> </A><BR>
+<A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" class="external-link" rel="nofollow">Introduction to SCA by David Chappel</A><BR>
+<A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part1.pdf" class="external-link" rel="nofollow">Open CSA SCA Tutorial</A><BR>
+<A href="http://www.infoq.com/articles/setting-out-for-sca" class="external-link" rel="nofollow">Henning Blohm - Setting Out for SCA</A><BR>
+<A href="http://jdj.sys-con.com/read/325183.htm" class="external-link" rel="nofollow">What is SCA</A><BR>
+<A href="http://soa.sys-con.com/read/458183.htm" class="external-link" rel="nofollow">Building SOA with Apache Tuscany</A><BR>
+<A href="http://osoa.org/download/attachments/250/Power_Combination_SCA_Spring_OSGi.pdf?version=3%2F" class="external-link" rel="nofollow">SCA and OSGI and Spring</A><BR>
+<A href="http://events.oasis-open.org/home/sites/events.oasis-open.org.home/files/SCA-ESB-v4.ppt" class="external-link" rel="nofollow">SCA and ESBs</A><BR>
+<A href="http://osoa.org/display/Main/Relationship%20between%20SCA%20and%20BPEL" class="external-link" rel="nofollow">SCA &amp; BPEL </A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Videos" class="external-link" rel="nofollow"><FONT color="green"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> SCA Video Series </FONT></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu"><B>Your first SCA application with Tuscany</B></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">User Documentations </A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Developer Documentations </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java" class="external-link" rel="nofollow">Latest Source Code</A><BR>
+<A href="http://tuscany.apache.org/tuscany-downloads-documentations.html" class="external-link" rel="nofollow">Latest Release</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning to work with Open Source</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Working%20In%20Open%20Source" class="external-link" rel="nofollow">How to Work In Open Source Series </A><BR>
+<A href="http://www.catb.org/~esr/faqs/smart-questions.html" class="external-link" rel="nofollow">How to ask questions </A><BR>
+<A href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html" class="external-link" rel="nofollow">How to report bugs effectively </A></P>
+</DIV></DIV></TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>PlanetApache.org blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV> </TD>
+</TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-download-page.html b/site/trunk/site-publish/java-sca-download-page.html
new file mode 100644
index 0000000000..5d4de2523e
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-download-page.html
@@ -0,0 +1,142 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA Download Page : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55648">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Download Page">Java SCA Download Page</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <UL>
+	<LI>work in progress template for Java SCA download page*</LI>
+</UL>
+
+
+<H1><A name="JavaSCADownloadPage-LatestSCAJavaReleaseReleaseName"></A>Latest SCA Java Release - Release Name</H1>
+<P>This release supports specification level such and such. </P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Platform</TH>
+<TH class="confluenceTh"> Download Link</TH>
+<TH class="confluenceTh">MD5</TH>
+<TH class="confluenceTh">PGP</TH>
+</TR>
+<TR>
+<TD class="confluenceTd">Linux</TD>
+<TD class="confluenceTd">download link</TD>
+<TD class="confluenceTd">signature</TD>
+<TD class="confluenceTd">link</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Windows</TD>
+<TD class="confluenceTd">download link</TD>
+<TD class="confluenceTd">signature</TD>
+<TD class="confluenceTd">link</TD>
+</TR>
+</TBODY></TABLE>
+
+<H4><A name="JavaSCADownloadPage-What%27sinthisrelease"></A>What's in this release</H4>
+<P>Put the change history for the latest release here.</P>
+
+
+<H1><A name="JavaSCADownloadPage-PreviousReleases"></A>Previous Releases</H1>
+<P><B>release Name, availability date, spec level, Link to readme</B></P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Platform</TH>
+<TH class="confluenceTh">Download Link</TH>
+<TH class="confluenceTh">MD5</TH>
+<TH class="confluenceTh">PGP</TH>
+</TR>
+<TR>
+<TD class="confluenceTd">Linux</TD>
+<TD class="confluenceTd"> download link</TD>
+<TD class="confluenceTd">signature</TD>
+<TD class="confluenceTd">link</TD>
+</TR>
+</TBODY></TABLE>
+
+<P><B>release Name, availability date, spec level, Link to readme</B></P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Platform</TH>
+<TH class="confluenceTh">Download Link</TH>
+<TH class="confluenceTh">MD5</TH>
+<TH class="confluenceTh">PGP</TH>
+</TR>
+<TR>
+<TD class="confluenceTd">Linux</TD>
+<TD class="confluenceTd"> download link</TD>
+<TD class="confluenceTd">signature</TD>
+<TD class="confluenceTd">link</TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-extension-developer-guide.data/ExtendingTuscany.ppt b/site/trunk/site-publish/java-sca-extension-developer-guide.data/ExtendingTuscany.ppt
new file mode 100644
index 0000000000..e04b2e5b43
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-extension-developer-guide.data/ExtendingTuscany.ppt
diff --git a/site/trunk/site-publish/java-sca-extension-developer-guide.html b/site/trunk/site-publish/java-sca-extension-developer-guide.html
new file mode 100644
index 0000000000..8b971c6aed
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-extension-developer-guide.html
@@ -0,0 +1,241 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA Extension Developer Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51879">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Extension Developer Guide">Java SCA Extension Developer Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Extension Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+
+</DIV></DIV>
+
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+This is a guide for developers who would like to extend Tuscany SCA Java.</P>
+<UL>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-extension" title="extension on Java SCA Extension Developer Guide">What is an extension?</A></LI>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-component" title="component on Java SCA Extension Developer Guide">How to add a new component implementation? </A></LI>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-binding" title="binding on Java SCA Extension Developer Guide">How to add a new binding? </A></LI>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-interface" title="interface on Java SCA Extension Developer Guide">How to add a new interface binding? </A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-databinding" title="databinding on Java SCA Extension Developer Guide">How to add a databinding </A></LI>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-generalguide" title="general guide on Java SCA Extension Developer Guide">General guide for developing extensions</A></LI>
+	<LI><A href="#JavaSCAExtensionDeveloperGuide-details" title="details on Java SCA Extension Developer Guide">Details on extension architecture</A> <B>can move to architecture doc</B></LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Modules&linkCreation=true&fromPageId=51879" title="Create Page: Java SCA Extension Modules" class="createlink">Extension Modules<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Modules&linkCreation=true&fromPageId=51879" title="Create Page: Java SCA Extension Modules" class="createlink">Extension Modules<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+<BR clear="all">
+&nbsp;<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>&nbsp;</LI>
+</UL>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-extension"></A><FONT color="#0099cc">A presentation on how to extend Tuscany in Microsoft PowerPoint format</FONT></H3>
+<P><SPAN class="nobr"><A href="java-sca-extension-developer-guide.data/ExtendingTuscany.ppt" title="ExtendingTuscany.ppt attached to Java SCA Extension Developer Guide">ExtendingTuscany <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-extension"></A><FONT color="#0099cc">What is an extension?</FONT></H3>
+
+<P>Extension is a module (or a set of modules),when built with Tuscany SCA, can extend it to work with additional bindings, language implementations, programming models or databindings.</P>
+
+<P>SCA assembly model is defined such that extensions can be added for new interface types or for new implementation types such as ruby and python, or new binding types such as CXF. However, the definition of extension SPIs is left to the implementor. Tuscany SCA Java provides a simple set of SPIs for implementing extensions. It also defines additional extension points such as data binding, for example support for SDO and JAXB.</P>
+
+<P>This guide explains the steps to add each of these extension types. Please help us refine the guide as you go through the steps of adding extensions.</P>
+
+<H4><A name="JavaSCAExtensionDeveloperGuide-Namespacesusedbyextensions"></A>Name spaces used by extensions</H4>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-component"></A><FONT color="#0099cc">How to add a new component implementation?</FONT></H3>
+
+<P><A href="mike-edwards-ramble-through-adding-a-new-component-type.html" title="Mike Edwards Ramble through Adding a New Component Type">Musings on Adding a New Component Type by Mike E</A>&nbsp;</P>
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-binding"></A><FONT color="#0099cc">How to add a new binding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-interface"></A><FONT color="#0099cc">How to add a new interface binding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-databinding"></A><FONT color="#0099cc">How to add a new databinding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-generalguide"></A><FONT color="#0099cc">General guide for developing extensions</FONT></H3>
+
+<UL>
+	<LI>Familiarize yourself with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at www.osoa.org.</LI>
+	<LI>Never reference any classes in core. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+	<LI>Use autowire when assembling extension components.</LI>
+	<LI>Do not play with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<H3><A name="JavaSCAExtensionDeveloperGuide-"></A><A name="JavaSCAExtensionDeveloperGuide-details"></A><FONT color="#0099cc">Detail on extension architecture</FONT></H3>
+
+
+<H4><A name="JavaSCAExtensionDeveloperGuide-TheExtensionPointRegistry"></A>The ExtensionPointRegistry</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.sca.core;
+
+
+/**
+ * The registry <SPAN class="code-keyword">for</SPAN> the Tuscany core extension points. As the point of contact
+ * <SPAN class="code-keyword">for</SPAN> all extension artifacts <SPAN class="code-keyword">this</SPAN> registry allows loaded extensions to find
+ * all other parts of the system and register themselves appropriately.
+ *
+ * @version $Rev: 539355 $ $Date: 2007-05-18 03:05:14 -0700 (Fri, 18 May 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ExtensionPointRegistry {
+
+    /**
+     * Add an extension point to the registry
+     * @param extensionPoint The instance of the extension point
+     */
+    void addExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+
+    /**
+     * Get the extension point by the <SPAN class="code-keyword">interface</SPAN>
+     * @param extensionPointType The lookup key (extension point <SPAN class="code-keyword">interface</SPAN>)
+     * @<SPAN class="code-keyword">return</SPAN> The instance of the extension point
+     */
+    &lt;T&gt; T getExtensionPoint(<SPAN class="code-object">Class</SPAN>&lt;T&gt; extensionPointType);
+
+    /**
+     * Remove an extension point
+     * @param extensionPoint The extension point to remove
+     */
+    void removeExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+}</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCAExtensionDeveloperGuide-TheModuleActivator"></A>The ModuleActivator</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.core;
+
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+
+/**
+ * ModuleActivator represents a module that plugs into the Tuscany system. Each module should
+ * provide an implementation of <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">interface</SPAN> and registry the implementation class by defining
+ * a file named as <SPAN class="code-quote">&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot;</SPAN>. The
+ * content of the file is the class name of the implementation. The implementation class must
+ * have a no-arg constructor. The same instance will be used to invoke all the methods during
+ * different phases of the module activation.
+ *
+ * @version $Rev: 529327 $ $Date: 2007-04-16 10:10:43 -0700 (Mon, 16 Apr 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ModuleActivator {
+    /**
+     * Get a map of the extension points defined by <SPAN class="code-keyword">this</SPAN> module. The key is the
+     * java <SPAN class="code-keyword">interface</SPAN> to represent the extension point and the the value is the
+     * instance of the implementation of the <SPAN class="code-keyword">interface</SPAN>.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> All the extension points defined by <SPAN class="code-keyword">this</SPAN> module
+     */
+    Map&lt;<SPAN class="code-object">Class</SPAN>, <SPAN class="code-object">Object</SPAN>&gt; getExtensionPoints();
+
+    /**
+     * This method is invoked when the module is started by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to registr extensions against extension
+     * points.
+     *
+     * @param registry The extension point registry
+     */
+    void start(ExtensionPointRegistry registry);
+
+    /**
+     * This method is invoked when the module is stopped by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to unregister extensions against the
+     * extension points.
+     *
+     * @param registry The extension point registry
+     */
+    void stop(ExtensionPointRegistry registry);
+}</PRE>
+</DIV></DIV>
+<P>The ModuleActivator represents a module that plugs into the Tuscany system.<BR>
+Each module should provide an implementation <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=3&linkCreation=true&fromPageId=51879" title="Create Page: 3" class="createlink">3<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> of this interface and<BR>
+registry the implementation class by defining a file named as<BR>
+&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot; <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=4&linkCreation=true&fromPageId=51879" title="Create Page: 4" class="createlink">4<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. The<BR>
+content of the file is the class name of the implementation. The<BR>
+implementation class must have a no-arg constructor. The same instance will<BR>
+be used to invoke all the methods during different phases of the module<BR>
+activation.</P>
+
+<P>During bootstraping, the following sequence will happen:</P>
+
+<P>1) All the module activators will be discovered by the presence of<BR>
+META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator<BR>
+2) The activator class is instantiated using the no-arg constructor.<BR>
+3) ModuleActivator.getExtensionPoints() is invoked for all modules and the<BR>
+extension points contributed by each module are added to the<BR>
+ExtensionRegistry.<BR>
+4) ModuleActivator.start(ExtensionRegistry) is invoked for all the modules.<BR>
+The module can then get interested extension points and contribute<BR>
+extensions to them. The contract bwteen the extension and extension point is<BR>
+private to the extension point. The extension point can follow similar<BR>
+patterns such as Registry. If it happens that one extension point has a<BR>
+dependency on another extension point, they can linked at this phase.</P>
+
+<P>During shutting down, the stop() method is invoked for all the modules to<BR>
+perform cleanups. A module can choose to unregister the extension from the<BR>
+extension points.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-extension-guide.html b/site/trunk/site-publish/java-sca-extension-guide.html
new file mode 100644
index 0000000000..ddd87b18d9
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-extension-guide.html
@@ -0,0 +1,297 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Extension Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Extension Guide">Java SCA Extension Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Extension Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51879">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51879">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51879">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51879">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51879">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51879">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=edwardsmj">Mike Edwards</A> on May 03, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=51879&originalId=53223">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Extension Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+This is a guide for developers who would like to extend Tuscany SCA Java.</P>
+<UL>
+	<LI><A href="#JavaSCAExtensionGuide-extension" title="extension on Java SCA Extension Guide">What is an extension?</A></LI>
+	<LI><A href="#JavaSCAExtensionGuide-component" title="component on Java SCA Extension Guide">How to add a new component implementation? </A></LI>
+	<LI><A href="#JavaSCAExtensionGuide-binding" title="binding on Java SCA Extension Guide">How to add a new binding? </A></LI>
+	<LI><A href="#JavaSCAExtensionGuide-interface" title="interface on Java SCA Extension Guide">How to add a new interface binding? </A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="#JavaSCAExtensionGuide-databinding" title="databinding on Java SCA Extension Guide">How to add a databinding </A></LI>
+	<LI><A href="#JavaSCAExtensionGuide-generalguide" title="general guide on Java SCA Extension Guide">General guide for developing extensions</A></LI>
+	<LI><A href="#JavaSCAExtensionGuide-details" title="details on Java SCA Extension Guide">Details on extension architecture</A> <B>can move to architecture doc</B>
+<BR clear="all">
+&nbsp;</LI>
+</UL>
+</DIV></DIV>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-extension"></A><FONT color="#0099cc">What is an extension?</FONT></H3>
+
+<P>Extension is a module (or a set of modules),when built with Tuscany SCA, can extend it to work with additional bindings, language implementations, programming models or databindings.</P>
+
+<P>SCA assembly model is defined such that extensions can be added for new interface types or for new implementation types such as ruby and python, or new binding types such as CXF. However, the definition of extension SPIs is left to the implementor. Tuscany SCA Java provides a simple set of SPIs for implementing extensions. It also defines additional extension points such as data binding, for example support for SDO and JAXB.</P>
+
+<P>This guide explains the steps to add each of these extension types. Please help us refine the guide as you go through the steps of adding extensions.</P>
+
+<H4><A name="JavaSCAExtensionGuide-Namespacesusedbyextensions"></A>Name spaces used by extensions</H4>
+
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-component"></A><FONT color="#0099cc">How to add a new component implementation?</FONT></H3>
+
+<P><A href="mike-edwards-ramble-through-adding-a-new-component-type.html" title="Mike Edwards Ramble through Adding a New Component Type">Musings on Adding a New Component Type by Mike E</A>&nbsp;</P>
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-binding"></A><FONT color="#0099cc">How to add a new binding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-interface"></A><FONT color="#0099cc">How to add a new interface binding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-databinding"></A><FONT color="#0099cc">How to add a new databinding?</FONT></H3>
+
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-generalguide"></A><FONT color="#0099cc">General guide for developing extensions</FONT></H3>
+
+<UL>
+	<LI>Familiarize yourself with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at www.osoa.org.</LI>
+	<LI>Never reference any classes in core. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+	<LI>Use autowire when assembling extension components.</LI>
+	<LI>Do not play with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<H3><A name="JavaSCAExtensionGuide-"></A><A name="JavaSCAExtensionGuide-details"></A><FONT color="#0099cc">Detail on extension architecture</FONT></H3>
+
+
+<H4><A name="JavaSCAExtensionGuide-TheExtensionPointRegistry"></A>The ExtensionPointRegistry</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.core;
+
+/**
+ * The registry <SPAN class="code-keyword">for</SPAN> the Tuscany core extension points.
+ *
+ * @version $Rev: 529327 $ $Date: 2007-04-16 10:10:43 -0700 (Mon, 16 Apr 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ExtensionPointRegistry {
+
+    /**
+     * Add an extension point to the registry
+     * @param &lt;T&gt;
+     * @param extensionPointType The <SPAN class="code-keyword">interface</SPAN> of the extension point
+     * @param extensionPoint The instance of the extension point
+     */
+    &lt;T&gt; void addExtensionPoint(<SPAN class="code-object">Class</SPAN>&lt;T&gt; extensionPointType, T extensionPoint);
+
+    /**
+     * Get the extension point by the <SPAN class="code-keyword">interface</SPAN>
+     * @param &lt;T&gt;
+     * @param extensionPointType
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    &lt;T&gt; T getExtensionPoint(<SPAN class="code-object">Class</SPAN>&lt;T&gt; extensionPointType);
+
+    /**
+     * Remove an extension point
+     * @param extensionPoint
+     */
+    void removeExtensionPoint(<SPAN class="code-object">Class</SPAN> extensionPoint);
+}</PRE>
+</DIV></DIV>
+
+<H4><A name="JavaSCAExtensionGuide-TheModuleActivator"></A>The ModuleActivator</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.core;
+
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+
+/**
+ * ModuleActivator represents a module that plugs into the Tuscany system. Each module should
+ * provide an implementation of <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">interface</SPAN> and registry the implementation class by defining
+ * a file named as <SPAN class="code-quote">&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot;</SPAN>. The
+ * content of the file is the class name of the implementation. The implementation class must
+ * have a no-arg constructor. The same instance will be used to invoke all the methods during
+ * different phases of the module activation.
+ *
+ * @version $Rev: 529327 $ $Date: 2007-04-16 10:10:43 -0700 (Mon, 16 Apr 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ModuleActivator {
+    /**
+     * Get a map of the extension points defined by <SPAN class="code-keyword">this</SPAN> module. The key is the
+     * java <SPAN class="code-keyword">interface</SPAN> to represent the extension point and the the value is the
+     * instance of the implementation of the <SPAN class="code-keyword">interface</SPAN>.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> All the extension points defined by <SPAN class="code-keyword">this</SPAN> module
+     */
+    Map&lt;<SPAN class="code-object">Class</SPAN>, <SPAN class="code-object">Object</SPAN>&gt; getExtensionPoints();
+
+    /**
+     * This method is invoked when the module is started by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to registr extensions against extension
+     * points.
+     *
+     * @param registry The extension point registry
+     */
+    void start(ExtensionPointRegistry registry);
+
+    /**
+     * This method is invoked when the module is stopped by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to unregister extensions against the
+     * extension points.
+     *
+     * @param registry The extension point registry
+     */
+    void stop(ExtensionPointRegistry registry);
+}</PRE>
+</DIV></DIV>
+<P>The ModuleActivator represents a module that plugs into the Tuscany system.<BR>
+Each module should provide an implementation <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=3&linkCreation=true&fromPageId=51879" title="Create Page: 3" class="createlink">3<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> of this interface and<BR>
+registry the implementation class by defining a file named as<BR>
+&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot; <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=4&linkCreation=true&fromPageId=51879" title="Create Page: 4" class="createlink">4<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. The<BR>
+content of the file is the class name of the implementation. The<BR>
+implementation class must have a no-arg constructor. The same instance will<BR>
+be used to invoke all the methods during different phases of the module<BR>
+activation.</P>
+
+<P>During bootstraping, the following sequence will happen:</P>
+
+<P>1) All the module activators will be discovered by the presence of<BR>
+META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator<BR>
+2) The activator class is instantiated using the no-arg constructor.<BR>
+3) ModuleActivator.getExtensionPoints() is invoked for all modules and the<BR>
+extension points contributed by each module are added to the<BR>
+ExtensionRegistry.<BR>
+4) ModuleActivator.start(ExtensionRegistry) is invoked for all the modules.<BR>
+The module can then get interested extension points and contribute<BR>
+extensions to them. The contract bwteen the extension and extension point is<BR>
+private to the extension point. The extension point can follow similar<BR>
+patterns such as Registry. If it happens that one extension point has a<BR>
+dependency on another extension point, they can linked at this phase.</P>
+
+<P>During shutting down, the stop() method is invoked for all the modules to<BR>
+perform cleanups. A module can choose to unregister the extension from the<BR>
+extension points.</P>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="mike-edwards-ramble-through-adding-a-new-component-type.html" title="Mike Edwards Ramble through Adding a New Component Type">Mike Edwards Ramble through Adding a New Component Type</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-extensions-menu.html b/site/trunk/site-publish/java-sca-extensions-menu.html
new file mode 100644
index 0000000000..1f9dd996df
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-extensions-menu.html
@@ -0,0 +1,100 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA Extensions Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47677">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extensions%20Menu" title="Java SCA Extensions Menu">Java SCA Extensions Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H4><A name="JavaSCAExtensionsMenu-ImplementationTypes"></A>Implementation Types</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Groovy&linkCreation=true&fromPageId=47677" title="Create Page: Groovy" class="createlink">Groovy<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JavaScript&linkCreation=true&fromPageId=47677" title="Create Page: JavaScript" class="createlink">JavaScript<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Spring&linkCreation=true&fromPageId=47677" title="Create Page: Spring" class="createlink">Spring<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="JavaSCAExtensionsMenu-Bindings"></A>Bindings</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=ActiveMQ&linkCreation=true&fromPageId=47677" title="Create Page: ActiveMQ" class="createlink">ActiveMQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=AMQP&linkCreation=true&fromPageId=47677" title="Create Page: AMQP" class="createlink">AMQP<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Axis&linkCreation=true&fromPageId=47677" title="Create Page: Axis" class="createlink">Axis<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=CXF&linkCreation=true&fromPageId=47677" title="Create Page: CXF" class="createlink">CXF<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JMS&linkCreation=true&fromPageId=47677" title="Create Page: JMS" class="createlink">JMS<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="JavaSCAExtensionsMenu-Databindings"></A>Databindings</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JAXB&linkCreation=true&fromPageId=47677" title="Create Page: JAXB" class="createlink">JAXB<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO%20General%20Menu&linkCreation=true&fromPageId=47677" title="Create Page: SDO General Menu" class="createlink">SDO General Menu<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XmlBeans&linkCreation=true&fromPageId=47677" title="Create Page: XmlBeans" class="createlink">XmlBeans<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="JavaSCAExtensionsMenu-AddOns"></A>Add-Ons</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DataSource&linkCreation=true&fromPageId=47677" title="Create Page: DataSource" class="createlink">DataSource<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Journal%20Store&linkCreation=true&fromPageId=47677" title="Create Page: Journal Store" class="createlink">Journal Store<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JPA&linkCreation=true&fromPageId=47677" title="Create Page: JPA" class="createlink">JPA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Transaction%20Manager&linkCreation=true&fromPageId=47677" title="Create Page: Transaction Manager" class="createlink">Transaction Manager<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-extensions.html b/site/trunk/site-publish/java-sca-extensions.html
new file mode 100644
index 0000000000..2913632af8
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-extensions.html
@@ -0,0 +1,120 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Extensions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47675">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Extensions">Java SCA Extensions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="20%">
+<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extensions%20Menu&linkCreation=true&fromPageId=47675" class="createlink">Java SCA Extensions Menu</A></DIV></TD>
+<TD class="confluenceTd" valign="top" width="80%">
+
+<H3><A name="JavaSCAExtensions-Extensions"></A>Extensions</H3>
+
+<P>Extensions add functionality to the kernel such as support for new component implementation types or bindings. They are modular additions to the kernel and are released independently. Please see the wiki pages for detailed information and status of each extension. </P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-implementationdata.html b/site/trunk/site-publish/java-sca-implementationdata.html
new file mode 100644
index 0000000000..3d5bf81dfe
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-implementationdata.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Implementation.data</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60310">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Implementation.data">Java SCA Implementation.data</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-implementationscript.html b/site/trunk/site-publish/java-sca-implementationscript.html
new file mode 100644
index 0000000000..e8b5125f81
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-implementationscript.html
@@ -0,0 +1,170 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA implementation.script : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55156">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA implementation.script">Java SCA implementation.script</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Documentation&linkCreation=true&fromPageId=55228" title="Create Page: Java SCA Documentation" class="createlink">Documentation <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="JavaSCAimplementation.script-%3Cimplementation.script%3E"></A>&lt;implementation.script&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports implementing SCA components in a wide variety of dynamic or scripting languages by using the &lt;implementation.script&gt; SCDL extension.</P>
+
+<P>Any language that supports the &quot;Scripting for Java&quot; APIs defined by JSR-223 is supported, this includes Groovy, JavaScript, JRuby, Jython, and many others.</P>
+
+<P>To use these languages the SCA assembly SCDL is extended with an &quot;implementation.script&quot; element which has the following options:</P>
+
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script [ script=<SPAN class="code-quote">&quot;&quot; | language=&quot;</SPAN>&quot; ] &gt;
+     [inline src]
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+<P>The source code for the script maybe defined in a seperate file pointed to by the 'script=' attribute, or the source code maybe embedded within the SCDL inline inside the &lt;implementation.script&gt; element.</P>
+
+<P>The 'language=' attribute defines the language of the program. The language attribute is optional when the source code is in a separate file in which case the file extension of the file is used to determine the language.</P>
+
+<H4><A name="JavaSCAimplementation.script-Someexamples%3A"></A>Some examples:</H4>
+
+
+<P>A Ruby program defined in a file 'myScript.rb' in a folder named 'test':</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script script=<SPAN class="code-quote">&quot;test/myScript.rb&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+
+
+<P>A JavaScript program defined inline:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;
+      function sayHello(name) {
+         <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;Hello &quot;</SPAN> + name;
+      }
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+
+<P>When using inline scripts which contain special characters such as XML markup you may need to enclose the source within a CDATA region, for example:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+      function sayHello(inXML) {
+         <SPAN class="code-keyword">return</SPAN> &lt;sayHelloResponse&gt;Hello { inXML..name }&lt;/sayHelloResponse&gt;;
+      }
+]]&gt;&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+<P>The previous example demonstrated using JavaScript's <SPAN class="nobr"><A href="http://www.ecma-international.org/publications/standards/Ecma-357.htm" title="Visit page outside Confluence" rel="nofollow">E4X<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> language extension for manipulating XML. Many dynamic languages have enhanced XML capabilities like this which can make working with XML much easier than in a more traditional language such as Java. For example, along with JavaScript's E4X, Ruby has ReXML and Groovy has its markup builders. </P>
+
+<P>Tuscany tries to simplify this for the script program developer and will try to automatically ensure arguments are in the native XML format of the language when the component is wired to a WSDL interface.  </P>
+
+<P>As an example of this the following shows a composite that can replace the Tuscany helloworld-ws-service sample and requires no other files other than the asscociated WSDL document packaged with the contribution:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>	xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>        name=<SPAN class="code-quote">&quot;helloworldws&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+       &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld#wsdl.<SPAN class="code-keyword">interface</SPAN>(HelloWorld)&quot;</SPAN> /&gt;
+</SPAN>       &lt;binding.ws uri=&quot;&quot;/&gt;
+    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+
+           function getGreetings(xmlIn) {
+              <SPAN class="code-keyword">return</SPAN> &lt;ns1:getGreetings xmlns:ns1=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>&gt;
+</SPAN>                        &lt;ns1:name&gt;Hello { xmlIn..name }&lt;/ns1:name&gt;
+                     &lt;/ns1:getGreetings&gt;
+           }
+
+        ]]&gt;&lt;/implementation.script&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;</PRE>
+</DIV></DIV>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Best practice?</B><BR>
+<P>Using inline scripts can make creating simple components very easier however there are issues around whether or not this is good practice. <BR>
+Depending on the circumstance consideration should be given as to if it would be better to define the script in a seperate file.</P></TD></TR></TABLE>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">0.90</B><BR>
+<P>In release 0.90 and before, inline scripts are not supported and scripts require an associated .componentType side file</P></TD></TR></TABLE>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg
new file mode 100644
index 0000000000..af8e30deae
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg.jpeg
new file mode 100644
index 0000000000..7a1c2140b9
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg
new file mode 100644
index 0000000000..f222230cf4
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg.jpeg
new file mode 100644
index 0000000000..c5b7fb2288
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg
new file mode 100644
index 0000000000..ed8ac08425
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg.jpeg
new file mode 100644
index 0000000000..29195ebba1
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/component.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg
new file mode 100644
index 0000000000..ecbf04798f
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg.jpeg
new file mode 100644
index 0000000000..b7f4e64b84
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/model.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg
new file mode 100644
index 0000000000..fd1f8d4318
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
new file mode 100644
index 0000000000..a4e3e2b1e3
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg
new file mode 100644
index 0000000000..0c47a208b1
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg.jpeg b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg.jpeg
new file mode 100644
index 0000000000..96806ed1e7
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.data/tuscany_layers.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-kernel-architecture-guide.html b/site/trunk/site-publish/java-sca-kernel-architecture-guide.html
new file mode 100644
index 0000000000..24aede3557
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-architecture-guide.html
@@ -0,0 +1,476 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Kernel Architecture Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Kernel Architecture Guide">Java SCA Kernel Architecture Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Kernel Architecture Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45023">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45023">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A>, last edited by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A> on Apr 16, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=45023&originalId=51707">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Kernel Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+<UL>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-Overview" title="Overview on Java SCA Kernel Architecture Guide">Kernel overview</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-Modules" title="Modules on Java SCA Kernel Architecture Guide">Modules</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-Artifacts" title="Artifacts on Java SCA Kernel Architecture Guide">Runtime Artifacts</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-Recursions" title="Recursions on Java SCA Kernel Architecture Guide">Recursive Composite</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-KernelWiring" title="Kernel Wiring on Java SCA Kernel Architecture Guide">Wiring</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-KernelBootstrap" title="Kernel Bootstrap on Java SCA Kernel Architecture Guide">Bootstrap</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-KernelCompositeHierarchy" title="Kernel Composite Hierarchy on Java SCA Kernel Architecture Guide">Composite Hierarchy</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-JavaSCADeployment" title="Java SCA Deployment on Java SCA Kernel Architecture Guide">Deployment</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-JavaSCALoaders" title="Java SCA Loaders on Java SCA Kernel Architecture Guide">Loader</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-JavaSCABuilder" title="Java SCA Builder on Java SCA Kernel Architecture Guide">Builder</A></LI>
+	<LI><A href="#JavaSCAKernelArchitectureGuide-JavaSCAmodel" title="Java SCA model on Java SCA Kernel Architecture Guide">Model</A></LI>
+</UL>
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-Overview"></A><FONT color="#0099cc">Kernel Overview</FONT></H3>
+
+<P>This is a high level architecture document for Tuscany Java implementation of Service Component Architecture (SCA) which is defined in the specifications located at (<SPAN class="nobr"><A href="http://wwww.osoa.org/" title="Visit page outside Confluence" rel="nofollow">http://wwww.osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>).</P>
+
+<P>This is a live document and is more focused on what is implemented rather than the end vision.<BR>
+Goal of this document is to help users/developers better understand what Tuscany SCA offers and enable them to help with the development if interested.</P>
+
+<P>Tuscany provides the infrastructure for creating, assembling and deploying services in a distributed environment.<BR>
+At a high level it aims to provide for the following:</P>
+<UL>
+	<LI>Infrastructure for creating, wiring, deploying and managing service assemblies in single runtime or across runtimes (federated)</LI>
+	<LI>Infrastructure for leveraging qualities of service provided by host environments (transactions, security)</LI>
+	<LI>Support for different host environments: Standalone, Tomcat, J2EE, OSGI (in progress, more can be added)</LI>
+	<LI>plug-points for supporting variety of bindings such as Axis2, RMI, more can be added</LI>
+	<LI>plug-points for adding component implementations such as Java Script, Spring, JRuby, Python (started), more can be added</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-Modules"></A><FONT color="#0099cc">Module Structure</FONT></H3>
+
+<P>[Note: Do we want to link to <A href="java-sca-modulization-design-discussions.html" title="Java SCA Modulization Design Discussions">Kernel-Structure</A>]?</P>
+
+<P>As illustrated below, the Tuscany runtime consists of the following key modules/packages:</P>
+<OL>
+	<LI>SCA Spec API: The APIs defined by the SCA Java Client and Implementation Spec</LI>
+	<LI>API: Tuscany APIs which extend the SCA spec APIs</LI>
+	<LI>Core: The runtime implementation</LI>
+	<LI>SPI: SPI and base classes to extend the Tuscany runtime. It defines all the contract that Core interacts with Container/Binding/Databinding extensions.</LI>
+	<LI>Extensions:
+	<OL>
+		<LI>Container</LI>
+		<LI>Binding</LI>
+		<LI>Databinding</LI>
+	</OL>
+	</LI>
+	<LI>Host API: The interface between hosting environments and the Tuscany runtime</LI>
+	<LI>Host Platforms: The environments that host the Tuscany runtime</LI>
+</OL>
+
+
+<P><IMG src="java-sca-kernel-architecture-guide.data/tuscany_layers.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-Artifacts"></A><FONT color="#0099cc">Runtime Artifacts</FONT></H3>
+
+<UL>
+	<LI>Component
+	<UL>
+		<LI>Basic unit of executable code</LI>
+		<LI>Offer services and have references</LI>
+	</UL>
+	</LI>
+	<LI>Service
+	<UL>
+		<LI>A contract for component clients consisting of 0..n operations</LI>
+		<LI>Services may be local or remote</LI>
+	</UL>
+	</LI>
+	<LI>Reference
+	<UL>
+		<LI>A dependency on a service</LI>
+		<LI>Component references are wired to services by the runtime</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-Recursions"></A><FONT color="#0099cc">Recursive Composite</FONT></H3>
+
+<P>Components may be Atomic or Composite</P>
+<UL>
+	<LI>Composite components contain 0..n components<BR>
+Composite services are exposed over 1..n bindings (e.g. SOAP/HTTP, JMS, RMI)<BR>
+Composite references have 1..n bindings and may target</LI>
+	<LI>A service exposed by another composite</LI>
+	<LI>A service outside the SCA system, e.g. &quot;Google search&quot;<BR>
+A composite may contain just a service wired to a references (mediation) <SPAN class="error">&#91;Haleh: Clarify&#93;</SPAN></LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-KernelWiring"></A><FONT color="#0099cc">Wiring</FONT></H3>
+
+<P>To understand how wiring works, we need to detail how Components function in the system. Let's start with Atomic Components and then discuss Composite Components.</P>
+
+<H4><A name="JavaSCAKernelArchitectureGuide-AtomicComponent"></A>Atomic Component</H4>
+
+<P>AtomicComponent is the most basic component form. It corresponds to the spec concept which offers services, has references and properties</P>
+<UL>
+	<LI>Implementation types e.g. Java, XSLT, etc.</LI>
+	<LI>Are wired</LI>
+	<LI>Have properties</LI>
+</UL>
+
+
+<P>Atomic Components have implementation instances. Instances are associated with a scope: e.g. request, conversation, composite. A SCDL entry is used to define a Component. <SPAN class="error">&#91;Haleh: Define scope&#93;</SPAN></P>
+
+<P>Atomic components use a ScopeContainer to manage implementation instances:</P>
+<UL>
+	<LI>Composite, HTTP Session, Request, Stateless</LI>
+	<LI>ScopeContainers track implementation instances by scope id and the AtomicComponent instance identity</LI>
+	<LI>Instances are stored in an InstanceWrapper which is specific to the component implementation type (e.g. PojoInstanceWrapper.java)</LI>
+</UL>
+
+
+<H4><A name="JavaSCAKernelArchitectureGuide-ComponentWiring"></A>Component Wiring</H4>
+
+<P>Component references are connected to services through wires</P>
+<UL>
+	<LI>Two sides
+	<UL>
+		<LI>InboundWire - handles the source side of a wire, including policy</LI>
+		<LI>OutboundWire - handles the target side of a wire, including policy</LI>
+	</UL>
+	</LI>
+	<LI>The runtime connects inbound and outbound wires, performing optimizations if possible
+	<UL>
+		<LI>Inbound and outbound wires may be associated with different service contracts</LI>
+		<LI>Different implementation types</LI>
+		<LI>&quot;Standard&quot; wires contain invocation chains that have Interceptors that perform some form of mediation (e.g. policy)</LI>
+		<LI>Other wire types exist that, for example, do not perform mediations</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H4><A name="JavaSCAKernelArchitectureGuide-InvocationChains"></A>Invocation Chains</H4>
+
+<P>A wire has an InvocationChain per service operation. An InvocationChain may have interceptors - &quot;around-style&quot; mediation. Component implementation instances access a wire through a WireInvocationHandler associated with a reference.</P>
+<UL>
+	<LI>WireInvocationHandlers may (or may not depending on the component type) be fronted by a proxy</LI>
+	<LI>WireInvocationHandlers dispatch an invocation to the correct chain<BR>
+A wire has a TargetInvoker that is created from the target side AtomicComponent or Reference and is stored on the source wire invocation handler. The TargetInvoker is resposnible for dispatching the request to the target instance when the message hits the end of the target invocation chain.</LI>
+</UL>
+
+
+<H4><A name="JavaSCAKernelArchitectureGuide-InvocationOverview"></A>Invocation Overview</H4>
+
+<UL>
+	<LI>An invocation is dispatched to the WireInvocationHandler</LI>
+	<LI>The WireInvocationHandler looks up the correct InvocationChain</LI>
+	<LI>It then creates a message, sets the payload, sets the TargetInvoker, and passes the message down the chain</LI>
+	<LI>When the message reaches the end of the chain, the TargetInvoker is called, which in turn is responsible for dispatching to the target</LI>
+	<LI>Having the TargetInvoker stored on the outbound side allows it to cache the target instance when the wire source has a scope of equal or lesser value than the target (e.g. request--&gt;composite</LI>
+</UL>
+
+
+<P>The runtime provides components with InboundWires and OutboundWires. InvocationChains are held in component wires and are therefore stateless which allows for dynamic behavior such as introduction of new interceptors or re-wiring.</P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-KernelBootstrap"></A><FONT color="#0099cc">Bootsrap</FONT></H3>
+
+<P>Bootstrap process is controlled by Host environment. The default process is implemented in DefaultBootstrapper.</P>
+
+<P><IMG src="java-sca-kernel-architecture-guide.data/bootstrap.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-KernelCompositeHierarchy"></A><FONT color="#0099cc">Composite Hierarchy</FONT></H3>
+
+<P><A href="java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg" target="tuscany_composite_hierarchy.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/tuscany_composite_hierarchy.jpg&quot;, &quot;tuscany_composite_hierarchy.jpg&quot;, &quot;height=610,width=1057,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="java-sca-kernel-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-Thesequencediagramforthebootstrapping"></A>The sequence diagram for the bootstrapping</H3>
+
+<P><A href="java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg" target="bootstrap_seq.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/bootstrap_seq.jpg&quot;, &quot;bootstrap_seq.jpg&quot;, &quot;height=993,width=1809,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="java-sca-kernel-architecture-guide.data/bootstrap_seq.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-JavaSCADeployment"></A><FONT color="#0099cc">Deployment</FONT></H3>
+
+<P>The runtime processes service assemblies serialized using SCA XML vocabulary, SCDL, but can take other forms.</P>
+<UL>
+	<LI>The load phase processes SCDL and creates an in-memory model</LI>
+	<LI>The build phase evaluates the model and produces corresponding runtime artifacts (e.g. components, services, references)</LI>
+	<LI>The connect phase wires references to services</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-JavaSCALoaders"></A><FONT color="#0099cc">Loader</FONT></H3>
+
+<P>SCA service assemblies are deployed to the SCA domain in the format of SCDL files. Tuscany runtime uses loader to load the SCDLs into model objects which are a set of java beans to hold the metadata.</P>
+
+<P>There are two types of loaders:</P>
+<UL>
+	<LI>StAXElementLoader: Load the XML element from the StAX events</LI>
+	<LI>ComponentTypeLoader: Load the Component Type for an implementation either by introspection or paring a side file</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-JavaSCAmodel"></A><FONT color="#0099cc">Model</FONT></H3>
+
+<P><A href="java-sca-kernel-architecture-guide.data/model.jpg" target="model.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/model.jpg&quot;, &quot;model.jpg&quot;, &quot;height=649,width=852,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="java-sca-kernel-architecture-guide.data/model.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-LoadingComponentType"></A>Loading Component Type</H3>
+
+<P>Loads the component type definition for a specific implementation</P>
+<UL>
+	<LI>How it does this is implementation-specific</LI>
+	<LI>May load XML sidefile (location set by implementation)</LI>
+	<LI>May introspect an implementation artifact (e.g. Java annotations)</LI>
+	<LI>... or anything else</LI>
+</UL>
+
+
+<P>Composite ComponentType Loader</P>
+<UL>
+	<LI>Load SCDL from supplied URL</LI>
+	<LI>Extract and load SCDL from composite package</LI>
+</UL>
+
+
+<P>POJO ComponentType Loader</P>
+<UL>
+	<LI>Introspect Java annotations</LI>
+	<LI>Uses a pluggable &quot;annotation processing&quot; framework to introspect Java classes</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-"></A><A name="JavaSCAKernelArchitectureGuide-JavaSCABuilder"></A><FONT color="#0099cc">Builder</FONT></H3>
+
+<P>Java SCA builder creates a runtime component from the configuration model</P>
+<UL>
+	<LI>Builder for each implementation type</LI>
+	<LI>Builder for each binding type (service or reference component)</LI>
+</UL>
+
+
+<P>Runtime component manages:</P>
+<UL>
+	<LI>Implementation instances</LI>
+	<LI>Inbound and Outbound wires</LI>
+</UL>
+
+
+<P>Every implementation is likely to be different</P>
+<UL>
+	<LI>Different artifacts, programming model, ...</LI>
+</UL>
+
+
+<P>Composite implementation recurses for contained components</P>
+<UL>
+	<LI>Re-invokes the Builder for every child</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-Classdiagramfortheruntimeartifacts"></A>Class diagram for the runtime artifacts</H3>
+
+<P><A href="java-sca-kernel-architecture-guide.data/component.jpg" target="component.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/component.jpg&quot;, &quot;component.jpg&quot;, &quot;height=754,width=1047,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="java-sca-kernel-architecture-guide.data/component.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-Connecting"></A>Connecting</H3>
+
+<P>The connector is reponsible to connect the wires for the components, services and references.</P>
+
+<H2><A name="JavaSCAKernelArchitectureGuide-FederatedAssembly"></A>Federated Assembly</H2>
+
+<P>&lt;notes from Meeraj's email on 2/1/07 - Haleh included here&gt;<BR>
+I have been working on the stuff around federated assembly and enabling<BR>
+distributed SCA domains. Here is a quick summary of what has been done<BR>
+so far,</P>
+
+<P>Work in progress</P>
+
+<H3><A name="JavaSCAKernelArchitectureGuide-DiscoveryService"></A>Discovery Service</H3>
+
+<UL>
+	<LI>Provides the low-level communication abstraction for<BR>
+enabling runtimes participating in the domain to exchange information</LI>
+	<LI>The abstraction supports directed message delivery to a<BR>
+given runtime, asynchronous message reception and broadcast to all<BR>
+runtimes participating in the domain</LI>
+	<LI>To start with we are following a model, where one<BR>
+runtime in the domain assumes the master role and is responsible for<BR>
+managing the logical assembly</LI>
+	<LI>This runtime creates the physical artifacts and<BR>
+trensport them to the target slave runtimes</LI>
+	<LI>The discovery abstraction is defined in SPI</LI>
+	<LI>There are two implementations in runtime/services - JXTA<BR>
+and Bonjour</LI>
+	<LI>JXTA implementaion is getting pretty much there, it<BR>
+mainly uses the JXTA Peer Discovery protocol (PDP) and Peer Resolver<BR>
+Protocol (PRP)</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-MarshallingFramework"></A>Marshalling Framework</H3>
+
+<UL>
+	<LI>This is similar to our loader framework, however<BR>
+supports bi-directional marshalling and unmarshalling of physical model<BR>
+objects</LI>
+	<LI>This framework is used by the assembly service to<BR>
+serialize and transport physical model information to slave runtimes<BR>
+using the discovery services</LI>
+	<LI>On the receiving end the serialized information is<BR>
+unmarshalled by the federated deployer for being applied to the slave<BR>
+runtime</LI>
+	<LI>The abstraction is defined in SPI</LI>
+	<LI>I am working on an implementation in core</LI>
+	<LI>The framework supports versioning of physicla model<BR>
+objects if the participating runtimes are at different versions</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-FederatedDeployer"></A>Federated Deployer</H3>
+
+<UL>
+	<LI>This is similar to the local deployer, however registers<BR>
+itself with the discovery service for receiving physical model updates</LI>
+	<LI>The federated deployer doesn't use the loader framework</LI>
+	<LI>The federated deployer accepts serialized physical model<BR>
+information in XML, rather than raw SCDL as with local deployer</LI>
+	<LI>It uses the current builder framework to build, prepare<BR>
+and start the components <TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">A note from Jeremy on federated deployment Feb. 9, 2007.</B><BR>The design is that there is a &quot;master&quot; node that is working out which&quot;physical&quot; nodes components are going to run on. It then<BR>
+passes PhysicalComponentDefinition's to the worker nodes to get them tocreate the component and any transport bindings it needs<BR>
+to talk toother nodes. The PCDs are portable, independent of the type ofruntime, instead tied to the type of component.Picking on<BR>
+Ruby as an example as we know we can run that on Java andNative runtimes, there could be one common PCD for a Ruby componentthat<BR>
+was supported by all container implementations. The master couldsend that to any node to have it run a Ruby component. A runtimecould<BR>
+also offer &quot;enhanced&quot; Ruby support with additional featuresthat required additional configuration. If would offer support for adifferent<BR>
+PCD with that additional metadata. Which one is selected bythe master would be part of its component allocation algorithm.So basically,<BR>
+any runtime that can connect to the federated fabricand handle a PCD can join the SCA domain. We picked JXTA and XML forthe fabric and<BR>
+PCD encoding as there is support for those in bothJava and C++. Adding support for that to the Native runtime wouldalso be good if you<BR>
+were skeptical of all the Java stuff.</TD></TR></TABLE></LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-Workoutstanding"></A>Work outstanding</H3>
+
+<UL>
+	<LI>Define the physical model in Java</LI>
+	<LI>Define the corresponding XML infoset</LI>
+</UL>
+
+
+<H3><A name="JavaSCAKernelArchitectureGuide-SupportedExtensions"></A>Supported Extensions</H3>
+
+
+<H4><A name="JavaSCAKernelArchitectureGuide-Spring"></A>Spring</H4>
+
+<P>1) it allows a Spring application context to act as the<BR>
+implementation of an SCA component - this allows users to bring<BR>
+existing Spring applications into an SCA assembly<BR>
+2) it allows SCA components to act as Spring beans so that users can<BR>
+use services over SCA from their applications.</P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-kernel-menu.html b/site/trunk/site-publish/java-sca-kernel-menu.html
new file mode 100644
index 0000000000..0b02f1c703
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel-menu.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Kernel Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47698">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="delete-java-sca-kernel.html" title="Delete-Java SCA Kernel">Delete-Java SCA Kernel</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Kernel Menu">Java SCA Kernel Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H4><A name="JavaSCAKernelMenu-Links"></A>Links</H4>
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Kernel%20Architecture&linkCreation=true&fromPageId=47698" class="createlink">Architecture</A><BR>
+<A href="http://www.buildtuscany.com/" class="external-link" rel="nofollow">Build Status</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-kernel.html b/site/trunk/site-publish/java-sca-kernel.html
new file mode 100644
index 0000000000..f34b8b801b
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-kernel.html
@@ -0,0 +1,137 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Kernel</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Kernel">Java SCA Kernel</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Kernel</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47694">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47694">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47694">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47694">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47694">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47694">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A> on Mar 03, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="JavaSCAKernel-Links"></A>Links</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Kernel%20Architecture&linkCreation=true&fromPageId=47698" title="Create Page: Java SCA Kernel Architecture" class="createlink">Architecture<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.buildtuscany.com/" title="Visit page outside Confluence" rel="nofollow">Build Status<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+<H3><A name="JavaSCAKernel-TheKernel"></A>The Kernel</H3></TD></TR></TBODY></TABLE>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="java-sca-kernel-menu.html" title="Java SCA Kernel Menu">Java SCA Kernel Menu</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-menu-new.html b/site/trunk/site-publish/java-sca-menu-new.html
new file mode 100644
index 0000000000..d3ffd720dd
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-menu-new.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Menu New</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55228">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Menu New">Java SCA Menu New</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-menu.html b/site/trunk/site-publish/java-sca-menu.html
new file mode 100644
index 0000000000..753bbc6e4c
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-menu.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47581">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Menu">Java SCA Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Downloads-remove%20after%20upgrade%20to%20new%20format&linkCreation=true&fromPageId=47581" class="createlink">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" class="createlink">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca" class="external-link" rel="nofollow">Java SCA Source </A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF
new file mode 100644
index 0000000000..bc8b2edf1b
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg
new file mode 100644
index 0000000000..538e132588
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Tuscany-Kernel.doc b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Tuscany-Kernel.doc
new file mode 100644
index 0000000000..3b8057b544
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/Tuscany-Kernel.doc
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg
new file mode 100644
index 0000000000..e7970a0d31
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg
new file mode 100644
index 0000000000..7b02fe8ae3
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-modulization-design-discussions.html b/site/trunk/site-publish/java-sca-modulization-design-discussions.html
new file mode 100644
index 0000000000..4e54c3deab
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-modulization-design-discussions.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Modulization Design Discussions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50027">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Modulization Design Discussions">Java SCA Modulization Design Discussions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The module list has moved to the <A href="sca-java-user-reference.html" title="SCA Java User Reference">Extension Guide</A></P>
+
+<H1><A name="JavaSCAModulizationDesignDiscussions-ConceptualViewofJavaSCAModulizationforDiscussion"></A>Conceptual View of Java SCA Modulization for Discussion</H1>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>A note from Raymond</B><BR>I'm poor with colors but I'm trying to use the color to group the related modules.</TD></TR></TABLE></DIV>
+<P><SPAN class="image-wrap" style=""><IMG src="java-sca-modulization-design-discussions.data/tuscany-kernel-modulization.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P><A href="java-sca-modulization-design-discussions.data/Tuscany-Kernel.doc">The diagram in Microsoft Word format</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-next-release-contents.html b/site/trunk/site-publish/java-sca-next-release-contents.html
new file mode 100644
index 0000000000..301a678e95
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-next-release-contents.html
@@ -0,0 +1,222 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Next Release Contents</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56281">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Next Release Contents">Java SCA Next Release Contents</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="JavaSCANextReleaseContents-NextJavaSCAReleaseContents"></A>Next Java SCA Release Contents</H3>
+
+<P>This page outlines the features being planned for the next Java SCA release.</P>
+
+<P>The next release (0.9x?) is targeted for (August?) 2007, this follows on from the <A href="java-sca-091-release-contents.html" title="Java SCA 0.91 Release Contents">0.91 release</A> in July.</P>
+
+<H3><A name="JavaSCANextReleaseContents-Workingon"></A>Working on</H3>
+
+<UL>
+	<LI>Improvements to the Web services support / Axis2 binding (very rough list, more desired than actually working on yet)
+	<UL>
+		<LI>work without pre-existing wsdl doc</LI>
+		<LI>support attachments</LI>
+		<LI>support accessing/setting SOAP headers</LI>
+		<LI>WS-RM and WS-Security</LI>
+		<LI>support WSA EPR in &lt; binding.ws&gt;</LI>
+		<LI>async</LI>
+		<LI>conversational</LI>
+		<LI>Fix open jira's about ?wsdl and endpoint url</LI>
+		<LI>support setting some optional stuff like Axis2 handlers, chunking, soap version etc</LI>
+		<LI>Axis2 rest style / pox over http support</LI>
+		<LI>Sort out our WSDL tooling story - get SDO integrated into Axis2?</LI>
+		<LI>support WSDL 2.0</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Policy Framework Implementation  (Venkat)
+	<UL>
+		<LI>(I'll fill up the specifics soon)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Distributed Domain support (SimonL)
+	<UL>
+		<LI>SCA Binding</LI>
+		<LI>Topology model</LI>
+		<LI>Distributed domain</LI>
+		<LI>Node implementation</LI>
+		<LI>Management assembly (can be used for other management tasks also)</LI>
+		<LI>Also I need some of the ws items, in particular the ability to run without wsdl, so can help out there.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Logging, error handling and events
+	<UL>
+		<LI>To improve the usability of the runtime we need a proper story on logging and error handling. This has been discussed previously on the list but not yet actioned. The management assembly has a role to play here.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>JMS Binding
+	<UL>
+		<LI>I'd like to see the JMS binding in the release but can't commit to doing lots more work on including spec features. It's been working fine for me in my limited synchronous/rpc scenario. If I get time I'll take a look to see what it will take to add minimum asynch support but if anyone else fancies having a go at this then it's a good way to learn about Tuscany extensions.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-next-release-planning.html b/site/trunk/site-publish/java-sca-next-release-planning.html
new file mode 100644
index 0000000000..f35042c8fa
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-next-release-planning.html
@@ -0,0 +1,310 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA next release planning</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50410">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA next release planning">Java SCA next release planning</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Planning for the next (alpha4?) Java SCA release&nbsp;</P>
+
+<P>See related mailing list discussion:&nbsp;&nbsp; <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3C19e0530f0703291922u61869ecdqa10a3f91ba5a1350@mail.gmail.com%3E" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200703.mbox/%3c19e0530f0703291922u61869ecdqa10a3f91ba5a1350@mail.gmail.com%3e</A></P>
+
+<H3><A name="JavaSCAnextreleaseplanning-%28on%29Ideasforfeaturesthatcanbeinthenextrelease"></A><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Ideas%20for%20features%20that%20can%20be%20in%20the%20next%20release&linkCreation=true&fromPageId=50410" class="createlink">Ideas for features that can be in the next release</A></H3>
+<H4><A name="JavaSCAnextreleaseplanning-Kernel"></A>Kernel</H4>
+<H4><A name="JavaSCAnextreleaseplanning-Componentimplementation"></A>Component implementation </H4>
+<H4><A name="JavaSCAnextreleaseplanning-Bindings"></A>Bindings</H4>
+<H4><A name="JavaSCAnextreleaseplanning-DataBindingextensions"></A>DataBinding extensions</H4>
+
+<H3><A name="JavaSCAnextreleaseplanning-Topdownbuild%2Fpackaging"></A><SPAN class="error">&#91;Top down build/packaging&#93;</SPAN></H3>
+<P>Does it make sense to finalize the feature list and then figure this out?<BR>
+For example, decide on which bindings, extensions are in and then build this list.</P>
+
+<P>Here's a list of all the modules currently in the trunk:</P>
+
+<P>composite-plugin<BR>
+console<BR>
+contrib\discovery\bonjour<BR>
+contrib\discovery\installjxta<BR>
+contrib\discovery\jxta<BR>
+contrib\equinox<BR>
+contrib\osgi<BR>
+contrib\plugin.standalone<BR>
+core-samples\common\calculator<BR>
+core-samples\standalone\calculator<BR>
+core-samples\standalone\loanapplication<BR>
+core-samples\standalone\script-calculator<BR>
+core-samples\webapp\webcalc<BR>
+extensions\axis2\binding<BR>
+extensions\axis2\databinding<BR>
+extensions\axis2\plugins\java2wsdl<BR>
+extensions\axis2\plugins\wsdl2java<BR>
+extensions\axis2\samples<BR>
+extensions\axis2\tools\java2wsdl<BR>
+extensions\axis2\tools\wsdl2java<BR>
+extensions\bpel\container<BR>
+extensions\celtix\binding<BR>
+extensions\celtix\samples\helloworldws-celtix<BR>
+extensions\groovy\container<BR>
+extensions\groovy\samples<BR>
+extensions\hessian\binding<BR>
+extensions\javascript\container<BR>
+extensions\javascript\samples<BR>
+extensions\jms\binding<BR>
+extensions\jms\samples<BR>
+extensions\jsonrpc\binding<BR>
+extensions\jsonrpc\samples<BR>
+extensions\rmi\binding.rmi<BR>
+extensions\rmi\samples<BR>
+extensions\ruby\container<BR>
+extensions\ruby\samples<BR>
+extensions\script\container.bsf<BR>
+extensions\script\container.jsr223<BR>
+extensions\script\databinding.e4x<BR>
+extensions\script\testing\groovy<BR>
+extensions\script\testing\javascript<BR>
+extensions\script\testing\jruby<BR>
+extensions\script\testing\jython<BR>
+extensions\servicemix\binding<BR>
+extensions\spring\container<BR>
+http.jetty<BR>
+idl<BR>
+idl-java<BR>
+idl-wsdl<BR>
+integration-test\propertyTest<BR>
+integration-test\specTest<BR>
+jms-discovery<BR>
+kernel\api<BR>
+kernel\core<BR>
+kernel\databinding<BR>
+kernel\host-api<BR>
+kernel\spi<BR>
+runtime\embedded<BR>
+runtime\itest\plugin<BR>
+runtime\itest\smoketest<BR>
+runtime\services\contribution\contribution<BR>
+runtime\services\contribution\contribution-framework<BR>
+runtime\services\contribution\contribution-installer<BR>
+runtime\services\management\jmx<BR>
+runtime\services\maven<BR>
+runtime\standalone\assembly<BR>
+runtime\standalone\launcher<BR>
+runtime\standalone\server.shutdown<BR>
+runtime\standalone\server.start<BR>
+runtime\standalone\smoketest<BR>
+runtime\standalone\standalone-api<BR>
+runtime\standalone\standalone-host<BR>
+runtime\webapp\plugin.war<BR>
+runtime\webapp\smoketest<BR>
+runtime\webapp\webapp-api<BR>
+runtime\webapp\webapp-host<BR>
+scdl4j\assembly<BR>
+scdl4j\policy<BR>
+services\databinding\databinding-castor<BR>
+services\databinding\databinding-framework<BR>
+services\databinding\databinding-jaxb<BR>
+services\databinding\databinding-json<BR>
+services\databinding\databinding-sdo<BR>
+services\databinding\databinding-sdo-axiom<BR>
+services\databinding\databinding-xmlbeans<BR>
+services\persistence\common<BR>
+services\persistence\datasource<BR>
+services\persistence\openjpa<BR>
+services\persistence\store.jdbc<BR>
+services\persistence\store.journal<BR>
+services\transaction\transaction.geronimo<BR>
+services\transports\http.tomcat</P>
+
+<H1><A name="JavaSCAnextreleaseplanning-Samples"></A>Samples</H1>
+
+<P>Here's the list of samples currently available. Some need a little bit of cleanup or adjustments to the latest SCDL and API levels, but most of them should be usable if we want to include them in our next release.</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> calculator </TD>
+<TD class="confluenceTd"> A simple calculator made of SCA components implementing each calculator operation, shows how to implement SCA Java components and assemble them in an SCA composite <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> loanapplication </TD>
+<TD class="confluenceTd"> Shows the use of callback and conversational services <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> composite-impl </TD>
+<TD class="confluenceTd"> Shows nested composition, using &lt;implementation.composite&gt; to implement an SCA component <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> simple-callback </TD>
+<TD class="confluenceTd"> A simple client calling a service with callback <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> simple-bigbank </TD>
+<TD class="confluenceTd"> A simplified version of the Bigbank scenario from the SCA spec, implemented with Java components, no bindings <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> supplychain </TD>
+<TD class="confluenceTd"> A supply chain management app (similar to the WS-I supplychain scenario) showing how to invoke SCA components asynchronously <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> echo-binding </TD>
+<TD class="confluenceTd"> Shows how to extend Tuscany and implement support for a new service binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> echo-databinding </TD>
+<TD class="confluenceTd"> Shows how to extend Tuscany and implement support for a new data binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> bigbank </TD>
+<TD class="confluenceTd"> An implementation of the BigBank scenario from the SCA spec <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> calculator-ws </TD>
+<TD class="confluenceTd"> The calculator sample with a Web Service binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> helloworld-ws </TD>
+<TD class="confluenceTd"> A helloworld Web service, shows how to provide a Web service using an SCA Web Service binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> helloworld-async </TD>
+<TD class="confluenceTd"> A helloworld Web service with callback, showing how to invoke Web Services asynchronously <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> helloworld-ws-om </TD>
+<TD class="confluenceTd"> A helloworld Web service, shows how to use Axiom in an SCA component <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> loanapplication-ws </TD>
+<TD class="confluenceTd"> A version of the loanapplication sample using Web Service bindings (this one is currently broken) <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> helloworld-jms </TD>
+<TD class="confluenceTd"> A helloworld service using a JMS binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> jsonrpc helloworld </TD>
+<TD class="confluenceTd"> A helloworld service using a JSONRPC binding <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> script samples? <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> We have javascript, ruby and groovy helloworld samples, but I'm not sure if they currently work <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> spring sample? <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> If we want to include the spring extension in the next release, we probably need a sample as well <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> web 2.0 sample?<BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> It would be great to have a web 2.0 sample similar to the Tuscany native AlertAggregator sample.<BR class="atl-forced-newline">
+ We may be able to reuse some of it and try to run it on the Java runtime<BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-overview.html b/site/trunk/site-publish/java-sca-overview.html
new file mode 100644
index 0000000000..afd797d376
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-overview.html
@@ -0,0 +1,196 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Overview">Java SCA Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47661">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47661">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47661">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A> on Mar 03, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47661&originalId=47696">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="JavaSCAOverview-Overview"></A>Overview</H3>
+
+<P>The SCA Java runtime is composed of a <EM>kernel</EM> and extensions. The kernel is essentially a multi-VM wiring engine that connects components together using the principles of <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Dependency_injection" title="Visit page outside Confluence" rel="nofollow">Dependency Injection<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, or <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Inversion_of_control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H3><A name="JavaSCAOverview-Kernel"></A>Kernel</H3>
+
+<P>The kernel is designed to be simple and limited in its capabilities: it wires functional units together. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions. The kernel extension model is based on the SCA 1.0 Java programming and assembly model. In otherwords, the kernel uses SCA to bootstrap itself. The mechanics of how this is done are described in detail elsewhere <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Kernel%20Architecture&linkCreation=true&fromPageId=47661" title="Create Page: Kernel Architecture" class="createlink">Kernel Architecture<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. </P>
+
+<P>The kernel is divided into a number of modules: <EM>api</EM>, <EM>host_api</EM>, <EM>spi</EM> and <EM>core</EM>. The <EM>api</EM> module defines Tuscany proprietary programming model annotations and APIs. The <EM>host_api</EM> module defines APIs for interacting with the kernel. The <EM>spi</EM> module defines extension points and abstract helper classes. The <EM>core</EM> module contains the kernel implementation. </P>
+
+<H3><A name="JavaSCAOverview-Extensions"></A>Extensions</H3>
+
+<P>Extensions enhance the kernel with specific sets of functionality. Extension types are not fixed and the kernel is designed to be as flexible as possible by providing an open-ended extension model. From the kernel perspective, extensions are just a set of SCA components. However, there are a number of known extension types defined by the <EM>spi</EM> module, including:</P>
+
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+</UL>
+
+
+<P>There are also a number of add-on extensions that do not correspond to a well-know type:</P>
+
+<UL>
+	<LI>The JPA extension for O/R mapping</LI>
+	<LI>The Geronimo Transaction Manager extension for transactional support in the runtime</LI>
+	<LI>The HOWL-based Persistent Store extension for high-throughput persistence of conversational state</LI>
+</UL>
+
+
+<P>More detail can be found in the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Extensions%20Guide&linkCreation=true&fromPageId=47661" title="Create Page: Extensions Guide" class="createlink">Extensions Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> section, but a few high-level best practices for designing extensions are listed here:</P>
+
+<UL>
+	<LI>Make sure you are familiar with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.osoa.org&linkCreation=true&fromPageId=47661" title="Create Page: www.osoa.org" class="createlink">www.osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+</UL>
+
+
+<UL>
+	<LI>Never reference any classes in <EM>core</EM>. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use autowire when assembling extension components.</LI>
+</UL>
+
+
+<UL>
+	<LI>Do not mess with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<UL>
+	<LI>Preferrably use <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.easymock.org&linkCreation=true&fromPageId=47661" title="Create Page: www.easymock.org" class="createlink">EasyMock<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for mocking kernel functionality during extension unit testing.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20iTest%20Plugin%20Maven%2BPlugins&linkCreation=true&fromPageId=47661" title="Create Page: Tuscany iTest Plugin Maven+Plugins" class="createlink">Tuscany iTest Plugin Maven&#43;Plugins<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing the extension.</LI>
+</UL>
+
+
+<UL>
+	<LI>Preferrably use <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.easymock.org&linkCreation=true&fromPageId=47661" title="Create Page: www.easymock.org" class="createlink">EasyMock<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for mocking kernel functionality during extension unit testing.</LI>
+</UL>
+
+
+<UL>
+	<LI>Use the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20iTest%20Plugin%20Maven%2BPlugins&linkCreation=true&fromPageId=47661" title="Create Page: Tuscany iTest Plugin Maven+Plugins" class="createlink">Tuscany iTest Plugin Maven&#43;Plugins<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing the extension.</LI>
+</UL>
+
+
+<H3><A name="JavaSCAOverview-Runtimes"></A>Runtimes</H3>
+
+<P>The kernel is designed to be embedded in, or provisioned to, a number of different host environments. For example, the kernel may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or JEE application server. There is even a Maven runtime that embeds kernel for integration testing. Runtime capabilities may vary based on the host environment.     </P>
+
+
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg
new file mode 100644
index 0000000000..5159b9eb07
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg
diff --git a/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg.jpeg b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg.jpeg
new file mode 100644
index 0000000000..2eadda4245
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.data/recursive_composite.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-runtime-component-hierarchy.html b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.html
new file mode 100644
index 0000000000..19679ba198
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-runtime-component-hierarchy.html
@@ -0,0 +1,356 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Runtime Component Hierarchy</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52196">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="delete-java-sca-architecture-overview.html" title="DELETE- Java SCA Architecture Overview">DELETE- Java SCA Architecture Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Runtime Component Hierarchy">Java SCA Runtime Component Hierarchy</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="JavaSCARuntimeComponentHierarchy-Theassmeblydiagram"></A>The assmebly diagram</H2>
+
+<P><SPAN class="image-wrap" style=""><IMG src="java-sca-runtime-component-hierarchy.data/recursive_composite.jpg" style="border: 0px solid black"></SPAN></P>
+<DIV class="code panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Composite1</B></DIV><DIV class="codeContent panelContent" style="background-color: #ffffff;">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>    targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;Composite1&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentA&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.ComponentAImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentB&quot;</SPAN>&gt;
+        &lt;!-- Implemented by Composite3 --&gt;
+        &lt;implementation.composite name=<SPAN class="code-quote">&quot;sample:Composite3&quot;</SPAN>/&gt;
+
+        &lt;!-- Wired to ComponentA --&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;Reference1&quot;</SPAN> target=<SPAN class="code-quote">&quot;ComponentA&quot;</SPAN>/&gt;
+
+        &lt;property name=<SPAN class="code-quote">&quot;Property1&quot;</SPAN>&gt;ABC&lt;/property&gt;
+    &lt;/component&gt;
+
+    &lt;!-- ComponentB.Service1 is promoted --&gt;
+    &lt;service name=<SPAN class="code-quote">&quot;Service1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ComponentB/Service1&quot;</SPAN> /&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<DIV class="code panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Composite2</B></DIV><DIV class="codeContent panelContent" style="background-color: #ffffff;">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http://sample&quot;</SPAN> xmlns:sample=<SPAN class="code-quote">&quot;http://sample&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;Composite2&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentC&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.ComponentAImpl&quot;</SPAN> /&gt;
+
+        &lt;!-- Wired to ComponentD.Service1 --&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;Reference1&quot;</SPAN> target=<SPAN class="code-quote">&quot;ComponentD/Service1&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentD&quot;</SPAN>&gt;
+        &lt;!-- Implemented by Composite3 --&gt;
+        &lt;implementation.composite name=<SPAN class="code-quote">&quot;sample:Composite3&quot;</SPAN> /&gt;
+
+        &lt;!-- The property value is <SPAN class="code-quote">&quot;XYZ&quot;</SPAN> --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;Property1&quot;</SPAN>&gt;XYZ&lt;/property&gt;
+    &lt;/component&gt;
+
+    &lt;!-- ComponentD.Reference1 is promoted --&gt;
+    &lt;reference name=<SPAN class="code-quote">&quot;Reference1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ComponentD/Reference1&quot;</SPAN> /&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<DIV class="code panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Composite3</B></DIV><DIV class="codeContent panelContent" style="background-color: #ffffff;">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http://sample&quot;</SPAN> xmlns:sample=<SPAN class="code-quote">&quot;http://sample&quot;</SPAN>
+</SPAN>    xmlns:xsd=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema&quot;</SPAN> name=<SPAN class="code-quote">&quot;Composite3&quot;</SPAN>&gt;
+</SPAN>
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentE&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.ComponentEImpl&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;Reference1&quot;</SPAN> target=<SPAN class="code-quote">&quot;ComponentF/Service1&quot;</SPAN> /&gt;
+
+        &lt;!-- The property is from the composite Property1 --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;Property1&quot;</SPAN> source=<SPAN class="code-quote">&quot;$Property1&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ComponentF&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.ComponentFImpl&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;Service1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ComponentE/Service1&quot;</SPAN> /&gt;
+
+    &lt;reference name=<SPAN class="code-quote">&quot;Reference1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ComponentF/Reference1&quot;</SPAN>&gt;
+        &lt;binding.sca /&gt;
+    &lt;/reference&gt;
+
+    &lt;property name=<SPAN class="code-quote">&quot;Property1&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;123&lt;/property&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>1) Two components are implemented by the same composite<BR>
+&nbsp;<BR>
+Path a: Composite1.ComponentB is implemented by Composite3<BR>
+Path b: Composite2.ComponentD is implemented by Composite3<BR>
+&nbsp;<BR>
+The service/reference can be promoted to different things:<BR>
+&nbsp;<BR>
+a:&nbsp;the final target for the ComponentF.Reference1 is Composite1.ComponentA<BR>
+b:&nbsp;the final target for the ComponentF.Reference1 is Composite1.Reference1 (pointing to an external service)<BR>
+&nbsp;<BR>
+The property can be set to different value following different composition path:<BR>
+&nbsp;<BR>
+a: Composite3.ComponentE.Property1 is overrided by Composite1.ComponentB.Property1 (say value=&quot;ABC&quot;)<BR>
+b:&nbsp;Composite3.ComponentE.Property1 is overrided by Composite2.ComponentD.Property1 (say value=&quot;XYZ&quot;)<BR>
+&nbsp;<BR>
+To represent the fully-configured components, we need to clone the model for Composite3 for Path a and b so that it can be used to hold different resolved values.</P>
+
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Runtime Wires</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>Hi,</P>
+
+<P>I'm trying to indentify all the paths of SCA component interactions which <BR>
+require to have runtime wires/invocation chains.</P>
+
+<P>By the SCA spec, there are three cases for the wiring:</P>
+
+<P>1) Component.Reference (A.ref1) -<DEL>is wired to</DEL>-&gt; Component.Service (B.svc1)<BR>
+--------------------------------------------------------------------------------------------------<BR>
+1.1) If both the service and reference are defined by non-composite <BR>
+components, then the runtime wire is as simple as A.ref1--&gt;B.svc1.</P>
+
+<P>1.2) If the service is defined on a composite component, then it can be <BR>
+further resolved to the orginal atomic component service following the <BR>
+service promotion chain.</P>
+
+<P>For example, A.ref1 --&gt; B.svc1 (B is implemented by another composite and <BR>
+B.svc1 promotes C.svc1), then the runtime wire will be: A.ref1 --&gt; C.svc1</P>
+
+<P>1.3) If the reference is defined on a composite component, then it can be <BR>
+further resolved to the orginal atomic component reference following the <BR>
+reference promotion chain.</P>
+
+<P>For example, A.ref1 --&gt; B.svc1 (A is implemented by another composite and <BR>
+A.ref1 promotes C.ref1), then the runtime wire will be: C.ref1 --&gt; B.svc1</P>
+
+<P>2) Composite.Reference (Composite1.ref1) -<DEL>promotes</DEL>-&gt; Component.Reference <BR>
+(B.ref1)<BR>
+-----------------------------------------------------------------------------------------------------------------<BR>
+If Composite1 is the top-level composite, and the B is a non-composite <BR>
+component, then the runtime wire will be: B.ref1 --&gt; Composite1.ref1</P>
+
+<P>If Composite1 is used to implement a component A in Composite2, then we need <BR>
+to futher check if A.ref1 is promoted or wired until we hit the end of the <BR>
+promotion chain. The final target will be either a composite reference or a <BR>
+component service that the out-most reference is wired to. For example, if <BR>
+A.ref1 is wired to D.svc1 in Composite2, then the runtime wire is B.ref1 --&gt; <BR>
+D.svc1. If A.ref1 is promoted by Composite2.ref1, then the runtime wire is <BR>
+B.ref1 --&gt; Composite2.ref1.</P>
+
+<P>If B is a composite component, then we need to find out the final component <BR>
+reference that B.ref1 promotes. For example, it promotes D.ref1, then the <BR>
+runtime wire is D.ref1 --&gt; C.ref1</P>
+
+<P>3) Composite.Service (Composite1.svc1) -<DEL>promotes</DEL>-&gt; Component.Service <BR>
+(A.svc1)<BR>
+-----------------------------------------------------------------------------------------------------------<BR>
+The source will be the outmost service on the promotion chain.  For example, <BR>
+if Composite2.svc1 promotes B.svc1 and B is implemented by Composite1, then <BR>
+it is Composite2.svc1.</P>
+
+<P>The target will be the innermost service on the promotion chain. For <BR>
+example, if A is implemented by Composite3 and Composite3.svc1 promotes <BR>
+C.svc1, then it is C.svc1.</P>
+
+<UL>
+	<LI>Please note, due to the spec limitation, the composite service cannot<BR>
+promote a composite reference directly.</LI>
+</UL>
+
+
+<P>Based on the above scenarios, it seems that we can create runtime wires <BR>
+using the following algorithm (assuming multiplicity = 1..1). The key is to <BR>
+get a final list of targets and selected bindings.</P>
+
+<P>1) Runtime wire for references: For each of the references (r1) on <BR>
+non-composite components, find the outmost reference (r0) on the reference <BR>
+promotion chain. Then get the targets and selected bindings from r0. If SCA <BR>
+binding is used for a target, it can be further optimized to use the <BR>
+orginally promoted component service. The runtime wire should be created <BR>
+between the r1 and a target (either a component service with SCA binding or <BR>
+a reference binding) from r0.</P>
+
+<P>2) Runtime wire for service promotions: For each of the service1 (s1) on <BR>
+non-composite components, find the outmost service (s0, can be the same as <BR>
+s1) on the service promotion chain. Create a runtime wire between the <BR>
+selected binding of s0 and the component that defines s1. (Can we assume <BR>
+that s1 is always local to s0?)</P>
+
+<P>The service/reference promotions make the picture complicated. I hope my <BR>
+thought makes sense.</P>
+
+<P>Thanks,<BR>
+Raymond</P>
+</DIV></DIV>
+
+<DIV class="code panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Runtime Context Interfaces</B></DIV><DIV class="codeContent panelContent" style="background-color: #ffffff;">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> RuntimeContext&lt;M&gt; <SPAN class="code-keyword">extends</SPAN> Lifecycle {
+    /**
+     * Create an intercetor <SPAN class="code-keyword">for</SPAN> the model in the invocation chain. For a reference binding,
+     * the interceptor is responsible to make the outbound invocation over the binding protocol.
+     * For a service binding, the interceptor is responsible to dispatch the incoming call to
+     * the target component service that the service promotes. For a component implementation,
+     * the interceptor will be responsible <SPAN class="code-keyword">for</SPAN> calling the implementation logic <SPAN class="code-keyword">for</SPAN> the given
+     * component.
+     * 
+     * @param model The service that defines the binding
+     * @param operation The operation that the interceptor will handle
+     * @param isCallback A flag to tell <SPAN class="code-keyword">if</SPAN> the operation is <SPAN class="code-keyword">for</SPAN> the callback
+     * @<SPAN class="code-keyword">return</SPAN> An interceptor that handles the invocation logic, <SPAN class="code-keyword">null</SPAN> should be returned <SPAN class="code-keyword">if</SPAN> no 
+     * interceptor is required
+     */
+    Interceptor createInterceptor(M model, Operation operation, <SPAN class="code-object">boolean</SPAN> isCallback);
+    
+    /**
+     * Get the effective <SPAN class="code-keyword">interface</SPAN> contract imposed by the binding or implementation. For
+     * example, it will be <SPAN class="code-keyword">interface</SPAN> contract introspected from the WSDL portType used by the
+     * endpoint <SPAN class="code-keyword">for</SPAN> a WebService binding.
+     * @param model The model object
+     * 
+     * @<SPAN class="code-keyword">return</SPAN> The effective <SPAN class="code-keyword">interface</SPAN> contract
+     */
+    InterfaceContract getEffectiveInterfaceContract(M model);
+}
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ReferenceBindingContext <SPAN class="code-keyword">extends</SPAN> RuntimeContext&lt;Reference&gt; {
+    /**
+     * @param wire
+     */
+    void setRuntimeWire(RuntimeWire wire);
+    /**
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    RuntimeWire getWire();    
+}
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ServiceBindingContext <SPAN class="code-keyword">extends</SPAN> RuntimeContext&lt;Service&gt; {
+    /**
+     * @param wire
+     */
+    void setRuntimeWire(RuntimeWire wire);
+    /**
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    RuntimeWire getWire();    
+}
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ImplementationContext <SPAN class="code-keyword">extends</SPAN> RuntimeContext&lt;Component&gt; {
+}
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-runtimes-menu.html b/site/trunk/site-publish/java-sca-runtimes-menu.html
new file mode 100644
index 0000000000..e5f167c560
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-runtimes-menu.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Runtimes Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47704">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-runtimes.html" title="Java SCA Runtimes">Java SCA Runtimes</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Runtimes Menu">Java SCA Runtimes Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="JavaSCARuntimesMenu-Runtimes"></A>Runtimes</H3>
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Standalone%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Standalone</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=OSGi%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">OSGi</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JEE%20App%20Server%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">JEE App Server</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Servlet%20Engine%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Servlet Engine</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Maven%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Maven</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-runtimes.html b/site/trunk/site-publish/java-sca-runtimes.html
new file mode 100644
index 0000000000..e4a044964a
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-runtimes.html
@@ -0,0 +1,125 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Runtimes</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47703">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Runtimes">Java SCA Runtimes</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H3><A name="JavaSCARuntimes-Runtimes"></A>Runtimes</H3>
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Standalone%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Standalone</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=OSGi%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">OSGi</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JEE%20App%20Server%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">JEE App Server</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Servlet%20Engine%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Servlet Engine</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Maven%20Runtime&linkCreation=true&fromPageId=47704" class="createlink">Maven</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+<H3><A name="JavaSCARuntimes-Runtimes"></A>Runtimes</H3>
+
+<P>The kernel may be provisioned to a variety of host environments, including a Standalone runtime, and OSGi container, a Servlet Engine or a JEE application server. We also provide a Maven runtime for integration testing. </P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-subproject.data/junk.jpg b/site/trunk/site-publish/java-sca-subproject.data/junk.jpg
new file mode 100644
index 0000000000..5331968e0e
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/junk.jpg
diff --git a/site/trunk/site-publish/java-sca-subproject.data/junk.jpg.jpeg b/site/trunk/site-publish/java-sca-subproject.data/junk.jpg.jpeg
new file mode 100644
index 0000000000..c8ea4d18d8
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/junk.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg b/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg
new file mode 100644
index 0000000000..28fec80278
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg
diff --git a/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg.jpeg b/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg.jpeg
new file mode 100644
index 0000000000..1dc5c1d808
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/junk2.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg b/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg
new file mode 100644
index 0000000000..2c7a85b0c2
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg
diff --git a/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg.jpeg b/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg.jpeg
new file mode 100644
index 0000000000..bf56a9fcb0
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.data/tuscanylogo.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-subproject.html b/site/trunk/site-publish/java-sca-subproject.html
new file mode 100644
index 0000000000..7ccd708041
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-subproject.html
@@ -0,0 +1,131 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SCA Subproject : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47529">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Subproject">Java SCA Subproject</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="java-sca-architecture-guide.html" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-developer-guide.html" title="SCA Java Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="JavaSCASubproject-TuscanySCAJava"></A>Tuscany SCA Java</H1>
+
+<P>Tuscany Java SCA provides the infrastructure to develop and run SCA based applications. At the very high level, Java SCA can be divided into core and extensions. The core supports the SCA assembly model, Tuscany value-add features and simple extension point to add extensions. Tuscany Java SCA is designed to be embedded in, or provisioned to, a number of different host environments.</P>
+
+<P>Tuscany SCA Java extension points allow any binding type, component implementation (programming model), policy and data binding to be easily added to it. The Tuscany community has contributed the extensions that are shown below. An extension becomes available for the latest Kernel release as volunteers test and enhance the extension to work with the latest release. </P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Bindings</TH>
+<TH class="confluenceTh">Component Implementations</TH>
+<TH class="confluenceTh">Data Bindings - for handling data </TH>
+</TR>
+<TR>
+<TD class="confluenceTd">Apache Axis2<BR>
+Celtix (this is obsolete since Apache CXF should replace it)<BR>
+JMS (tested with Apache ActiveMQ)<BR>
+JSON-RPC </TD>
+<TD class="confluenceTd">Java components (as described in the SCA Java C&amp;I spec)<BR>
+Spring assemblies<BR>
+Scripting with JSR 223<BR>
+JavaScript<BR>
+Groovy<BR>
+Ruby<BR>
+BPEL (a prototype using Apache ODE)</TD>
+<TD class="confluenceTd">JAXB<BR>
+SDO<BR>
+Axiom<BR>
+Castor<BR>
+XMLBeans</TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The</SUB> <SUB><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow"><SUB>Apache Software Foundation (ASF)</SUB><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></SUB><SUB>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sca-tools.data/SCA Tooling.ppt b/site/trunk/site-publish/java-sca-tools.data/SCA Tooling.ppt
new file mode 100644
index 0000000000..2bc3c1b147
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-tools.data/SCA Tooling.ppt
diff --git a/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG b/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG
new file mode 100644
index 0000000000..f9fdbae80d
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG
diff --git a/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG.jpeg b/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG.jpeg
new file mode 100644
index 0000000000..3dd33ffeb0
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-tools.data/SCACompositeDesigner.PNG.jpeg
diff --git a/site/trunk/site-publish/java-sca-tools.html b/site/trunk/site-publish/java-sca-tools.html
new file mode 100644
index 0000000000..1d3110b062
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-tools.html
@@ -0,0 +1,172 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA Tools</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=81337">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject-menu.html" title="SCA Java Subproject Menu">SCA Java Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA Tools">Java SCA Tools</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="JavaSCATools-ToolsforSCA"></A>Tools for SCA</H1>
+
+<P>Purpose of this page is to share with the Tuscany community information about available open source SCA tools.</P>
+
+<H2><A name="JavaSCATools-EclipseSOAToolsPlatform%28STP%29"></A>Eclipse SOA Tools Platform (STP)</H2>
+
+<P>The <A href="http://www.eclipse.org/stp/" class="external-link" rel="nofollow">Eclipse SOA Tools Platform(ST)</A> aims to build frameworks and tools that enable the design, configuration, assembly, deployment, monitoring, and management of software designed around a Service Oriented Architecture (SOA).</P>
+
+<P>The <A href="http://www.eclipse.org/stp/sca/index.php" class="external-link" rel="nofollow">STP/SCA sub project </A> provides a set of tools for the Service Component Architecture (SCA).</P>
+
+<H3><A name="JavaSCATools-STP%2FSCAsubproject%3ASCACompositeDesigner"></A>STP/SCA subproject: SCA Composite Designer</H3>
+
+<P>The SCA Composite Designer is an Eclipse graphical development environment for the construction of SCA composite assemblies. The designer supports Tuscany elements like RMI binding or Script implementation. It works with Tuscany 1.1, and it's planned to support Tuscany 1.2.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="java-sca-tools.data/SCACompositeDesigner.PNG" style="border: 0px solid black"></SPAN></P>
+
+
+<P>In <A href="http://www.eclipse.org/stp/sca/index.php" class="external-link" rel="nofollow">STP/SCA sub project </A>  web page, you can find a tutorial named &quot;First Steps with the SCA Composite Designer&quot;. You will learn how to build and run your first SCA application in 20 minutes! The tutorial addresses the following points:</P>
+
+<UL>
+	<LI>How to install STP/SCA plugins and Apache Tuscany,</LI>
+	<LI>How to define an SCA assembly with the SCA Composite Designer,</LI>
+	<LI>How to refine properties in an SCA assembly,</LI>
+	<LI>How to define an SCA assembly with different implementation technologies,</LI>
+	<LI>How to define an RMI binding,</LI>
+	<LI>How to run and test SCA assemblies with Tuscany.</LI>
+</UL>
+
+
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The</SUB> <SUB><A href="http://www.apache.org/" class="external-link" rel="nofollow"><SUB>Apache Software Foundation (ASF)</SUB></A></SUB>&#126;, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.&#126; <TD class="confluenceTd" valign="top"></TD><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg b/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg
new file mode 100644
index 0000000000..28f1a106cc
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg
diff --git a/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg.jpeg b/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg.jpeg
new file mode 100644
index 0000000000..e7a34f439a
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-user-guide.data/java_imp.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca-user-guide.html b/site/trunk/site-publish/java-sca-user-guide.html
new file mode 100644
index 0000000000..3aad5f717f
--- /dev/null
+++ b/site/trunk/site-publish/java-sca-user-guide.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Java SCA User Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54122">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA User Guide">Java SCA User Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>server for&nbsp;SOA </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/java-sca.data/Extensions2.jpg b/site/trunk/site-publish/java-sca.data/Extensions2.jpg
new file mode 100644
index 0000000000..5331968e0e
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/Extensions2.jpg
diff --git a/site/trunk/site-publish/java-sca.data/Extensions2.jpg.jpeg b/site/trunk/site-publish/java-sca.data/Extensions2.jpg.jpeg
new file mode 100644
index 0000000000..c8ea4d18d8
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/Extensions2.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca.data/junk.jpg b/site/trunk/site-publish/java-sca.data/junk.jpg
new file mode 100644
index 0000000000..5331968e0e
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/junk.jpg
diff --git a/site/trunk/site-publish/java-sca.data/junk.jpg.jpeg b/site/trunk/site-publish/java-sca.data/junk.jpg.jpeg
new file mode 100644
index 0000000000..c8ea4d18d8
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/junk.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca.data/junk2.jpg b/site/trunk/site-publish/java-sca.data/junk2.jpg
new file mode 100644
index 0000000000..28fec80278
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/junk2.jpg
diff --git a/site/trunk/site-publish/java-sca.data/junk2.jpg.jpeg b/site/trunk/site-publish/java-sca.data/junk2.jpg.jpeg
new file mode 100644
index 0000000000..1dc5c1d808
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.data/junk2.jpg.jpeg
diff --git a/site/trunk/site-publish/java-sca.html b/site/trunk/site-publish/java-sca.html
new file mode 100644
index 0000000000..b25c2380a8
--- /dev/null
+++ b/site/trunk/site-publish/java-sca.html
@@ -0,0 +1,195 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Java SCA</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Java SCA">Java SCA</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Java SCA</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47529">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47529">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47529">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47529">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47529">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47529">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47529&originalId=51529">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="JavaSCA-General"></A>General</H4>
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<A href="whats-new-sca-java.html" title="What's New SCA JAVA">What's new?</A></P>
+
+<H4><A name="JavaSCA-Guides"></A>Guides</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20User%20Guide&linkCreation=true&fromPageId=47581" title="Create Page: Java SCA User Guide" class="createlink">User Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="java-sca-developer-guide.html" title="Java SCA Developer Guide">Developer Guide</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Guide&linkCreation=true&fromPageId=47581" title="Create Page: Java SCA Extension Guide" class="createlink">Extension Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="java-sca-architecture-overview.html" title="Java SCA Architecture Overview">Architecture Guide</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="JavaSCA-Development"></A>Development</H4>
+<P><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-development.html" title="SCA Java Development">Get Involved</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+<H3><A name="JavaSCA-JavaSCASubproject"></A>Java SCA Subproject </H3>
+
+<P>Tuscany Java SCA provides the infrastructure to develop and run SCA based applications. At the very high level, Java SCA can be divided into a core kernel and extensions. The kernel supports the SCA assembly model, Tuscany value-add features and simple extension point to add extensions. The kernel is designed to be embedded in, or provisioned to, a number of different host environments.</P>
+
+<P>Tuscany extension points allow any binding type, component implementation (programming model), policy and data binding to be easily added to Tuscany. The Tuscany community has contributed the extensions that are shown below. An extension becomes available for the latest Kernel release as volunteers test and enhance the extension to work with the latest release.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"><FONT color="#0099cc"> Bindings - used for services and references</FONT></TH>
+</TR>
+</TBODY></TABLE>
+<P>Apache Axis2<BR>
+Celtix (this is obsolete since Apache CXF should replace it)<BR>
+JMS (tested with Apache ActiveMQ)<BR>
+JSON-RPC</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"><FONT color="#0099cc">Component Implementations</FONT></TH>
+</TR>
+</TBODY></TABLE>
+<P>Java components (as described in the SCA Java C&amp;I spec)<BR>
+Spring assemblies<BR>
+Scripting with JSR 223<BR>
+JavaScript<BR>
+Groovy<BR>
+Ruby<BR>
+BPEL (a prototype using Apache ODE)</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"><FONT color="#0099cc">Data Bindings - for handling data</FONT></TH>
+</TR>
+</TBODY></TABLE>
+<P>JAXB<BR>
+SDO<BR>
+Axiom<BR>
+Caster<BR>
+XMLBeans</P></TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The</SUB> <SUB><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow"><SUB>Apache Software Foundation (ASF)</SUB><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></SUB><SUB>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">Tuscany SCA Java - FAQ</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="sca-java-development.html" title="SCA Java Development">SCA Java Development</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/java-sdo-menu.html b/site/trunk/site-publish/java-sdo-menu.html
new file mode 100644
index 0000000000..9d1aa9aef7
--- /dev/null
+++ b/site/trunk/site-publish/java-sdo-menu.html
@@ -0,0 +1,92 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Java SDO Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55317">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="sdo.html" title="SDO">SDO</A>&nbsp;&gt;&nbsp;<A href="" title="Java SDO Menu">Java SDO Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-java-user-guide.html" title="SDO Java User Guide">User Guide</A><BR>
+<A href="sdo-java-architecture-guide.html" title="SDO Java Architecture Guide">Architecture Guide</A><BR>
+<A href="developing-sdo-java.html" title="Developing SDO Java">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-source-code.html" title="SDO Java Source Code">Source Code</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg
new file mode 100644
index 0000000000..4495d70965
--- /dev/null
+++ b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg
diff --git a/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg.jpeg b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg.jpeg
new file mode 100644
index 0000000000..38fc5ca8d4
--- /dev/null
+++ b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.jpg.jpeg
diff --git a/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.pdf b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.pdf
new file mode 100644
index 0000000000..fdb744e154
--- /dev/null
+++ b/site/trunk/site-publish/javaone-demo.data/J1_BOF_01.pdf
diff --git a/site/trunk/site-publish/javaone-demo.html b/site/trunk/site-publish/javaone-demo.html
new file mode 100644
index 0000000000..5658566cd1
--- /dev/null
+++ b/site/trunk/site-publish/javaone-demo.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : JavaOne Demo</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54030">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="JavaOne Demo">JavaOne Demo</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><SPAN class="image-wrap" style=""><IMG src="javaone-demo.data/J1_BOF_01.jpg" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/javascaimplementationscript.html b/site/trunk/site-publish/javascaimplementationscript.html
new file mode 100644
index 0000000000..9200c6f453
--- /dev/null
+++ b/site/trunk/site-publish/javascaimplementationscript.html
@@ -0,0 +1,136 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Java+SCA+implementation.script : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+                <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55156">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Java+SCA+implementation.script">Java+SCA+implementation.script</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<A href="sca-java-whats-new.html" title="SCA Java Whats New">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-extension-guide.html" title="SCA Java Extension Guide">Extension Guide</A><BR>
+<A href="java-sca-architecture-guide.html" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development.html" title="SCA Java Development">Developer Guide</A><BR>
+<A href="java-sca-extension-developer-guide.html" title="Java SCA Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Java%2BSCA%2Bimplementation.script-%3Cimplementation.script%3E"></A>&lt;implementation.script&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports implementing SCA components in a wide variety of dynamic or scripting languages by using the &lt;implementation.script&gt; SCDL extension.</P>
+
+<P>Any language that supports the &quot;Scripting for Java&quot; APIs defined by JSR-223 is supported, this includes Groovy, JavaScript, JRuby, Jython, and many others.</P>
+
+<P>To use these languages the SCA assembly SCDL is extended with an &quot;implementation.script&quot; element which has the following options:</P>
+
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script [ script=<SPAN class="code-quote">&quot;&quot; | language=&quot;</SPAN>&quot; ] &gt;
+     [inline src]
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+<P>The source code for the script maybe defined in a seperate file pointed to by the 'script=' attribute, or the source code maybe embedded within the SCDL inline inside the &lt;implementation.script&gt; element.</P>
+
+<P>The 'language=' attribute defines the language of the program. The language attribute is optional when the source code is in a separate file in which case the file extension of the file is used to determine the language.</P>
+
+<H4><A name="Java%2BSCA%2Bimplementation.script-Someexamples%3A"></A>Some examples:</H4>
+
+
+<P>A Ruby program defined in a file 'myScript.rb' in a folder named 'test':</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script script=<SPAN class="code-quote">&quot;test/myScript.rb&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+
+
+<P>A JavaScript program defined inline:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;
+      function sayHello(name) {
+         <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;Hello &quot;</SPAN> + name;
+      }
+&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+
+<P>When using inline scripts which contain special characters such as XML markup you may need to enclose the source within a CDATA region, for example:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">&lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+      function sayHello(inXML) {
+         <SPAN class="code-keyword">return</SPAN> &lt;sayHelloResponse&gt;Hello { inXML..name }&lt;/sayHelloResponse&gt;;
+      }
+]]&gt;&lt;/implementation.script&gt;</PRE>
+</DIV></DIV>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/kernel-architecture.data/TuscanyJAVASCAM2.pdf b/site/trunk/site-publish/kernel-architecture.data/TuscanyJAVASCAM2.pdf
new file mode 100644
index 0000000000..aa2f5ffe41
--- /dev/null
+++ b/site/trunk/site-publish/kernel-architecture.data/TuscanyJAVASCAM2.pdf
diff --git a/site/trunk/site-publish/kernel-architecture.html b/site/trunk/site-publish/kernel-architecture.html
new file mode 100644
index 0000000000..fe03d602b3
--- /dev/null
+++ b/site/trunk/site-publish/kernel-architecture.html
@@ -0,0 +1,152 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Kernel Architecture</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-architecture-overview.html" title="Java SCA Architecture Overview">Java SCA Architecture Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Kernel Architecture">Kernel Architecture</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Kernel Architecture</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51356">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51356">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51356">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51356">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51356">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51356">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=51356&originalId=51501">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Architecture</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+This architecture guide reflects the state of Tuscany SCA Java kernel. </P>
+<UL>
+	<LI><A href="#KernelArchitecture-Structure" title="Structure on Kernel Architecture">Kernel Structure </A></LI>
+	<LI><A href="#KernelArchitecture-Mediator" title="Mediator on Kernel Architecture">Data Binding </A></LI>
+	<LI><A href="#KernelArchitecture-AboutModule1" title="About Module1 on Kernel Architecture">Add name Module1</A></LI>
+	<LI><SPAN class="nobr"><A href="sandbox-sca-java.data/TuscanyJAVASCA.pdf" title="Visit page outside Confluence" rel="nofollow">How it looked in M2 release?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+<BR clear="all">
+&nbsp;</LI>
+</UL>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="KernelArchitecture-"></A><A name="KernelArchitecture-Structure"></A><FONT color="#0099cc">Kernel Structure</FONT></H3>
+
+<P>The following diagram is a high level view of the kernel structure.<BR>
+<IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> this diagram needs to be fine tuned an is under discussion, but gives you an idea of the main modules in kernel. For example, the diagram shows the whole Tuscany instead of just the Kernel. As an example, runime block should not be shown as part of the Kernel.</P>
+
+<P><SPAN class="nobr"><A href="kernel-modulization-design-discussions.html" title="Visit page outside Confluence" rel="nofollow">Kernel-Structure<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H3><A name="KernelArchitecture-"></A><A name="KernelArchitecture-mediator"></A><FONT color="#0099cc">Data Binding </FONT></H3>
+
+<P>Data  provides transparent data mapping between different types of data that can be exchanged between caller of a service and the service itself given the format of the data that will be supplied by the client. Data Mediator will do this transformation given the following information:</P>
+<OL>
+	<LI>format of the data that can be consumed by the service</LI>
+	<LI>format of the data that will be sent by the client</LI>
+</OL>
+
+
+<P>You can find more detailed information about databinding at this <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/display/~rfeng/Tuscany%20Databinding" title="Visit page outside Confluence" rel="nofollow">link<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P></P>
+
+<H3><A name="KernelArchitecture-"></A><A name="KernelArchitecture-AboutModule1"></A><FONT color="#0099cc">Module 1</FONT></H3>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF
new file mode 100644
index 0000000000..bc8b2edf1b
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg
new file mode 100644
index 0000000000..538e132588
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Contribution Diagram.GIF.jpeg
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.data/Tuscany-Kernel.doc b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Tuscany-Kernel.doc
new file mode 100644
index 0000000000..3b8057b544
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.data/Tuscany-Kernel.doc
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg b/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg
new file mode 100644
index 0000000000..e7970a0d31
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg b/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg
new file mode 100644
index 0000000000..7b02fe8ae3
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg.jpeg
diff --git a/site/trunk/site-publish/kernel-modulization-design-discussions.html b/site/trunk/site-publish/kernel-modulization-design-discussions.html
new file mode 100644
index 0000000000..ecefd412b0
--- /dev/null
+++ b/site/trunk/site-publish/kernel-modulization-design-discussions.html
@@ -0,0 +1,124 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Kernel Modulization Design Discussions</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Kernel Modulization Design Discussions">Kernel Modulization Design Discussions</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Kernel Modulization Design Discussions</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50027">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50027">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=50027">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=50027">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=50027">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=50027">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Mar 29, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=50027&originalId=50376">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="KernelModulizationDesignDiscussions-ConceptualViewofKernelModulizationforDiscussion"></A>Conceptual View of Kernel Modulization for Discussion</H1>
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">A note from Raymond</B><BR><BR>
+I'm poor with colors but I'm trying to use the color to group the related modules.</TD></TR></TABLE>
+<P><IMG src="kernel-modulization-design-discussions.data/tuscany-kernel-modulization.jpg" align="absmiddle" border="0"></P>
+
+<P><SPAN class="nobr"><A href="kernel-modulization-design-discussions.data/Tuscany-Kernel.doc" title="Tuscany-Kernel.doc attached to Kernel Modulization Design Discussions">The diagram in Microsoft Word format<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/latest-release-apache-tuscany-data-access-service.html b/site/trunk/site-publish/latest-release-apache-tuscany-data-access-service.html
new file mode 100644
index 0000000000..7ba8df6d69
--- /dev/null
+++ b/site/trunk/site-publish/latest-release-apache-tuscany-data-access-service.html
@@ -0,0 +1,148 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Latest Release - Apache Tuscany Data Access Service : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=49424">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Latest Release - Apache Tuscany Data Access Service">Latest Release - Apache Tuscany Data Access Service</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H2><A name="LatestRelease-ApacheTuscanyDataAccessService-LatestRelease%3ARDBDASBeta1Release"></A>Latest Release: RDB DAS Beta1 Release  </H2>
+
+<P><B>Download <A href="das-downloads.html" title="DAS Downloads">RDB DAS Beta1 Release </A></B></P>
+
+<P>What's new in Apache Tuscany DAS beta1?</P>
+
+<UL>
+	<LI>Support for J2SE connections in DAS config using Driver Manager.</LI>
+	<LI>Added support for multiple database schemas in queries</LI>
+	<LI>Enhanced Optimistic Concurrency Control with overqualified updates</LI>
+	<LI>Multiple enhancements around ApplyChanges API</LI>
+	<LI>Enhanced support for MySQL</LI>
+	<LI>Enhanced Documentation: User, Developer and Architect guides as well as javadocs</LI>
+	<LI>Enhanced and new sample applications</LI>
+</UL>
+
+
+
+<H2><A name="LatestRelease-ApacheTuscanyDataAccessService-Previousreleasescontent"></A>Previous releases content </H2>
+<H3><A name="LatestRelease-ApacheTuscanyDataAccessService-DASM2ReleaseKeyfeatures"></A>DAS M2 Release - Key features  </H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>To download DAS M2 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+
+<H3><A name="LatestRelease-ApacheTuscanyDataAccessService-DASM1ReleaseKeyFeatures"></A>DAS M1 Release - Key Features</H3>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<P>To download DAS M1 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/latest-release-das-java-m2-release.html b/site/trunk/site-publish/latest-release-das-java-m2-release.html
new file mode 100644
index 0000000000..7173e1dccc
--- /dev/null
+++ b/site/trunk/site-publish/latest-release-das-java-m2-release.html
@@ -0,0 +1,129 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Latest Release - DAS Java M2 Release : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=49424">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-releases.html" title="DAS Java Releases">DAS Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="Latest Release - DAS Java M2 Release">Latest Release - DAS Java M2 Release</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H2><A name="LatestRelease-DASJavaM2Release-LatestReleaseDASM2Release"></A>Latest Release - DAS M2 Release  </H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph</LI>
+		<LI>Convention over configuration
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>To download DAS M2 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+
+<H2><A name="LatestRelease-DASJavaM2Release-DASM1ReleaseKeyFeatures"></A>DAS M1 Release - Key Features</H2>
+
+<P>Tuscany DAS is an implementation of a DAS RDB (relational database) with following key features :</P>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<P>To download DAS M1 Release go to <A href="das-downloads.html" title="DAS Downloads">DAS Downloads</A> page</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/ldap-das-architecture-guide.html b/site/trunk/site-publish/ldap-das-architecture-guide.html
new file mode 100644
index 0000000000..eceb353a6a
--- /dev/null
+++ b/site/trunk/site-publish/ldap-das-architecture-guide.html
@@ -0,0 +1,208 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : LDAP DAS Architecture Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51159">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="LDAP DAS Architecture Guide">LDAP DAS Architecture Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This content is retrieved from Ole Ersoy's Eclipse help plugin available at
+<A href="https://svn.apache.org/repos/asf/directory/sandbox/oersoy/guides/das.ldap.design.documentation" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/directory/sandbox/oersoy/guides/das.ldap.design.documentation</A></P>
+
+<DIV class="panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>DAS LDAP Design Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>*<A href="#LDAPDASArchitectureGuide-InitializingtheLDAPServers">Initializing the LDAP Servers</A><BR>
+  #Adding Required Server Partitions<BR>
+  #Adding a Partition/Suffix to ApacheDS&lt;/challenge&gt;<BR>
+  #Creating an EPackage ObjectClass Schema Entry&lt;/challenge&gt;</P>
+
+<P>*Initializing the DAS<BR>
+  **Loading the Generator Model<BR>
+  **Providing the DAS With an Initial Context<BR>
+  **Creating a Subcontext for the Model's EPackage</P>
+
+<P>*Writing DataGraph Metadata<BR>
+  **Creating Metadata OID Values<BR>
+  **Creating an LDAP Syntax Entry<BR>
+  **Creating an LDAP AttributeType Metadata Entry<BR>
+  **Creating an LDAP Metadata ObjectClass Entry<BR>
+  **Writing EPackage Metadata</P>
+
+<P>*Restoring DataGraph Metadata<BR>
+  **Creating the Model's EPackage<BR>
+  **Restoring EPackage State<BR>
+  **Setting the EPackage Namespace Prefix<BR>
+  **Setting the EPackage Namespace<BR>
+  **Obtaining the Name of the DataObject's EClassifier<BR>
+  **Creating a Named Instance of the DataObject's EClassifier<BR>
+  **Creating the EClassifier's EAttributes<BR>
+  **Getting the DataObject's Complex Properties's Metadata<BR>
+  **Adding the SDO Type's EAttributes<BR>
+  **Adding the SDO Type's EReferences</P>
+
+<P>*Writing a DataGraph<BR>
+  **Writing a DataGraph to ADS<BR>
+  **Creating an EReference Subcontext</P>
+
+<P>*Restoring a DataGraph<BR>
+  **Creating a DataObject Instance<BR>
+  **Setting the DataObject's Simple Properties<BR>
+  **Setting the DataObject's Complex Properties</P>
+
+<P>*Updating a DataGraph</P>
+
+<P>*Deleting a DataGraph</P>
+
+<P>*Prototype Setup<BR>
+  **Creating the Prototype Project<BR>
+  **Adding the EMF Dependencies to the Build</P>
+</DIV></DIV>
+
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-InitializingtheLDAPServers"></A><FONT color="#0099cc">Initializing the LDAP Servers</FONT></H1>
+<P>  #Adding Required Server Partitions<BR>
+  #Adding a Partition/Suffix to ApacheDS&lt;/challenge&gt;<BR>
+  #Creating an EPackage ObjectClass Schema Entry&lt;/challenge&gt;</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-InitializingtheDAS"></A><FONT color="#0099cc">Initializing the DAS</FONT></H1>
+<P>  **Loading the Generator Model<BR>
+  **Providing the DAS With an Initial Context<BR>
+  **Creating a Subcontext for the Model's EPackage</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-WritingDataGraphMetadata"></A><FONT color="#0099cc">Writing DataGraph Metadata</FONT></H1>
+<P>  **Creating Metadata OID Values<BR>
+  **Creating an LDAP Syntax Entry<BR>
+  **Creating an LDAP AttributeType Metadata Entry<BR>
+  **Creating an LDAP Metadata ObjectClass Entry<BR>
+  **Writing EPackage Metadata</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-RestoringDataGraphMetadata"></A><FONT color="#0099cc">Restoring DataGraph Metadata</FONT></H1>
+<P>  **Creating the Model's EPackage<BR>
+  **Restoring EPackage State<BR>
+  **Setting the EPackage Namespace Prefix<BR>
+  **Setting the EPackage Namespace<BR>
+  **Obtaining the Name of the DataObject's EClassifier<BR>
+  **Creating a Named Instance of the DataObject's EClassifier<BR>
+  **Creating the EClassifier's EAttributes<BR>
+  **Getting the DataObject's Complex Properties's Metadata<BR>
+  **Adding the SDO Type's EAttributes<BR>
+  **Adding the SDO Type's EReferences</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-WritingaDataGraph"></A><FONT color="#0099cc">Writing a DataGraph</FONT></H1>
+<P>  **Writing a DataGraph to ADS<BR>
+  **Creating an EReference Subcontext</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-RestoringaDataGraph"></A><FONT color="#0099cc">Restoring a DataGraph</FONT></H1>
+<P>  **Creating a DataObject Instance<BR>
+  **Setting the DataObject's Simple Properties<BR>
+  **Setting the DataObject's Complex Properties</P>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-UpdatingaDataGraph"></A><FONT color="#0099cc">Updating a DataGraph</FONT></H1>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-DeletingaDataGraph"></A><FONT color="#0099cc">Deleting a DataGraph</FONT></H1>
+
+<H1><A name="LDAPDASArchitectureGuide-"></A><A name="LDAPDASArchitectureGuide-PrototypeSetup"></A><FONT color="#0099cc">Prototype Setup</FONT></H1>
+<P>  **Creating the Prototype Project<BR>
+  **Adding the EMF Dependencies to the Build</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/ldap-das-java.html b/site/trunk/site-publish/ldap-das-java.html
new file mode 100644
index 0000000000..10aa021755
--- /dev/null
+++ b/site/trunk/site-publish/ldap-das-java.html
@@ -0,0 +1,99 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>LDAP DAS Java : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51061">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="LDAP DAS Java">LDAP DAS Java</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="LDAPDASJava-General"></A>General</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=51061" title="Create Page: LDAP DAS Java - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS%20JAVA&linkCreation=true&fromPageId=51061" title="Create Page: What's New in DAS JAVA" class="createlink">What's new?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="LDAPDASJava-Guides"></A>Guides</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20Java%20User%20Guide&linkCreation=true&fromPageId=51061" title="Create Page: LDAP DAS Java User Guide" class="createlink">User Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20Java%20Architecture%20Guide&linkCreation=true&fromPageId=51061" title="Create Page: LDAP DAS Java Architecture Guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20Java%20Doc&linkCreation=true&fromPageId=51061" title="Create Page: LDAP DAS Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="LDAPDASJava-Development"></A>Development</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Source%20Code&linkCreation=true&fromPageId=51061" title="Create Page: Source Code" class="createlink">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Get Involved</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+
+<H4><A name="LDAPDASJava-WhatisLDAPDataAccessService%3F"></A>What is LDAP Data Access Service?</H4>
+
+<P>This project is in progress. Please see mailing list for more detail.</P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/ldap-java-das.html b/site/trunk/site-publish/ldap-java-das.html
new file mode 100644
index 0000000000..989cf4c5a4
--- /dev/null
+++ b/site/trunk/site-publish/ldap-java-das.html
@@ -0,0 +1,152 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>LDAP JAVA DAS</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="LDAP JAVA DAS">LDAP JAVA DAS</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">LDAP JAVA DAS</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51061">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51061">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51061">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=51061">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51061">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=51061">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 09, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=51061&originalId=51178">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="LDAPJAVADAS-General"></A>General</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=LDAP%20DAS%20-%20FAQ&linkCreation=true&fromPageId=51061" title="Create Page: LDAP DAS - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das.html" title="What's New in DAS">What's new?</A></P>
+
+<H4><A name="LDAPJAVADAS-Guides"></A>Guides</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=User%20Guide&linkCreation=true&fromPageId=51061" title="Create Page: User Guide" class="createlink">User Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="ldap-das-architecture-guide.html" title="LDAP DAS Architecture Guide">Architecture Guide</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=51061" title="Create Page: Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="LDAPJAVADAS-Development"></A>Development</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Source%20Code&linkCreation=true&fromPageId=51061" title="Create Page: Source Code" class="createlink">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-project.html" title="DAS Java Project">Get Involved</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+
+<H4><A name="LDAPJAVADAS-WhatisLDAPDataAccessService%3F"></A>What is LDAP Data Access Service?</H4>
+
+<P>This project is in progress. Please see mailing list for more detail.</P>
+</TD></TR></TBODY></TABLE>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="ldap-das-architecture-guide.html" title="LDAP DAS Architecture Guide">LDAP DAS Architecture Guide</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/license.html b/site/trunk/site-publish/license.html
new file mode 100644
index 0000000000..34562d691b
--- /dev/null
+++ b/site/trunk/site-publish/license.html
@@ -0,0 +1,1559 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : License</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47503">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="License">License</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<P>                                 Apache License<BR>
+                           Version 2.0, January 2004<BR>
+                        <A href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">http://www.apache.org/licenses/</A></P>
+
+<P>   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</P>
+
+<P>   1. Definitions.</P>
+
+<P>      &quot;License&quot; shall mean the terms and conditions for use, reproduction,<BR>
+      and distribution as defined by Sections 1 through 9 of this document.</P>
+
+<P>      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by<BR>
+      the copyright owner that is granting the License.</P>
+
+<P>      &quot;Legal Entity&quot; shall mean the union of the acting entity and all<BR>
+      other entities that control, are controlled by, or are under common<BR>
+      control with that entity. For the purposes of this definition,<BR>
+      &quot;control&quot; means <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> the power, direct or indirect, to cause the<BR>
+      direction or management of such entity, whether by contract or<BR>
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the<BR>
+      outstanding shares, or (iii) beneficial ownership of such entity.</P>
+
+<P>      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity<BR>
+      exercising permissions granted by this License.</P>
+
+<P>      &quot;Source&quot; form shall mean the preferred form for making modifications,<BR>
+      including but not limited to software source code, documentation<BR>
+      source, and configuration files.</P>
+
+<P>      &quot;Object&quot; form shall mean any form resulting from mechanical<BR>
+      transformation or translation of a Source form, including but<BR>
+      not limited to compiled object code, generated documentation,<BR>
+      and conversions to other media types.</P>
+
+<P>      &quot;Work&quot; shall mean the work of authorship, whether in Source or<BR>
+      Object form, made available under the License, as indicated by a<BR>
+      copyright notice that is included in or attached to the work<BR>
+      (an example is provided in the Appendix below).</P>
+
+<P>      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object<BR>
+      form, that is based on (or derived from) the Work and for which the<BR>
+      editorial revisions, annotations, elaborations, or other modifications<BR>
+      represent, as a whole, an original work of authorship. For the purposes<BR>
+      of this License, Derivative Works shall not include works that remain<BR>
+      separable from, or merely link (or bind by name) to the interfaces of,<BR>
+      the Work and Derivative Works thereof.</P>
+
+<P>      &quot;Contribution&quot; shall mean any work of authorship, including<BR>
+      the original version of the Work and any modifications or additions<BR>
+      to that Work or Derivative Works thereof, that is intentionally<BR>
+      submitted to Licensor for inclusion in the Work by the copyright owner<BR>
+      or by an individual or Legal Entity authorized to submit on behalf of<BR>
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;<BR>
+      means any form of electronic, verbal, or written communication sent<BR>
+      to the Licensor or its representatives, including but not limited to<BR>
+      communication on electronic mailing lists, source code control systems,<BR>
+      and issue tracking systems that are managed by, or on behalf of, the<BR>
+      Licensor for the purpose of discussing and improving the Work, but<BR>
+      excluding communication that is conspicuously marked or otherwise<BR>
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;</P>
+
+<P>      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity<BR>
+      on behalf of whom a Contribution has been received by Licensor and<BR>
+      subsequently incorporated within the Work.</P>
+
+<P>   2. Grant of Copyright License. Subject to the terms and conditions of<BR>
+      this License, each Contributor hereby grants to You a perpetual,<BR>
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable<BR>
+      copyright license to reproduce, prepare Derivative Works of,<BR>
+      publicly display, publicly perform, sublicense, and distribute the<BR>
+      Work and such Derivative Works in Source or Object form.</P>
+
+<P>   3. Grant of Patent License. Subject to the terms and conditions of<BR>
+      this License, each Contributor hereby grants to You a perpetual,<BR>
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable<BR>
+      (except as stated in this section) patent license to make, have made,<BR>
+      use, offer to sell, sell, import, and otherwise transfer the Work,<BR>
+      where such license applies only to those patent claims licensable<BR>
+      by such Contributor that are necessarily infringed by their<BR>
+      Contribution(s) alone or by combination of their Contribution(s)<BR>
+      with the Work to which such Contribution(s) was submitted. If You<BR>
+      institute patent litigation against any entity (including a<BR>
+      cross-claim or counterclaim in a lawsuit) alleging that the Work<BR>
+      or a Contribution incorporated within the Work constitutes direct<BR>
+      or contributory patent infringement, then any patent licenses<BR>
+      granted to You under this License for that Work shall terminate<BR>
+      as of the date such litigation is filed.</P>
+
+<P>   4. Redistribution. You may reproduce and distribute copies of the<BR>
+      Work or Derivative Works thereof in any medium, with or without<BR>
+      modifications, and in Source or Object form, provided that You<BR>
+      meet the following conditions:</P>
+
+<P>      (a) You must give any other recipients of the Work or<BR>
+          Derivative Works a copy of this License; and</P>
+
+<P>      (b) You must cause any modified files to carry prominent notices<BR>
+          stating that You changed the files; and</P>
+
+<P>      (c) You must retain, in the Source form of any Derivative Works<BR>
+          that You distribute, all copyright, patent, trademark, and<BR>
+          attribution notices from the Source form of the Work,<BR>
+          excluding those notices that do not pertain to any part of<BR>
+          the Derivative Works; and</P>
+
+<P>      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its<BR>
+          distribution, then any Derivative Works that You distribute must<BR>
+          include a readable copy of the attribution notices contained<BR>
+          within such NOTICE file, excluding those notices that do not<BR>
+          pertain to any part of the Derivative Works, in at least one<BR>
+          of the following places: within a NOTICE text file distributed<BR>
+          as part of the Derivative Works; within the Source form or<BR>
+          documentation, if provided along with the Derivative Works; or,<BR>
+          within a display generated by the Derivative Works, if and<BR>
+          wherever such third-party notices normally appear. The contents<BR>
+          of the NOTICE file are for informational purposes only and<BR>
+          do not modify the License. You may add Your own attribution<BR>
+          notices within Derivative Works that You distribute, alongside<BR>
+          or as an addendum to the NOTICE text from the Work, provided<BR>
+          that such additional attribution notices cannot be construed<BR>
+          as modifying the License.</P>
+
+<P>      You may add Your own copyright statement to Your modifications and<BR>
+      may provide additional or different license terms and conditions<BR>
+      for use, reproduction, or distribution of Your modifications, or<BR>
+      for any such Derivative Works as a whole, provided Your use,<BR>
+      reproduction, and distribution of the Work otherwise complies with<BR>
+      the conditions stated in this License.</P>
+
+<P>   5. Submission of Contributions. Unless You explicitly state otherwise,<BR>
+      any Contribution intentionally submitted for inclusion in the Work<BR>
+      by You to the Licensor shall be under the terms and conditions of<BR>
+      this License, without any additional terms or conditions.<BR>
+      Notwithstanding the above, nothing herein shall supersede or modify<BR>
+      the terms of any separate license agreement you may have executed<BR>
+      with Licensor regarding such Contributions.</P>
+
+<P>   6. Trademarks. This License does not grant permission to use the trade<BR>
+      names, trademarks, service marks, or product names of the Licensor,<BR>
+      except as required for reasonable and customary use in describing the<BR>
+      origin of the Work and reproducing the content of the NOTICE file.</P>
+
+<P>   7. Disclaimer of Warranty. Unless required by applicable law or<BR>
+      agreed to in writing, Licensor provides the Work (and each<BR>
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,<BR>
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or<BR>
+      implied, including, without limitation, any warranties or conditions<BR>
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A<BR>
+      PARTICULAR PURPOSE. You are solely responsible for determining the<BR>
+      appropriateness of using or redistributing the Work and assume any<BR>
+      risks associated with Your exercise of permissions under this License.</P>
+
+<P>   8. Limitation of Liability. In no event and under no legal theory,<BR>
+      whether in tort (including negligence), contract, or otherwise,<BR>
+      unless required by applicable law (such as deliberate and grossly<BR>
+      negligent acts) or agreed to in writing, shall any Contributor be<BR>
+      liable to You for damages, including any direct, indirect, special,<BR>
+      incidental, or consequential damages of any character arising as a<BR>
+      result of this License or out of the use or inability to use the<BR>
+      Work (including but not limited to damages for loss of goodwill,<BR>
+      work stoppage, computer failure or malfunction, or any and all<BR>
+      other commercial damages or losses), even if such Contributor<BR>
+      has been advised of the possibility of such damages.</P>
+
+<P>   9. Accepting Warranty or Additional Liability. While redistributing<BR>
+      the Work or Derivative Works thereof, You may choose to offer,<BR>
+      and charge a fee for, acceptance of support, warranty, indemnity,<BR>
+      or other liability obligations and/or rights consistent with this<BR>
+      License. However, in accepting such obligations, You may act only<BR>
+      on Your own behalf and on Your sole responsibility, not on behalf<BR>
+      of any other Contributor, and only if You agree to indemnify,<BR>
+      defend, and hold each Contributor harmless for any liability<BR>
+      incurred by, or claims asserted against, such Contributor by reason<BR>
+      of your accepting any such warranty or additional liability.</P>
+
+<P>   END OF TERMS AND CONDITIONS</P>
+
+<P>   APPENDIX: How to apply the Apache License to your work.</P>
+
+<P>      To apply the Apache License to your work, attach the following<BR>
+      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;<BR>
+      replaced with your own identifying information. (Don't include<BR>
+      the brackets!)  The text should be enclosed in the appropriate<BR>
+      comment syntax for the file format. We also recommend that a<BR>
+      file or class name and description of purpose be included on the<BR>
+      same &quot;printed page&quot; as the copyright notice for easier<BR>
+      identification within third-party archives.</P>
+
+<P>   Copyright <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=yyyy&linkCreation=true&fromPageId=47503" class="createlink">yyyy</A> <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=name%20of%20copyright%20owner&linkCreation=true&fromPageId=47503" class="createlink">name of copyright owner</A></P>
+
+<P>   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);<BR>
+   you may not use this file except in compliance with the License.<BR>
+   You may obtain a copy of the License at</P>
+
+<P>       <A href="http://www.apache.org/licenses/LICENSE-2.0" class="external-link" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</A></P>
+
+<P>   Unless required by applicable law or agreed to in writing, software<BR>
+   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,<BR>
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<BR>
+   See the License for the specific language governing permissions and<BR>
+   limitations under the License.</P>
+
+
+<P>APACHE TUSCANY SUBCOMPONENTS: </P>
+
+<P>The Apache Tuscany distribution includes a number of subcomponents with<BR>
+separate copyright notices and license terms. Your use of the source<BR>
+code for the these subcomponents is subject to the terms and<BR>
+conditions of the following licenses. </P>
+
+<P>===============================================================================</P>
+
+<P>For the Eclipse Modeling Framework component and the Celtix binding:</P>
+
+<P>Eclipse Public License - v 1.0</P>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE<BR>
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF<BR>
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</P>
+
+<P>1. DEFINITIONS</P>
+
+<P>&quot;Contribution&quot; means:</P>
+
+<P>a) in the case of the initial Contributor, the initial code and<BR>
+documentation distributed under this Agreement, and<BR>
+b) in the case of each subsequent Contributor:</P>
+
+<P>i) changes to the Program, and</P>
+
+<P>ii) additions to the Program;</P>
+
+<P>where such changes and/or additions to the Program originate from and<BR>
+are distributed by that particular Contributor. A Contribution<BR>
+'originates' from a Contributor if it was added to the Program by such<BR>
+Contributor itself or anyone acting on such Contributor's behalf.<BR>
+Contributions do not include additions to the Program which: <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> are<BR>
+separate modules of software distributed in conjunction with the<BR>
+Program under their own license agreement, and (ii) are not derivative<BR>
+works of the Program.</P>
+
+<P>&quot;Contributor&quot; means any person or entity that distributes the Program.</P>
+
+<P>&quot;Licensed Patents &quot; mean patent claims licensable by a Contributor<BR>
+which are necessarily infringed by the use or sale of its Contribution<BR>
+alone or when combined with the Program.</P>
+
+<P>&quot;Program&quot; means the Contributions distributed in accordance with this <BR>
+Agreement.</P>
+
+<P>&quot;Recipient&quot; means anyone who receives the Program under this<BR>
+Agreement, including all Contributors.</P>
+
+<P>2. GRANT OF RIGHTS</P>
+
+<P>a) Subject to the terms of this Agreement, each Contributor hereby<BR>
+grants Recipient a non-exclusive, worldwide, royalty-free copyright<BR>
+license to reproduce, prepare derivative works of, publicly display,<BR>
+publicly perform, distribute and sublicense the Contribution of such<BR>
+Contributor, if any, and such derivative works, in source code and<BR>
+object code form.</P>
+
+<P>b) Subject to the terms of this Agreement, each Contributor hereby<BR>
+grants Recipient a non-exclusive, worldwide, royalty-free patent<BR>
+license under Licensed Patents to make, use, sell, offer to sell,<BR>
+import and otherwise transfer the Contribution of such Contributor, if<BR>
+any, in source code and object code form. This patent license shall<BR>
+apply to the combination of the Contribution and the Program if, at<BR>
+the time the Contribution is added by the Contributor, such addition<BR>
+of the Contribution causes such combination to be covered by the<BR>
+Licensed Patents. The patent license shall not apply to any other<BR>
+combinations which include the Contribution. No hardware per se is<BR>
+licensed hereunder.</P>
+
+<P>c) Recipient understands that although each Contributor grants the<BR>
+licenses to its Contributions set forth herein, no assurances are<BR>
+provided by any Contributor that the Program does not infringe the<BR>
+patent or other intellectual property rights of any other entity. Each<BR>
+Contributor disclaims any liability to Recipient for claims brought by<BR>
+any other entity based on infringement of intellectual property rights<BR>
+or otherwise. As a condition to exercising the rights and licenses<BR>
+granted hereunder, each Recipient hereby assumes sole responsibility<BR>
+to secure any other intellectual property rights needed, if any. For<BR>
+example, if a third party patent license is required to allow<BR>
+Recipient to distribute the Program, it is Recipient's responsibility<BR>
+to acquire that license before distributing the Program.</P>
+
+<P>d) Each Contributor represents that to its knowledge it has sufficient<BR>
+copyright rights in its Contribution, if any, to grant the copyright<BR>
+license set forth in this Agreement.</P>
+
+<P>3. REQUIREMENTS</P>
+
+<P>A Contributor may choose to distribute the Program in object code form<BR>
+under its own license agreement, provided that:</P>
+
+<P>a) it complies with the terms and conditions of this Agreement; and</P>
+
+<P>b) its license agreement:</P>
+
+<P>i) effectively disclaims on behalf of all Contributors all warranties<BR>
+and conditions, express and implied, including warranties or<BR>
+conditions of title and non-infringement, and implied warranties or<BR>
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P>ii) effectively excludes on behalf of all Contributors all liability<BR>
+for damages, including direct, indirect, special, incidental and<BR>
+consequential damages, such as lost profits;</P>
+
+<P>iii) states that any provisions which differ from this Agreement are<BR>
+offered by that Contributor alone and not by any other party; and</P>
+
+<P>iv) states that source code for the Program is available from such<BR>
+Contributor, and informs licensees how to obtain it in a reasonable<BR>
+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>a) it must be made available under this Agreement; and</P>
+
+<P>b) a copy of this Agreement must be included with each copy of the <BR>
+Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained<BR>
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its<BR>
+Contribution, if any, in a manner that reasonably allows subsequent<BR>
+Recipients to identify the originator of the Contribution.</P>
+
+<P>4. COMMERCIAL DISTRIBUTION</P>
+
+<P>Commercial distributors of software may accept certain<BR>
+responsibilities with respect to end users, business partners and the<BR>
+like. While this license is intended to facilitate the commercial use<BR>
+of the Program, the Contributor who includes the Program in a<BR>
+commercial product offering should do so in a manner which does not<BR>
+create potential liability for other Contributors. Therefore, if a<BR>
+Contributor includes the Program in a commercial product offering,<BR>
+such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend<BR>
+and indemnify every other Contributor (&quot;Indemnified Contributor&quot;)<BR>
+against any losses, damages and costs (collectively &quot;Losses&quot;) arising<BR>
+from claims, lawsuits and other legal actions brought by a third party<BR>
+against the Indemnified Contributor to the extent caused by the acts<BR>
+or omissions of such Commercial Contributor in connection with its<BR>
+distribution of the Program in a commercial product offering. The<BR>
+obligations in this section do not apply to any claims or Losses<BR>
+relating to any actual or alleged intellectual property infringement.<BR>
+In order to qualify, an Indemnified Contributor must: a) promptly<BR>
+notify the Commercial Contributor in writing of such claim, and b)<BR>
+allow the Commercial Contributor to control, and cooperate with the<BR>
+Commercial Contributor in, the defense and any related settlement<BR>
+negotiations. The Indemnified Contributor may participate in any such<BR>
+claim at its own expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial<BR>
+product offering, Product X. That Contributor is then a Commercial<BR>
+Contributor. If that Commercial Contributor then makes performance<BR>
+claims, or offers warranties related to Product X, those performance<BR>
+claims and warranties are such Commercial Contributor's responsibility<BR>
+alone. Under this section, the Commercial Contributor would have to<BR>
+defend claims against the other Contributors related to those<BR>
+performance claims and warranties, and if a court requires any other<BR>
+Contributor to pay any damages as a result, the Commercial Contributor<BR>
+must pay those damages.</P>
+
+<P>5. NO WARRANTY</P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS<BR>
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY<BR>
+KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY<BR>
+WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY<BR>
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely<BR>
+responsible for determining the appropriateness of using and<BR>
+distributing the Program and assumes all risks associated with its<BR>
+exercise of rights under this Agreement , including but not limited to<BR>
+the risks and costs of program errors, compliance with applicable<BR>
+laws, damage to or loss of data, programs or equipment, and<BR>
+unavailability or interruption of operations.</P>
+
+<P>6. DISCLAIMER OF LIABILITY</P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR<BR>
+ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,<BR>
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING<BR>
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF<BR>
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING<BR>
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR<BR>
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED<BR>
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P>7. GENERAL</P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under<BR>
+applicable law, it shall not affect the validity or enforceability of<BR>
+the remainder of the terms of this Agreement, and without further<BR>
+action by the parties hereto, such provision shall be reformed to the<BR>
+minimum extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity<BR>
+(including a cross-claim or counterclaim in a lawsuit) alleging that<BR>
+the Program itself (excluding combinations of the Program with other<BR>
+software or hardware) infringes such Recipient's patent(s), then such<BR>
+Recipient's rights granted under Section 2(b) shall terminate as of<BR>
+the date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it<BR>
+fails to comply with any of the material terms or conditions of this<BR>
+Agreement and does not cure such failure in a reasonable period of<BR>
+time after becoming aware of such noncompliance. If all Recipient's<BR>
+rights under this Agreement terminate, Recipient agrees to cease use<BR>
+and distribution of the Program as soon as reasonably practicable.<BR>
+However, Recipient's obligations under this Agreement and any licenses<BR>
+granted by Recipient relating to the Program shall continue and<BR>
+survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this Agreement,<BR>
+but in order to avoid inconsistency the Agreement is copyrighted and<BR>
+may only be modified in the following manner. The Agreement Steward<BR>
+reserves the right to publish new versions (including revisions) of<BR>
+this Agreement from time to time. No one other than the Agreement<BR>
+Steward has the right to modify this Agreement. The Eclipse Foundation<BR>
+is the initial Agreement Steward. The Eclipse Foundation may assign<BR>
+the responsibility to serve as the Agreement Steward to a suitable<BR>
+separate entity. Each new version of the Agreement will be given a<BR>
+distinguishing version number. The Program (including Contributions)<BR>
+may always be distributed subject to the version of the Agreement<BR>
+under which it was received. In addition, after a new version of the<BR>
+Agreement is published, Contributor may elect to distribute the<BR>
+Program (including its Contributions) under the new version. Except as<BR>
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives<BR>
+no rights or licenses to the intellectual property of any Contributor<BR>
+under this Agreement, whether expressly, by implication, estoppel or<BR>
+otherwise. All rights in the Program not expressly granted under this<BR>
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and<BR>
+the intellectual property laws of the United States of America. No<BR>
+party to this Agreement will bring a legal action under this Agreement<BR>
+more than one year after the cause of action arose. Each party waives<BR>
+its rights to a jury trial in any resulting litigation.</P>
+
+<P>===============================================================================</P>
+
+<P>For the Rhino JavaScript container component:</P>
+
+<P>Netscape Public License V1.1</P>
+
+<P>     AMENDMENTS</P>
+
+<P>     The Netscape Public License Version 1.1 (&quot;NPL&quot;) consists of the<BR>
+     Mozilla Public License Version 1.1 with the following Amendments,<BR>
+     including Exhibit A-Netscape Public License.  Files identified with<BR>
+     &quot;Exhibit A-Netscape Public License&quot; are governed by the Netscape<BR>
+     Public License Version 1.1.</P>
+
+<P>     Additional Terms applicable to the Netscape Public License.<BR>
+          I. Effect.<BR>
+          These additional terms described in this Netscape Public<BR>
+          License &ndash; Amendments shall apply to the Mozilla Communicator<BR>
+          client code and to all Covered Code under this License.</P>
+
+<P>          II. &quot;Netscape's Branded Code&quot; means Covered Code that Netscape<BR>
+          distributes and/or permits others to distribute under one or more<BR>
+          trademark(s) which are controlled by Netscape but which are not<BR>
+          licensed for use under this License.</P>
+
+<P>          III. Netscape and logo.<BR>
+          This License does not grant any rights to use the trademarks<BR>
+          &quot;Netscape&quot;, the &quot;Netscape N and horizon&quot; logo or the &quot;Netscape<BR>
+          lighthouse&quot; logo, &quot;Netcenter&quot;, &quot;Gecko&quot;, &quot;Java&quot; or &quot;JavaScript&quot;,<BR>
+          &quot;Smart Browsing&quot; even if such marks are included in the Original<BR>
+          Code or Modifications.</P>
+
+<P>          IV. Inability to Comply Due to Contractual Obligation.<BR>
+          Prior to licensing the Original Code under this License, Netscape<BR>
+          has licensed third party code for use in Netscape's Branded Code.<BR>
+          To the extent that Netscape is limited contractually from making<BR>
+          such third party code available under this License, Netscape may<BR>
+          choose to reintegrate such code into Covered Code without being<BR>
+          required to distribute such code in Source Code form, even if<BR>
+          such code would otherwise be considered &quot;Modifications&quot; under<BR>
+          this License.</P>
+
+<P>          V. Use of Modifications and Covered Code by Initial Developer.<BR>
+               V.1. In General.<BR>
+               The obligations of Section 3 apply to Netscape, except to<BR>
+               the extent specified in this Amendment, Section V.2 and V.3.</P>
+
+<P>               V.2. Other Products.<BR>
+               Netscape may include Covered Code in products other than the<BR>
+               Netscape's Branded Code which are released by Netscape<BR>
+               during the two (2) years following the release date of the<BR>
+               Original Code, without such additional products becoming<BR>
+               subject to the terms of this License, and may license such<BR>
+               additional products on different terms from those contained<BR>
+               in this License.</P>
+
+<P>               V.3. Alternative Licensing.<BR>
+               Netscape may license the Source Code of Netscape's Branded<BR>
+               Code, including Modifications incorporated therein, without<BR>
+               such Netscape Branded Code becoming subject to the terms of<BR>
+               this License, and may license such Netscape Branded Code on<BR>
+               different terms from those contained in this License.</P>
+
+<P>          VI. Litigation.<BR>
+          Notwithstanding the limitations of Section 11 above, the<BR>
+          provisions regarding litigation in Section 11(a), (b) and (c) of<BR>
+          the License shall apply to all disputes relating to this License.</P>
+
+<P>     EXHIBIT A-Netscape Public License.</P>
+
+<P>          &quot;The contents of this file are subject to the Netscape Public<BR>
+          License Version 1.1 (the &quot;License&quot;); you may not use this file<BR>
+          except in compliance with the License. You may obtain a copy of<BR>
+          the License at <A href="http://www.mozilla.org/NPL/" class="external-link" rel="nofollow">http://www.mozilla.org/NPL/</A></P>
+
+<P>          Software distributed under the License is distributed on an &quot;AS<BR>
+          IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or<BR>
+          implied. See the License for the specific language governing<BR>
+          rights and limitations under the License.</P>
+
+<P>          The Original Code is Mozilla Communicator client code, released<BR>
+          March 31, 1998.</P>
+
+<P>          The Initial Developer of the Original Code is Netscape<BR>
+          Communications Corporation. Portions created by Netscape are<BR>
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All<BR>
+          Rights Reserved.</P>
+
+<P>          Contributor(s): ______________________________________.</P>
+
+<P>          Alternatively, the contents of this file may be used under the<BR>
+          terms of the _____ license (the &quot;<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A> License&quot;), in which case<BR>
+          the provisions of <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=______&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;&#95;&#95;&#95;</A> License are applicable  instead of<BR>
+          those above.  If you wish to allow use of your version of this<BR>
+          file only under the terms of the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=____&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;&#95;</A> License and not to allow<BR>
+          others to use your version of this file under the NPL, indicate<BR>
+          your decision by deleting  the provisions above and replace  them<BR>
+          with the notice and other provisions required by the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A><BR>
+          License.  If you do not delete the provisions above, a recipient<BR>
+          may use your version of this file under either the NPL or the<BR>
+          <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A> License.&quot;</P>
+
+<P>     ----------------------------------------------------------------------</P>
+
+<P>                          MOZILLA PUBLIC LICENSE<BR>
+                                Version 1.1</P>
+
+<P>                              ---------------</P>
+
+<P>1. Definitions.</P>
+
+<P>     1.0.1. &quot;Commercial Use&quot; means distribution or otherwise making the<BR>
+     Covered Code available to a third party.</P>
+
+<P>     1.1. &quot;Contributor&quot; means each entity that creates or contributes to<BR>
+     the creation of Modifications.</P>
+
+<P>     1.2. &quot;Contributor Version&quot; means the combination of the Original<BR>
+     Code, prior Modifications used by a Contributor, and the Modifications<BR>
+     made by that particular Contributor.</P>
+
+<P>     1.3. &quot;Covered Code&quot; means the Original Code or Modifications or the<BR>
+     combination of the Original Code and Modifications, in each case<BR>
+     including portions thereof.</P>
+
+<P>     1.4. &quot;Electronic Distribution Mechanism&quot; means a mechanism generally<BR>
+     accepted in the software development community for the electronic<BR>
+     transfer of data.</P>
+
+<P>     1.5. &quot;Executable&quot; means Covered Code in any form other than Source<BR>
+     Code.</P>
+
+<P>     1.6. &quot;Initial Developer&quot; means the individual or entity identified<BR>
+     as the Initial Developer in the Source Code notice required by Exhibit<BR>
+     A.</P>
+
+<P>     1.7. &quot;Larger Work&quot; means a work which combines Covered Code or<BR>
+     portions thereof with code not governed by the terms of this License.</P>
+
+<P>     1.8. &quot;License&quot; means this document.</P>
+
+<P>     1.8.1. &quot;Licensable&quot; means having the right to grant, to the maximum<BR>
+     extent possible, whether at the time of the initial grant or<BR>
+     subsequently acquired, any and all of the rights conveyed herein.</P>
+
+<P>     1.9. &quot;Modifications&quot; means any addition to or deletion from the<BR>
+     substance or structure of either the Original Code or any previous<BR>
+     Modifications. When Covered Code is released as a series of files, a<BR>
+     Modification is:<BR>
+          A. Any addition to or deletion from the contents of a file<BR>
+          containing Original Code or previous Modifications.</P>
+
+<P>          B. Any new file that contains any part of the Original Code or<BR>
+          previous Modifications.</P>
+
+<P>     1.10. &quot;Original Code&quot; means Source Code of computer software code<BR>
+     which is described in the Source Code notice required by Exhibit A as<BR>
+     Original Code, and which, at the time of its release under this<BR>
+     License is not already Covered Code governed by this License.</P>
+
+<P>     1.10.1. &quot;Patent Claims&quot; means any patent claim(s), now owned or<BR>
+     hereafter acquired, including without limitation,  method, process,<BR>
+     and apparatus claims, in any patent Licensable by grantor.</P>
+
+<P>     1.11. &quot;Source Code&quot; means the preferred form of the Covered Code for<BR>
+     making modifications to it, including all modules it contains, plus<BR>
+     any associated interface definition files, scripts used to control<BR>
+     compilation and installation of an Executable, or source code<BR>
+     differential comparisons against either the Original Code or another<BR>
+     well known, available Covered Code of the Contributor's choice. The<BR>
+     Source Code can be in a compressed or archival form, provided the<BR>
+     appropriate decompression or de-archiving software is widely available<BR>
+     for no charge.</P>
+
+<P>     1.12. &quot;You&quot; (or &quot;Your&quot;)  means an individual or a legal entity<BR>
+     exercising rights under, and complying with all of the terms of, this<BR>
+     License or a future version of this License issued under Section 6.1.<BR>
+     For legal entities, &quot;You&quot; includes any entity which controls, is<BR>
+     controlled by, or is under common control with You. For purposes of<BR>
+     this definition, &quot;control&quot; means (a) the power, direct or indirect,<BR>
+     to cause the direction or management of such entity, whether by<BR>
+     contract or otherwise, or (b) ownership of more than fifty percent<BR>
+     (50%) of the outstanding shares or beneficial ownership of such<BR>
+     entity.</P>
+
+<P>2. Source Code License.</P>
+
+<P>     2.1. The Initial Developer Grant.<BR>
+     The Initial Developer hereby grants You a world-wide, royalty-free,<BR>
+     non-exclusive license, subject to third party intellectual property<BR>
+     claims:<BR>
+          (a)  under intellectual property rights (other than patent or<BR>
+          trademark) Licensable by Initial Developer to use, reproduce,<BR>
+          modify, display, perform, sublicense and distribute the Original<BR>
+          Code (or portions thereof) with or without Modifications, and/or<BR>
+          as part of a Larger Work; and</P>
+
+<P>          (b) under Patents Claims infringed by the making, using or<BR>
+          selling of Original Code, to make, have made, use, practice,<BR>
+          sell, and offer for sale, and/or otherwise dispose of the<BR>
+          Original Code (or portions thereof).</P>
+
+<P>          (c) the licenses granted in this Section 2.1(a) and (b) are<BR>
+          effective on the date Initial Developer first distributes<BR>
+          Original Code under the terms of this License.</P>
+
+<P>          (d) Notwithstanding Section 2.1(b) above, no patent license is<BR>
+          granted: 1) for code that You delete from the Original Code; 2)<BR>
+          separate from the Original Code;  or 3) for infringements caused<BR>
+          by: i) the modification of the Original Code or ii) the<BR>
+          combination of the Original Code with other software or devices.</P>
+
+<P>     2.2. Contributor Grant.<BR>
+     Subject to third party intellectual property claims, each Contributor<BR>
+     hereby grants You a world-wide, royalty-free, non-exclusive license</P>
+
+<P>          (a)  under intellectual property rights (other than patent or<BR>
+          trademark) Licensable by Contributor, to use, reproduce, modify,<BR>
+          display, perform, sublicense and distribute the Modifications<BR>
+          created by such Contributor (or portions thereof) either on an<BR>
+          unmodified basis, with other Modifications, as Covered Code<BR>
+          and/or as part of a Larger Work; and</P>
+
+<P>          (b) under Patent Claims infringed by the making, using, or<BR>
+          selling of  Modifications made by that Contributor either alone<BR>
+          and/or in combination with its Contributor Version (or portions<BR>
+          of such combination), to make, use, sell, offer for sale, have<BR>
+          made, and/or otherwise dispose of: 1) Modifications made by that<BR>
+          Contributor (or portions thereof); and 2) the combination of<BR>
+          Modifications made by that Contributor with its Contributor<BR>
+          Version (or portions of such combination).</P>
+
+<P>          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are<BR>
+          effective on the date Contributor first makes Commercial Use of<BR>
+          the Covered Code.</P>
+
+<P>          (d)    Notwithstanding Section 2.2(b) above, no patent license is<BR>
+          granted: 1) for any code that Contributor has deleted from the<BR>
+          Contributor Version; 2)  separate from the Contributor Version;<BR>
+          3)  for infringements caused by: i) third party modifications of<BR>
+          Contributor Version or ii)  the combination of Modifications made<BR>
+          by that Contributor with other software  (except as part of the<BR>
+          Contributor Version) or other devices; or 4) under Patent Claims<BR>
+          infringed by Covered Code in the absence of Modifications made by<BR>
+          that Contributor.</P>
+
+<P>3. Distribution Obligations.</P>
+
+<P>     3.1. Application of License.<BR>
+     The Modifications which You create or to which You contribute are<BR>
+     governed by the terms of this License, including without limitation<BR>
+     Section 2.2. The Source Code version of Covered Code may be<BR>
+     distributed only under the terms of this License or a future version<BR>
+     of this License released under Section 6.1, and You must include a<BR>
+     copy of this License with every copy of the Source Code You<BR>
+     distribute. You may not offer or impose any terms on any Source Code<BR>
+     version that alters or restricts the applicable version of this<BR>
+     License or the recipients' rights hereunder. However, You may include<BR>
+     an additional document offering the additional rights described in<BR>
+     Section 3.5.</P>
+
+<P>     3.2. Availability of Source Code.<BR>
+     Any Modification which You create or to which You contribute must be<BR>
+     made available in Source Code form under the terms of this License<BR>
+     either on the same media as an Executable version or via an accepted<BR>
+     Electronic Distribution Mechanism to anyone to whom you made an<BR>
+     Executable version available; and if made available via Electronic<BR>
+     Distribution Mechanism, must remain available for at least twelve (12)<BR>
+     months after the date it initially became available, or at least six<BR>
+     (6) months after a subsequent version of that particular Modification<BR>
+     has been made available to such recipients. You are responsible for<BR>
+     ensuring that the Source Code version remains available even if the<BR>
+     Electronic Distribution Mechanism is maintained by a third party.</P>
+
+<P>     3.3. Description of Modifications.<BR>
+     You must cause all Covered Code to which You contribute to contain a<BR>
+     file documenting the changes You made to create that Covered Code and<BR>
+     the date of any change. You must include a prominent statement that<BR>
+     the Modification is derived, directly or indirectly, from Original<BR>
+     Code provided by the Initial Developer and including the name of the<BR>
+     Initial Developer in (a) the Source Code, and (b) in any notice in an<BR>
+     Executable version or related documentation in which You describe the<BR>
+     origin or ownership of the Covered Code.</P>
+
+<P>     3.4. Intellectual Property Matters<BR>
+          (a) Third Party Claims.<BR>
+          If Contributor has knowledge that a license under a third party's<BR>
+          intellectual property rights is required to exercise the rights<BR>
+          granted by such Contributor under Sections 2.1 or 2.2,<BR>
+          Contributor must include a text file with the Source Code<BR>
+          distribution titled &quot;LEGAL&quot; which describes the claim and the<BR>
+          party making the claim in sufficient detail that a recipient will<BR>
+          know whom to contact. If Contributor obtains such knowledge after<BR>
+          the Modification is made available as described in Section 3.2,<BR>
+          Contributor shall promptly modify the LEGAL file in all copies<BR>
+          Contributor makes available thereafter and shall take other steps<BR>
+          (such as notifying appropriate mailing lists or newsgroups)<BR>
+          reasonably calculated to inform those who received the Covered<BR>
+          Code that new knowledge has been obtained.</P>
+
+<P>          (b) Contributor APIs.<BR>
+          If Contributor's Modifications include an application programming<BR>
+          interface and Contributor has knowledge of patent licenses which<BR>
+          are reasonably necessary to implement that API, Contributor must<BR>
+          also include this information in the LEGAL file.</P>
+
+<P>               (c)    Representations.<BR>
+          Contributor represents that, except as disclosed pursuant to<BR>
+          Section 3.4(a) above, Contributor believes that Contributor's<BR>
+          Modifications are Contributor's original creation(s) and/or<BR>
+          Contributor has sufficient rights to grant the rights conveyed by<BR>
+          this License.</P>
+
+<P>     3.5. Required Notices.<BR>
+     You must duplicate the notice in Exhibit A in each file of the Source<BR>
+     Code.  If it is not possible to put such notice in a particular Source<BR>
+     Code file due to its structure, then You must include such notice in a<BR>
+     location (such as a relevant directory) where a user would be likely<BR>
+     to look for such a notice.  If You created one or more Modification(s)<BR>
+     You may add your name as a Contributor to the notice described in<BR>
+     Exhibit A.  You must also duplicate this License in any documentation<BR>
+     for the Source Code where You describe recipients' rights or ownership<BR>
+     rights relating to Covered Code.  You may choose to offer, and to<BR>
+     charge a fee for, warranty, support, indemnity or liability<BR>
+     obligations to one or more recipients of Covered Code. However, You<BR>
+     may do so only on Your own behalf, and not on behalf of the Initial<BR>
+     Developer or any Contributor. You must make it absolutely clear than<BR>
+     any such warranty, support, indemnity or liability obligation is<BR>
+     offered by You alone, and You hereby agree to indemnify the Initial<BR>
+     Developer and every Contributor for any liability incurred by the<BR>
+     Initial Developer or such Contributor as a result of warranty,<BR>
+     support, indemnity or liability terms You offer.</P>
+
+<P>     3.6. Distribution of Executable Versions.<BR>
+     You may distribute Covered Code in Executable form only if the<BR>
+     requirements of Section 3.1-3.5 have been met for that Covered Code,<BR>
+     and if You include a notice stating that the Source Code version of<BR>
+     the Covered Code is available under the terms of this License,<BR>
+     including a description of how and where You have fulfilled the<BR>
+     obligations of Section 3.2. The notice must be conspicuously included<BR>
+     in any notice in an Executable version, related documentation or<BR>
+     collateral in which You describe recipients' rights relating to the<BR>
+     Covered Code. You may distribute the Executable version of Covered<BR>
+     Code or ownership rights under a license of Your choice, which may<BR>
+     contain terms different from this License, provided that You are in<BR>
+     compliance with the terms of this License and that the license for the<BR>
+     Executable version does not attempt to limit or alter the recipient's<BR>
+     rights in the Source Code version from the rights set forth in this<BR>
+     License. If You distribute the Executable version under a different<BR>
+     license You must make it absolutely clear that any terms which differ<BR>
+     from this License are offered by You alone, not by the Initial<BR>
+     Developer or any Contributor. You hereby agree to indemnify the<BR>
+     Initial Developer and every Contributor for any liability incurred by<BR>
+     the Initial Developer or such Contributor as a result of any such<BR>
+     terms You offer.</P>
+
+<P>     3.7. Larger Works.<BR>
+     You may create a Larger Work by combining Covered Code with other code<BR>
+     not governed by the terms of this License and distribute the Larger<BR>
+     Work as a single product. In such a case, You must make sure the<BR>
+     requirements of this License are fulfilled for the Covered Code.</P>
+
+<P>4. Inability to Comply Due to Statute or Regulation.</P>
+
+<P>     If it is impossible for You to comply with any of the terms of this<BR>
+     License with respect to some or all of the Covered Code due to<BR>
+     statute, judicial order, or regulation then You must: (a) comply with<BR>
+     the terms of this License to the maximum extent possible; and (b)<BR>
+     describe the limitations and the code they affect. Such description<BR>
+     must be included in the LEGAL file described in Section 3.4 and must<BR>
+     be included with all distributions of the Source Code. Except to the<BR>
+     extent prohibited by statute or regulation, such description must be<BR>
+     sufficiently detailed for a recipient of ordinary skill to be able to<BR>
+     understand it.</P>
+
+<P>5. Application of this License.</P>
+
+<P>     This License applies to code to which the Initial Developer has<BR>
+     attached the notice in Exhibit A and to related Covered Code.</P>
+
+<P>6. Versions of the License.</P>
+
+<P>     6.1. New Versions.<BR>
+     Netscape Communications Corporation (&quot;Netscape&quot;) may publish revised<BR>
+     and/or new versions of the License from time to time. Each version<BR>
+     will be given a distinguishing version number.</P>
+
+<P>     6.2. Effect of New Versions.<BR>
+     Once Covered Code has been published under a particular version of the<BR>
+     License, You may always continue to use it under the terms of that<BR>
+     version. You may also choose to use such Covered Code under the terms<BR>
+     of any subsequent version of the License published by Netscape. No one<BR>
+     other than Netscape has the right to modify the terms applicable to<BR>
+     Covered Code created under this License.</P>
+
+<P>     6.3. Derivative Works.<BR>
+     If You create or use a modified version of this License (which you may<BR>
+     only do in order to apply it to code which is not already Covered Code<BR>
+     governed by this License), You must (a) rename Your license so that<BR>
+     the phrases &quot;Mozilla&quot;, &quot;MOZILLAPL&quot;, &quot;MOZPL&quot;, &quot;Netscape&quot;,<BR>
+     &quot;MPL&quot;, &quot;NPL&quot; or any confusingly similar phrase do not appear in your<BR>
+     license (except to note that your license differs from this License)<BR>
+     and (b) otherwise make it clear that Your version of the license<BR>
+     contains terms which differ from the Mozilla Public License and<BR>
+     Netscape Public License. (Filling in the name of the Initial<BR>
+     Developer, Original Code or Contributor in the notice described in<BR>
+     Exhibit A shall not of themselves be deemed to be modifications of<BR>
+     this License.)</P>
+
+<P>7. DISCLAIMER OF WARRANTY.</P>
+
+<P>     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN &quot;AS IS&quot; BASIS,<BR>
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,<BR>
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF<BR>
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.<BR>
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE<BR>
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,<BR>
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE<BR>
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER<BR>
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF<BR>
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.</P>
+
+<P>8. TERMINATION.</P>
+
+<P>     8.1.  This License and the rights granted hereunder will terminate<BR>
+     automatically if You fail to comply with terms herein and fail to cure<BR>
+     such breach within 30 days of becoming aware of the breach. All<BR>
+     sublicenses to the Covered Code which are properly granted shall<BR>
+     survive any termination of this License. Provisions which, by their<BR>
+     nature, must remain in effect beyond the termination of this License<BR>
+     shall survive.</P>
+
+<P>     8.2.  If You initiate litigation by asserting a patent infringement<BR>
+     claim (excluding declatory judgment actions) against Initial Developer<BR>
+     or a Contributor (the Initial Developer or Contributor against whom<BR>
+     You file such action is referred to as &quot;Participant&quot;)  alleging that:</P>
+
+<P>     (a)  such Participant's Contributor Version directly or indirectly<BR>
+     infringes any patent, then any and all rights granted by such<BR>
+     Participant to You under Sections 2.1 and/or 2.2 of this License<BR>
+     shall, upon 60 days notice from Participant terminate prospectively,<BR>
+     unless if within 60 days after receipt of notice You either: <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"><BR>
+     agree in writing to pay Participant a mutually agreeable reasonable<BR>
+     royalty for Your past and future use of Modifications made by such<BR>
+     Participant, or (ii) withdraw Your litigation claim with respect to<BR>
+     the Contributor Version against such Participant.  If within 60 days<BR>
+     of notice, a reasonable royalty and payment arrangement are not<BR>
+     mutually agreed upon in writing by the parties or the litigation claim<BR>
+     is not withdrawn, the rights granted by Participant to You under<BR>
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of<BR>
+     the 60 day notice period specified above.</P>
+
+<P>     (b)  any software, hardware, or device, other than such Participant's<BR>
+     Contributor Version, directly or indirectly infringes any patent, then<BR>
+     any rights granted to You by such Participant under Sections 2.1(b)<BR>
+     and 2.2(b) are revoked effective as of the date You first made, used,<BR>
+     sold, distributed, or had made, Modifications made by that<BR>
+     Participant.</P>
+
+<P>     8.3.  If You assert a patent infringement claim against Participant<BR>
+     alleging that such Participant's Contributor Version directly or<BR>
+     indirectly infringes any patent where such claim is resolved (such as<BR>
+     by license or settlement) prior to the initiation of patent<BR>
+     infringement litigation, then the reasonable value of the licenses<BR>
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken<BR>
+     into account in determining the amount or value of any payment or<BR>
+     license.</P>
+
+<P>     8.4.  In the event of termination under Sections 8.1 or 8.2 above,<BR>
+     all end user license agreements (excluding distributors and resellers)<BR>
+     which have been validly granted by You or any distributor hereunder<BR>
+     prior to termination shall survive termination.</P>
+
+<P>9. LIMITATION OF LIABILITY.</P>
+
+<P>     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT<BR>
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL<BR>
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,<BR>
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR<BR>
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY<BR>
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,<BR>
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER<BR>
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN<BR>
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF<BR>
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY<BR>
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW<BR>
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE<BR>
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO<BR>
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.</P>
+
+<P>10. U.S. GOVERNMENT END USERS.</P>
+
+<P>     The Covered Code is a &quot;commercial item,&quot; as that term is defined in<BR>
+     48 C.F.R. 2.101 (Oct. 1995), consisting of &quot;commercial computer<BR>
+     software&quot; and &quot;commercial computer software documentation,&quot; as such<BR>
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48<BR>
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),<BR>
+     all U.S. Government End Users acquire Covered Code with only those<BR>
+     rights set forth herein.</P>
+
+<P>11. MISCELLANEOUS.</P>
+
+<P>     This License represents the complete agreement concerning subject<BR>
+     matter hereof. If any provision of this License is held to be<BR>
+     unenforceable, such provision shall be reformed only to the extent<BR>
+     necessary to make it enforceable. This License shall be governed by<BR>
+     California law provisions (except to the extent applicable law, if<BR>
+     any, provides otherwise), excluding its conflict-of-law provisions.<BR>
+     With respect to disputes in which at least one party is a citizen of,<BR>
+     or an entity chartered or registered to do business in the United<BR>
+     States of America, any litigation relating to this License shall be<BR>
+     subject to the jurisdiction of the Federal Courts of the Northern<BR>
+     District of California, with venue lying in Santa Clara County,<BR>
+     California, with the losing party responsible for costs, including<BR>
+     without limitation, court costs and reasonable attorneys' fees and<BR>
+     expenses. The application of the United Nations Convention on<BR>
+     Contracts for the International Sale of Goods is expressly excluded.<BR>
+     Any law or regulation which provides that the language of a contract<BR>
+     shall be construed against the drafter shall not apply to this<BR>
+     License.</P>
+
+<P>12. RESPONSIBILITY FOR CLAIMS.</P>
+
+<P>     As between Initial Developer and the Contributors, each party is<BR>
+     responsible for claims and damages arising, directly or indirectly,<BR>
+     out of its utilization of rights under this License and You agree to<BR>
+     work with Initial Developer and Contributors to distribute such<BR>
+     responsibility on an equitable basis. Nothing herein is intended or<BR>
+     shall be deemed to constitute any admission of liability.</P>
+
+<P>13. MULTIPLE-LICENSED CODE.</P>
+
+<P>     Initial Developer may designate portions of the Covered Code as<BR>
+     &quot;Multiple-Licensed&quot;.  &quot;Multiple-Licensed&quot; means that the Initial<BR>
+     Developer permits you to utilize portions of the Covered Code under<BR>
+     Your choice of the NPL or the alternative licenses, if any, specified<BR>
+     by the Initial Developer in the file described in Exhibit A.</P>
+
+<P>EXHIBIT A -Mozilla Public License.</P>
+
+<P>     ``The contents of this file are subject to the Mozilla Public License<BR>
+     Version 1.1 (the &quot;License&quot;); you may not use this file except in<BR>
+     compliance with the License. You may obtain a copy of the License at<BR>
+     <A href="http://www.mozilla.org/MPL/" class="external-link" rel="nofollow">http://www.mozilla.org/MPL/</A></P>
+
+<P>     Software distributed under the License is distributed on an &quot;AS IS&quot;<BR>
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the<BR>
+     License for the specific language governing rights and limitations<BR>
+     under the License.</P>
+
+<P>     The Original Code is ______________________________________.</P>
+
+<P>     The Initial Developer of the Original Code is ________________________.<BR>
+     Portions created by ______________________ are Copyright (C) ______<BR>
+     _______________________. All Rights Reserved.</P>
+
+<P>     Contributor(s): ______________________________________.</P>
+
+<P>     Alternatively, the contents of this file may be used under the terms<BR>
+     of the _____ license (the  &quot;<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A> License&quot;), in which case the<BR>
+     provisions of <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=______&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;&#95;&#95;&#95;</A> License are applicable instead of those<BR>
+     above.  If you wish to allow use of your version of this file only<BR>
+     under the terms of the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=____&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;&#95;</A> License and not to allow others to use<BR>
+     your version of this file under the MPL, indicate your decision by<BR>
+     deleting  the provisions above and replace  them with the notice and<BR>
+     other provisions required by the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A> License.  If you do not delete<BR>
+     the provisions above, a recipient may use your version of this file<BR>
+     under either the MPL or the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=___&linkCreation=true&fromPageId=47503" class="createlink">&#95;&#95;&#95;</A> License.&quot;</P>
+
+<P>     [NOTE: The text of this Exhibit A may differ slightly from the text of<BR>
+     the notices in the Source Code files of the Original Code. You should<BR>
+     use the text of this Exhibit A rather than the text found in the<BR>
+     Original Code Source Code for Your Modifications.]</P>
+
+
+<P>===============================================================================</P>
+
+<P>For the JAX-WS Reference Implementation component:</P>
+
+<P>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</P>
+
+
+<P>      1. Definitions.</P>
+
+<P>            1.1. &quot;Contributor&quot; means each individual or entity that<BR>
+            creates or contributes to the creation of Modifications.</P>
+
+<P>            1.2. &quot;Contributor Version&quot; means the combination of the<BR>
+            Original Software, prior Modifications used by a<BR>
+            Contributor (if any), and the Modifications made by that<BR>
+            particular Contributor.</P>
+
+<P>            1.3. &quot;Covered Software&quot; means (a) the Original Software, or<BR>
+            (b) Modifications, or (c) the combination of files<BR>
+            containing Original Software with files containing<BR>
+            Modifications, in each case including portions thereof.</P>
+
+<P>            1.4. &quot;Executable&quot; means the Covered Software in any form<BR>
+            other than Source Code. </P>
+
+<P>            1.5. &quot;Initial Developer&quot; means the individual or entity<BR>
+            that first makes Original Software available under this<BR>
+            License. </P>
+
+<P>            1.6. &quot;Larger Work&quot; means a work which combines Covered<BR>
+            Software or portions thereof with code not governed by the<BR>
+            terms of this License.</P>
+
+<P>            1.7. &quot;License&quot; means this document.</P>
+
+<P>            1.8. &quot;Licensable&quot; means having the right to grant, to the<BR>
+            maximum extent possible, whether at the time of the initial<BR>
+            grant or subsequently acquired, any and all of the rights<BR>
+            conveyed herein.</P>
+
+<P>            1.9. &quot;Modifications&quot; means the Source Code and Executable<BR>
+            form of any of the following: </P>
+
+<P>                  A. Any file that results from an addition to,<BR>
+                  deletion from or modification of the contents of a<BR>
+                  file containing Original Software or previous<BR>
+                  Modifications; </P>
+
+<P>                  B. Any new file that contains any part of the<BR>
+                  Original Software or previous Modification; or </P>
+
+<P>                  C. Any new file that is contributed or otherwise made<BR>
+                  available under the terms of this License.</P>
+
+<P>            1.10. &quot;Original Software&quot; means the Source Code and<BR>
+            Executable form of computer software code that is<BR>
+            originally released under this License. </P>
+
+<P>            1.11. &quot;Patent Claims&quot; means any patent claim(s), now owned<BR>
+            or hereafter acquired, including without limitation,<BR>
+            method, process, and apparatus claims, in any patent<BR>
+            Licensable by grantor. </P>
+
+<P>            1.12. &quot;Source Code&quot; means (a) the common form of computer<BR>
+            software code in which modifications are made and (b)<BR>
+            associated documentation included in or with such code.</P>
+
+<P>            1.13. &quot;You&quot; (or &quot;Your&quot;) means an individual or a legal<BR>
+            entity exercising rights under, and complying with all of<BR>
+            the terms of, this License. For legal entities, &quot;You&quot;<BR>
+            includes any entity which controls, is controlled by, or is<BR>
+            under common control with You. For purposes of this<BR>
+            definition, &quot;control&quot; means (a) the power, direct or<BR>
+            indirect, to cause the direction or management of such<BR>
+            entity, whether by contract or otherwise, or (b) ownership<BR>
+            of more than fifty percent (50%) of the outstanding shares<BR>
+            or beneficial ownership of such entity.</P>
+
+<P>      2. License Grants. </P>
+
+<P>            2.1. The Initial Developer Grant.</P>
+
+<P>            Conditioned upon Your compliance with Section 3.1 below and<BR>
+            subject to third party intellectual property claims, the<BR>
+            Initial Developer hereby grants You a world-wide,<BR>
+            royalty-free, non-exclusive license: </P>
+
+<P>                  (a) under intellectual property rights (other than<BR>
+                  patent or trademark) Licensable by Initial Developer,<BR>
+                  to use, reproduce, modify, display, perform,<BR>
+                  sublicense and distribute the Original Software (or<BR>
+                  portions thereof), with or without Modifications,<BR>
+                  and/or as part of a Larger Work; and </P>
+
+<P>                  (b) under Patent Claims infringed by the making,<BR>
+                  using or selling of Original Software, to make, have<BR>
+                  made, use, practice, sell, and offer for sale, and/or<BR>
+                  otherwise dispose of the Original Software (or<BR>
+                  portions thereof). </P>
+
+<P>                  (c) The licenses granted in Sections 2.1(a) and (b)<BR>
+                  are effective on the date Initial Developer first<BR>
+                  distributes or otherwise makes the Original Software<BR>
+                  available to a third party under the terms of this<BR>
+                  License. </P>
+
+<P>                  (d) Notwithstanding Section 2.1(b) above, no patent<BR>
+                  license is granted: (1) for code that You delete from<BR>
+                  the Original Software, or (2) for infringements<BR>
+                  caused by: <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> the modification of the Original<BR>
+                  Software, or (ii) the combination of the Original<BR>
+                  Software with other software or devices. </P>
+
+<P>            2.2. Contributor Grant.</P>
+
+<P>            Conditioned upon Your compliance with Section 3.1 below and<BR>
+            subject to third party intellectual property claims, each<BR>
+            Contributor hereby grants You a world-wide, royalty-free,<BR>
+            non-exclusive license:</P>
+
+<P>                  (a) under intellectual property rights (other than<BR>
+                  patent or trademark) Licensable by Contributor to<BR>
+                  use, reproduce, modify, display, perform, sublicense<BR>
+                  and distribute the Modifications created by such<BR>
+                  Contributor (or portions thereof), either on an<BR>
+                  unmodified basis, with other Modifications, as<BR>
+                  Covered Software and/or as part of a Larger Work; and</P>
+
+
+<P>                  (b) under Patent Claims infringed by the making,<BR>
+                  using, or selling of Modifications made by that<BR>
+                  Contributor either alone and/or in combination with<BR>
+                  its Contributor Version (or portions of such<BR>
+                  combination), to make, use, sell, offer for sale,<BR>
+                  have made, and/or otherwise dispose of: (1)<BR>
+                  Modifications made by that Contributor (or portions<BR>
+                  thereof); and (2) the combination of Modifications<BR>
+                  made by that Contributor with its Contributor Version<BR>
+                  (or portions of such combination). </P>
+
+<P>                  (c) The licenses granted in Sections 2.2(a) and<BR>
+                  2.2(b) are effective on the date Contributor first<BR>
+                  distributes or otherwise makes the Modifications<BR>
+                  available to a third party. </P>
+
+<P>                  (d) Notwithstanding Section 2.2(b) above, no patent<BR>
+                  license is granted: (1) for any code that Contributor<BR>
+                  has deleted from the Contributor Version; (2) for<BR>
+                  infringements caused by: <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> third party<BR>
+                  modifications of Contributor Version, or (ii) the<BR>
+                  combination of Modifications made by that Contributor<BR>
+                  with other software (except as part of the<BR>
+                  Contributor Version) or other devices; or (3) under<BR>
+                  Patent Claims infringed by Covered Software in the<BR>
+                  absence of Modifications made by that Contributor. </P>
+
+<P>      3. Distribution Obligations.</P>
+
+<P>            3.1. Availability of Source Code.</P>
+
+<P>            Any Covered Software that You distribute or otherwise make<BR>
+            available in Executable form must also be made available in<BR>
+            Source Code form and that Source Code form must be<BR>
+            distributed only under the terms of this License. You must<BR>
+            include a copy of this License with every copy of the<BR>
+            Source Code form of the Covered Software You distribute or<BR>
+            otherwise make available. You must inform recipients of any<BR>
+            such Covered Software in Executable form as to how they can<BR>
+            obtain such Covered Software in Source Code form in a<BR>
+            reasonable manner on or through a medium customarily used<BR>
+            for software exchange.</P>
+
+<P>            3.2. Modifications.</P>
+
+<P>            The Modifications that You create or to which You<BR>
+            contribute are governed by the terms of this License. You<BR>
+            represent that You believe Your Modifications are Your<BR>
+            original creation(s) and/or You have sufficient rights to<BR>
+            grant the rights conveyed by this License.</P>
+
+<P>            3.3. Required Notices.</P>
+
+<P>            You must include a notice in each of Your Modifications<BR>
+            that identifies You as the Contributor of the Modification.<BR>
+            You may not remove or alter any copyright, patent or<BR>
+            trademark notices contained within the Covered Software, or<BR>
+            any notices of licensing or any descriptive text giving<BR>
+            attribution to any Contributor or the Initial Developer.</P>
+
+<P>            3.4. Application of Additional Terms.</P>
+
+<P>            You may not offer or impose any terms on any Covered<BR>
+            Software in Source Code form that alters or restricts the<BR>
+            applicable version of this License or the recipients'<BR>
+            rights hereunder. You may choose to offer, and to charge a<BR>
+            fee for, warranty, support, indemnity or liability<BR>
+            obligations to one or more recipients of Covered Software.<BR>
+            However, you may do so only on Your own behalf, and not on<BR>
+            behalf of the Initial Developer or any Contributor. You<BR>
+            must make it absolutely clear that any such warranty,<BR>
+            support, indemnity or liability obligation is offered by<BR>
+            You alone, and You hereby agree to indemnify the Initial<BR>
+            Developer and every Contributor for any liability incurred<BR>
+            by the Initial Developer or such Contributor as a result of<BR>
+            warranty, support, indemnity or liability terms You offer.</P>
+
+
+<P>            3.5. Distribution of Executable Versions.</P>
+
+<P>            You may distribute the Executable form of the Covered<BR>
+            Software under the terms of this License or under the terms<BR>
+            of a license of Your choice, which may contain terms<BR>
+            different from this License, provided that You are in<BR>
+            compliance with the terms of this License and that the<BR>
+            license for the Executable form does not attempt to limit<BR>
+            or alter the recipient's rights in the Source Code form<BR>
+            from the rights set forth in this License. If You<BR>
+            distribute the Covered Software in Executable form under a<BR>
+            different license, You must make it absolutely clear that<BR>
+            any terms which differ from this License are offered by You<BR>
+            alone, not by the Initial Developer or Contributor. You<BR>
+            hereby agree to indemnify the Initial Developer and every<BR>
+            Contributor for any liability incurred by the Initial<BR>
+            Developer or such Contributor as a result of any such terms<BR>
+            You offer.</P>
+
+<P>            3.6. Larger Works.</P>
+
+<P>            You may create a Larger Work by combining Covered Software<BR>
+            with other code not governed by the terms of this License<BR>
+            and distribute the Larger Work as a single product. In such<BR>
+            a case, You must make sure the requirements of this License<BR>
+            are fulfilled for the Covered Software. </P>
+
+<P>      4. Versions of the License. </P>
+
+<P>            4.1. New Versions.</P>
+
+<P>            Sun Microsystems, Inc. is the initial license steward and<BR>
+            may publish revised and/or new versions of this License<BR>
+            from time to time. Each version will be given a<BR>
+            distinguishing version number. Except as provided in<BR>
+            Section 4.3, no one other than the license steward has the<BR>
+            right to modify this License. </P>
+
+<P>            4.2. Effect of New Versions.</P>
+
+<P>            You may always continue to use, distribute or otherwise<BR>
+            make the Covered Software available under the terms of the<BR>
+            version of the License under which You originally received<BR>
+            the Covered Software. If the Initial Developer includes a<BR>
+            notice in the Original Software prohibiting it from being<BR>
+            distributed or otherwise made available under any<BR>
+            subsequent version of the License, You must distribute and<BR>
+            make the Covered Software available under the terms of the<BR>
+            version of the License under which You originally received<BR>
+            the Covered Software. Otherwise, You may also choose to<BR>
+            use, distribute or otherwise make the Covered Software<BR>
+            available under the terms of any subsequent version of the<BR>
+            License published by the license steward. </P>
+
+<P>            4.3. Modified Versions.</P>
+
+<P>            When You are an Initial Developer and You want to create a<BR>
+            new license for Your Original Software, You may create and<BR>
+            use a modified version of this License if You: (a) rename<BR>
+            the license and remove any references to the name of the<BR>
+            license steward (except to note that the license differs<BR>
+            from this License); and (b) otherwise make it clear that<BR>
+            the license contains terms which differ from this License.</P>
+
+
+<P>      5. DISCLAIMER OF WARRANTY.</P>
+
+<P>      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN &quot;AS IS&quot;<BR>
+      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,<BR>
+      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED<BR>
+      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR<BR>
+      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND<BR>
+      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY<BR>
+      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE<BR>
+      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF<BR>
+      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF<BR>
+      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF<BR>
+      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS<BR>
+      DISCLAIMER. </P>
+
+<P>      6. TERMINATION. </P>
+
+<P>            6.1. This License and the rights granted hereunder will<BR>
+            terminate automatically if You fail to comply with terms<BR>
+            herein and fail to cure such breach within 30 days of<BR>
+            becoming aware of the breach. Provisions which, by their<BR>
+            nature, must remain in effect beyond the termination of<BR>
+            this License shall survive.</P>
+
+<P>            6.2. If You assert a patent infringement claim (excluding<BR>
+            declaratory judgment actions) against Initial Developer or<BR>
+            a Contributor (the Initial Developer or Contributor against<BR>
+            whom You assert such claim is referred to as &quot;Participant&quot;)<BR>
+            alleging that the Participant Software (meaning the<BR>
+            Contributor Version where the Participant is a Contributor<BR>
+            or the Original Software where the Participant is the<BR>
+            Initial Developer) directly or indirectly infringes any<BR>
+            patent, then any and all rights granted directly or<BR>
+            indirectly to You by such Participant, the Initial<BR>
+            Developer (if the Initial Developer is not the Participant)<BR>
+            and all Contributors under Sections 2.1 and/or 2.2 of this<BR>
+            License shall, upon 60 days notice from Participant<BR>
+            terminate prospectively and automatically at the expiration<BR>
+            of such 60 day notice period, unless if within such 60 day<BR>
+            period You withdraw Your claim with respect to the<BR>
+            Participant Software against such Participant either<BR>
+            unilaterally or pursuant to a written agreement with<BR>
+            Participant.</P>
+
+<P>            6.3. In the event of termination under Sections 6.1 or 6.2<BR>
+            above, all end user licenses that have been validly granted<BR>
+            by You or any distributor hereunder prior to termination<BR>
+            (excluding licenses granted to You by any distributor)<BR>
+            shall survive termination.</P>
+
+<P>      7. LIMITATION OF LIABILITY.</P>
+
+<P>      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT<BR>
+      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE<BR>
+      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF<BR>
+      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE<BR>
+      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR<BR>
+      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT<BR>
+      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK<BR>
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER<BR>
+      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN<BR>
+      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF<BR>
+      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL<BR>
+      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT<BR>
+      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO<BR>
+      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR<BR>
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT<BR>
+      APPLY TO YOU.</P>
+
+<P>      8. U.S. GOVERNMENT END USERS.</P>
+
+<P>      The Covered Software is a &quot;commercial item,&quot; as that term is<BR>
+      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of &quot;commercial<BR>
+      computer software&quot; (as that term is defined at 48 C.F.R. <BR>
+      252.227-7014(a)(1)) and &quot;commercial computer software<BR>
+      documentation&quot; as such terms are used in 48 C.F.R. 12.212 (Sept.<BR>
+      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1<BR>
+      through 227.7202-4 (June 1995), all U.S. Government End Users<BR>
+      acquire Covered Software with only those rights set forth herein.<BR>
+      This U.S. Government Rights clause is in lieu of, and supersedes,<BR>
+      any other FAR, DFAR, or other clause or provision that addresses<BR>
+      Government rights in computer software under this License.</P>
+
+<P>      9. MISCELLANEOUS.</P>
+
+<P>      This License represents the complete agreement concerning subject<BR>
+      matter hereof. If any provision of this License is held to be<BR>
+      unenforceable, such provision shall be reformed only to the<BR>
+      extent necessary to make it enforceable. This License shall be<BR>
+      governed by the law of the jurisdiction specified in a notice<BR>
+      contained within the Original Software (except to the extent<BR>
+      applicable law, if any, provides otherwise), excluding such<BR>
+      jurisdiction's conflict-of-law provisions. Any litigation<BR>
+      relating to this License shall be subject to the jurisdiction of<BR>
+      the courts located in the jurisdiction and venue specified in a<BR>
+      notice contained within the Original Software, with the losing<BR>
+      party responsible for costs, including, without limitation, court<BR>
+      costs and reasonable attorneys' fees and expenses. The<BR>
+      application of the United Nations Convention on Contracts for the<BR>
+      International Sale of Goods is expressly excluded. Any law or<BR>
+      regulation which provides that the language of a contract shall<BR>
+      be construed against the drafter shall not apply to this License.<BR>
+      You agree that You alone are responsible for compliance with the<BR>
+      United States export administration regulations (and the export<BR>
+      control laws and regulation of any other countries) when You use,<BR>
+      distribute or otherwise make available any Covered Software.</P>
+
+<P>      10. RESPONSIBILITY FOR CLAIMS.</P>
+
+<P>      As between Initial Developer and the Contributors, each party is<BR>
+      responsible for claims and damages arising, directly or<BR>
+      indirectly, out of its utilization of rights under this License<BR>
+      and You agree to work with Initial Developer and Contributors to<BR>
+      distribute such responsibility on an equitable basis. Nothing<BR>
+      herein is intended or shall be deemed to constitute any admission<BR>
+      of liability.</P>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/logging-tracing-and-timing-in-tuscany.html b/site/trunk/site-publish/logging-tracing-and-timing-in-tuscany.html
new file mode 100644
index 0000000000..0e83d2b5ee
--- /dev/null
+++ b/site/trunk/site-publish/logging-tracing-and-timing-in-tuscany.html
@@ -0,0 +1,237 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Logging, Tracing, and Timing in Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100038">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-development-guide.html" title="SCA Java Development Guide">SCA Java Development Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Logging, Tracing, and Timing in Tuscany">Logging, Tracing, and Timing in Tuscany</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Logging%2CTracing%2CandTiminginTuscany-TuscanyLogging%2CTracing%2CTimingInformation"></A>Tuscany Logging, Tracing, Timing Information</H1>
+
+<P>This page describes the logging, tracing, and timing features of Tuscany. These features can be used to debug problems with the Tuscany runtime, understand code flow, and provide timing metrics for competitive analysis or performance claims.</P>
+
+<H2><A name="Logging%2CTracing%2CandTiminginTuscany-JavaLoggingversusAspectOrientedProgramming%28AOP%29Approach"></A>Java Logging versus Aspect Oriented Programming (AOP) Approach</H2>
+
+<P>There are two types of logging embeded in the Tuscany runtime: explicit and implicit. The explicit logging is implemented by the Java 2 SE core logging facilities such as java.util.logging.Logger. This is the logging that many Java programmers are familiar with, and the logging requires calls to the Logger programming interface. Throughout the Tuscany code base you see calls to this facility such as this call in Tuscany org.apache.tuscany.sca.node.launcher.NodeLauncher.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java Logging in Tuscany</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">        logger.info(<SPAN class="code-quote">&quot;Apache Tuscany SCA Node is starting...&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>Calls to this facility by default go to the standard output of the program. This is the typical result that one sees in the console:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java Logging Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">INFO: Apache Tuscany SCA Node is starting...
+</PRE>
+</DIV></DIV>
+<P>The Java SE core logging works well as a general purpose logger and gives a general idea of the important phases in the Tuscany runtime. However, one drawback is that this logging system only publishes predetermined messages created by the developers. If you wish to change the logging points, you must change the Tuscany source code, build, and run again with your private code base.</P>
+
+<P>Another logging and tracing facility is available in Tuscany that gives the user a bit of flexibility in what gets logged and requires no source code modifications to run. This is an Aspect Oriented Programming (AOP) approach that runs via a Java agent at runtime. Just like a debugger can start and stop and inspect a Tuscany Java program, so too can an AOP agent inspect and report on a Tuscany Java program. Tuscany employs the AspectJ implementation, and its runtime agent is contained in the aspectjweaver.jar file. The AOP agent is specified from a command line option or runtime options:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Java AOP Agent</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">java -javaagent:<SPAN class="code-quote">&quot;&lt;path to aspectjweaver.jar&gt;&quot;</SPAN> calculator.CalculatorClient
+</PRE>
+</DIV></DIV>
+<P>The AOP logging and tracing agent can be run with any Tuscany program. No additional calls or log statements need be added to the Tuscany code. The results of running a timing for example, look like this:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany AOP Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">Running org.apache.tuscany.sca.aspectj.TracingTestCase
+Timing Around timedSection jp=call(void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>))
+Oct 21, 2008 9:26:36 AM org.apache.tuscany.sca.aspectj.TracingTestCase info_aroundBody0
+Timing Around timedSection Roundtrip is 32ms <SPAN class="code-keyword">for</SPAN> jp.getSignature=void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Full documentation on AspectJ is available at the <A href="http://www.eclipse.org/aspectj/doc/released" class="external-link" rel="nofollow">AspectJ web site</A>. Tuscany provides example usage in the module tracing-aspectj in the build tree and the released code.</P>
+
+<H2><A name="Logging%2CTracing%2CandTiminginTuscany-BriefApectOrientedProgrammingIntroduction"></A>Brief Apect Oriented Programming Introduction</H2>
+
+<P>In order to understand the aspect oriented approach to logging in Tuscany, one must understand a few basic concepts.</P>
+
+<P>A <EM>join point</EM> is well defined point in the program flow. An example join point is the entry to a Java method. Another is after an exception is thrown. These join points contain useful information when running a program such as the argument list, the call stack, and the signature of the point that is executing.</P>
+
+<P>A <EM>point cut</EM> is a subset of all the program join points. For instance, a point cut might be only the join points from exceptions thrown by the Tuscany runtime. Or only the set of calls to a Tuscany API org.apache.tuscany.sca.node.launcher.NodeLauncher.</P>
+
+<P><EM>Advice</EM> is the code that is run when a point cut is reached. For instance, your advice might want to print out all the arguments when entering a given method. Or your advice might show the call stack of an exception and print the original cause of the exception.</P>
+
+<P>Finally, an <EM>aspect</EM> is a module that bundles up a particular set of point cuts and advice. Here is an example aspect that is marked with Java 5 annotations. The name of the aspect is <EM>LoggingAspect</EM>, there is a point cut defined at Tuscany calls to org.apache.tuscany.sca.&#42; classes (but not inside of Aspect classes), and when the point cut is run, the advice for this point cut prints out the join point signature.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Example Aspect</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">@Aspect
+<SPAN class="code-keyword">public</SPAN> class LoggingAspect {
+    @Pointcut(<SPAN class="code-quote">&quot;call(* org.apache.tuscany.sca..*(..)) &amp;&amp; (!within(org.apache.tuscany.sca.aspectj.*Aspect))&quot;</SPAN>)
+    <SPAN class="code-keyword">public</SPAN> void anyMethodCall() {
+    }
+
+    @Before(<SPAN class="code-quote">&quot;anyMethodCall()&quot;</SPAN>)
+    <SPAN class="code-keyword">public</SPAN> void before(JoinPoint jp) {
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Logging Before anyMethodCall jp.getSignature=&quot;</SPAN> + jp.getSignature());
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>Full explanation of these concepts are in the AspectJ documents. The purpose here is to provide enough information to allow a user to run or modify the Tuscany aspects to one's liking.</P>
+
+<H2><A name="Logging%2CTracing%2CandTiminginTuscany-LoggingandTracinginTuscany"></A>Logging and Tracing in Tuscany</H2>
+
+<P>Following the approach of AspectJ, Tuscany provides two concrete aspects for logging and tracing. org.apache.tuscany.sca.aspectj.LoggingAspect provides logging for methods, constructors, and static initializers in Tuscany. org.apache.tuscany.sca.aspectj.SimpleTracingAspect provide tracing into user methods, constructors, and static initializers. Both provide detailed information when an Exception or Throwable is thrown by the Tuscany runtime or user SCA program.</P>
+
+<P>Both LoggingAspect and SimpleTracingAspect are run by naming the AspectJ runtime agent aspectjweaver.jar at launch. This is shown in the command line example above, and an example is provided in launcher.bat in the tracing-aspectj module.</P>
+
+<P>The runtime configuration file aop.xml has references to these aspects. Uncomment one or both of these in aop.xml to run with this logging enabled.  Following is an example logging run with the verbose weaver option specified. Note the verbose output of class names, build times, etc. The logging statements too are quite verbose stating the name of the join point, the point cut, and various signatures and arguments.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Example Logging in Tuscany</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">[INFO] Configured Artifact: org.aspectj:aspectjweaver:1.6.1:jar
+[INFO] Copying aspectjweaver-1.6.1.jar to E:\t\java\sca\modules\tracing-aspectj\target\dependency\aspectjweaver-1.6.1.jar
+[AppClassLoader@92e78c] info AspectJ Weaver Version 1.6.1 built on Thursday Jul 3, 2008 at 18:35:41 GMT
+[AppClassLoader@92e78c] info register classloader sun.misc.Launcher$AppClassLoader@92e78c
+[AppClassLoader@92e78c] info using configuration /E:/t/java/sca/modules/tracing-aspectj/target/classes/META-INF/aop.xml
+[AppClassLoader@92e78c] info register aspect org.apache.tuscany.sca.aspectj.LoggingAspect
+[AppClassLoader@92e78c] info define aspect org.apache.tuscany.sca.aspectj.UserTimingAspect
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Logging Before anyMethodCall jp.getSignature=SCANodeFactory org.apache.tuscany.sca.node.SCANodeFactory.newInstance()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ServiceDiscovery()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ServiceDiscovery.1(ServiceDiscovery, <SPAN class="code-object">Class</SPAN>)
+Logging Before anyConstructor jp.getArgs=[org.apache.tuscany.sca.extensibility.ServiceDiscovery@ceb6dd,
+   class org.apache.tuscany.sca.node.SCANodeFactory]
+Logging Before anyMethodCall jp.getSignature=ServiceDiscoverer org.apache.tuscany.sca.extensibility.ServiceDiscovery.getServiceDiscoverer()
+Logging Before anyConstructor jp.getSignature=org.apache.tuscany.sca.extensibility.ContextClassLoaderServiceDiscoverer()
+Logging AfterReturning anyMethodCall jp=call(ServiceDiscoverer org.apache.tuscany.sca.extensibility.ServiceDiscovery.getServiceDiscoverer()),
+   result=org.apache.tuscany.sca.extensibility.ContextClassLoaderServiceDiscoverer@17574b9
+Logging Before anyMethodCall jp.getSignature=Set org.apache.tuscany.sca.extensibility.ServiceDiscoverer.discover(<SPAN class="code-object">String</SPAN>, <SPAN class="code-object">boolean</SPAN>)
+Logging Before anyMethodCall jp.getArgs=[org.apache.tuscany.sca.node.SCANodeFactory, <SPAN class="code-keyword">true</SPAN>]
+</PRE>
+</DIV></DIV>
+<P>These aspects provide static point cuts and advice. That is, the various methods, constructors, and exception points are constrained by the source code of the aspects. You can change these items via editing LoggingAspect or SimpleTracingAspect and rerunning the application.</P>
+
+<H2><A name="Logging%2CTracing%2CandTiminginTuscany-Timing"></A>Timing</H2>
+
+<P>Timing of various calls is also available via the AOP logging and tracing facility in Tuscany. The apsect UserTimingAspect is provided to time certain point cuts. As shown above, this AOP timing feature can be used for timing metrics for competitive analysis of performance gauges. The output of the timing is shown here, as a Logger.info method is called and timed.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany AOP Timing Output</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">Running org.apache.tuscany.sca.aspectj.TracingTestCase
+Timing Around timedSection jp=call(void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>))
+Oct 21, 2008 9:26:36 AM org.apache.tuscany.sca.aspectj.TracingTestCase info_aroundBody0
+Timing Around timedSection Roundtrip is 32ms <SPAN class="code-keyword">for</SPAN> jp.getSignature=void java.util.logging.Logger.info(<SPAN class="code-object">String</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Unlike LoggingAspect and SimpleTracingAspect, the pointcut for UserTimingAspect is settable at runtime via the aop.xml runtime configuration file. Look for the UserTimingAspect name, and note the expression in the pointcut element. You may change the name of expression to any valid AspectJ pointcut expression. Here calls to any Logger.info methods, regardless of arguments or return types are logged. For instance you may change this to &quot;call( * calculator.CalculatorServiceImpl.multiply(..))&quot; to time calls in your SCA application.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Dynamic PointCut for UserTimingAspect</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">        &lt;concrete-aspect name=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.UserTimingAspect&quot;</SPAN>
+           <SPAN class="code-keyword">extends</SPAN>=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.TimingAspect&quot;</SPAN>
+           precedence=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.aspectj.UserTimingAspect, *&quot;</SPAN>&gt;
+           &lt;pointcut name=<SPAN class="code-quote">&quot;timedCall&quot;</SPAN>
+              expression=<SPAN class="code-quote">&quot;call(* java.util.logging.Logger.info(..))&quot;</SPAN>/&gt;
+        &lt;/concrete-aspect&gt;
+</PRE>
+</DIV></DIV>
+
+<H2><A name="Logging%2CTracing%2CandTiminginTuscany-LoggingandTracinginAlternateContainers"></A>Logging and Tracing in Alternate Containers</H2>
+
+<P>So far this article discussed logging and tracing for Tuscany applications. Often Tuscany applications are run standalone in a Java 2 SE environment. You can also turn on logging and tracing in various application servers that support Tuscany SCA applications.</P>
+
+<H3><A name="Logging%2CTracing%2CandTiminginTuscany-ApacheTomcatExample"></A>Apache Tomcat Example</H3>
+
+<P>Show Apache Tomcat J2EE application server plus Tuscany bundled SCA application.</P>
+
+<H3><A name="Logging%2CTracing%2CandTiminginTuscany-WebSphereExample"></A>WebSphere Example</H3>
+
+<P>Show WebSphere 7.0.0.1 plus SOA Feature Pack based on Tuscany output.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/m3-process-notes.html b/site/trunk/site-publish/m3-process-notes.html
new file mode 100644
index 0000000000..2e1ab1b8fc
--- /dev/null
+++ b/site/trunk/site-publish/m3-process-notes.html
@@ -0,0 +1,274 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : M3 Process Notes</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48869">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-m3.html" title="SDO Java M3">SDO Java M3</A>&nbsp;&gt;&nbsp;<A href="" title="M3 Process Notes">M3 Process Notes</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="M3ProcessNotes-ReleasingSDOJava"></A>Releasing SDO Java</H3>
+
+<P>Note,  this is information captured from my own experiences of doing a release for the first time.<BR>
+If any of what I say here is at odds with apache policies as stated elsewhere then clearly they<BR>
+win (Please let me know of any cases).</P>
+
+<P><B>This is still work in progress</B>  Many items need another level of depth of explanation</P>
+
+<H4><A name="M3ProcessNotes-Links"></A>Links</H4>
+
+<OL>
+	<LI>draft asf guidlines: <A href="http://incubator.apache.org/guides/releasemanagement.html" class="external-link" rel="nofollow">http://incubator.apache.org/guides/releasemanagement.html</A></LI>
+	<LI>here's how axis2 do it: <A href="http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps" class="external-link" rel="nofollow">http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps</A></LI>
+</OL>
+
+
+<H4><A name="M3ProcessNotes-TaskDependencies"></A>Task Dependencies</H4>
+
+<P>A relevant version of the Tuscany parent pom and buildtools must have been released. </P>
+
+<H4><A name="M3ProcessNotes-Tasksthatcanbedoneaheadoftimeorwhileinwaitmodeforthesequencedtasks"></A>Tasks that can be done ahead of time or while in wait mode for the sequenced tasks</H4>
+
+<OL>
+	<LI>understand the planned release cycles of your dependencies and have a target stable release version in mind for all such dependencies</LI>
+	<LI>Prepare for signing/authenticating distro files
+	<OL>
+		<LI>identify/install s/w for public key infrastructure stuff and MD5 message digest generation</LI>
+		<LI>Create a PGP key for signing files</LI>
+		<LI>Lodge your PGP key with a keyserver</LI>
+		<LI>Put your public key in the svn KEYS file</LI>
+	</OL>
+	</LI>
+	<LI>Get set up for easy file transfer to people.apache.org
+	<OL>
+		<LI>Identify/Install clients for ssh, secure copying and secure ftping</LI>
+		<LI>Establish authentication with people.apache.org by key</LI>
+	</OL>
+	</LI>
+	<LI>Prepare a downloads page section that can be added to the Tuscany downloads page</LI>
+	<LI>Ensure that there is inter-module understanding of how we plan to sequence releasing modules and requesting IPMC votes</LI>
+	<LI>ensure that our apache mentors know Tuscany's plans with respect to releases</LI>
+</OL>
+
+
+<H4><A name="M3ProcessNotes-BasicTaskSequenceasIrecallit"></A>Basic Task Sequence as I recall it</H4>
+
+<P>This is a basic sequence of tasks.  Clarification of details of tasks will be given below</P>
+
+<OL>
+	<LI>make the trunk reference the newly released parent pom and buildtools</LI>
+	<LI>optionally make a branch</LI>
+	<LI>stabilize code in branch (or trunk if development activity can be halted in trunk)
+	<OL>
+		<LI>check LICENSE and NOTICE files in project roots and in jar manifests
+		<OL>
+			<LI>run the rat tool against the source and check for exceptions</LI>
+			<LI>once exceptions have been fixed, store the rat log and make a note of rat log exceptions which are there because they have to be</LI>
+			<LI>repeat this as necessary during the release process if new files are included</LI>
+		</OL>
+		</LI>
+		<LI>update release notes, readmes, etc</LI>
+		<LI>Ensure the Tuscany project's root level svn STATUS file is up to date, and then copy/update it into the root folders of any source distribution that will be made,  and to the location where the pom that creates the binary distribution will expect to find the STATUS file for packaging (may be the same location as for source distro)
+		<OL>
+			<LI>be aware that while the release process is continuing,  the project STATUS file might change.</LI>
+		</OL>
+		</LI>
+		<LI>.....</LI>
+	</OL>
+	</LI>
+	<LI>Create release candidates and ask for feedback, iterating until ready for a PPMC vote ...
+	<OL>
+		<LI>Create local copies of source hierarchies, one per source distribution, using svn export &lt;uri&gt; &lt;local-dir&gt;</LI>
+		<LI>Make archives of your clean exports in order to be able to distribute source</LI>
+		<LI>Follow the instructions in BUILDING.txt in the root folders of the source distributions to produce the binary distribution
+		<OL>
+			<LI>If you have to do something different from those instructions to build the binary distro, then update BUILDING.txt in appropriate places in svn(and be aware thet your source distro archive is now out of date, so you'll need to iterate before going public)</LI>
+		</OL>
+		</LI>
+		<LI>Test your binary distro; take the outputs of your build process and use them as if you were a new user who had just downloaded them</LI>
+		<LI>create your sample programs source distribution
+		<OL>
+			<LI>...... fill this in</LI>
+			<LI>....</LI>
+		</OL>
+		</LI>
+		<LI>At this point you will need to have put in place distro signing capabilities (see &quot;Ahead of Time&quot; above)
+		<OL>
+			<LI>Sign and create md5 checksums for each of the source and binary distribution archives</LI>
+			<LI>transfer the archives to a logical place under your public_html people.apache.org space and arrange suitably</LI>
+			<LI>create a suitable readme for the root level of your release candidate folder, and ensure the readme names the release candidate version</LI>
+			<LI>advertise the release candidate on tuscany-dev and tuscany-user and ask for feedback</LI>
+		</OL>
+		</LI>
+		<LI>fix issues and repeat the release candidate process</LI>
+	</OL>
+	</LI>
+	<LI>When ready for the PPMC to vote on your release candidate, create a tag from the branch (or trunk if no branch)
+	<OL>
+		<LI>Note that a release must have a referenceable tag from which it was built and that this may not be the end to your updates, so you have the option of creating new tags if the PPMC vote throws up more issues,  or updating a single tag,  you may like to bear your choice in mind when naming the tag</LI>
+		<LI>Note also that svn will complain when you  try to do an svn commit into a tag, which is a warning only, and during this phase of the release process, updates to a tag are justifiable</LI>
+	</OL>
+	</LI>
+	<LI>Update the version elements of the poms to define the version of the parent pom and buildtools that should be used (CHECK where and when this should be done)</LI>
+	<LI>Update the tags version names of the distributable artifacts to non SNAPSHOT titles that match the release name</LI>
+	<LI>Update the tags version names of the dependencies to non SNAPSHOT versions, if not already done earlier in the release candidate process</LI>
+	<LI>Ideally update the tags version names of maven plugins to non SNAPSHOT versions if not already done earlier in the release candidate process (note that if the plugin behaviour changes after release, your tag or source distribution may not build in the same way as it did when you released if you rely on SNAPSHOT plugin versions)</LI>
+	<LI>Rebuild and upload a new release and candidate to people.apache.org</LI>
+	<LI>Optionally take a snapshot archive of your local maven repository for future issue resolution</LI>
+	<LI>Deploy the projects artifacts to the maven repository
+	<OL>
+		<LI>By this time you want to have in place easy authentication to people.apache.org (add link to apache description of how to do this),  and to modify your maven ~/.m2/settings.xml file to use key based authentication, rather than password (I never got this going, so had to type in my password about 30 times per deploy) &ndash; If using pageant to make an ephermeral decrypted version of your SSL private key available to the authentication process, then make sure pageant is running, and you have lodged your private key with that invocation of pageant</LI>
+		<LI>Run maven deploy (supplying your password multiple times if necessary &ndash; the build will fail if a password request times out)</LI>
+		<LI>Check that the artifacts in the maven repository and the corresponding ones in your local repository are fresh and identical</LI>
+		<LI>The deploy action will have created .md5 and .sha1 message digests for all newly deployed artifacts,  you must manually add signatures for the artifacts
+		<OL>
+			<LI>for every archive artifact uploaded to the remote repository (see the &quot;mvn deploy&quot; execution log), create a signature for the corresponding artifact on your local machine</LI>
+			<LI>upload that signature to sit alongside the artifact on the remote repository</LI>
+		</OL>
+		</LI>
+	</OL>
+	</LI>
+	<LI>Request a vote on tuscany-dev on the new release candidate, and the deployed artifacts, publishing the rat log and exceptions stored earlier</LI>
+	<LI>Iterate through the release candidate/vote process if necessary</LI>
+	<LI>ask for ratification of the PPMC vote from the IPMC by posting to general@incubator.apache.org (I think you may have to use an apache.org email address to do this?)</LI>
+	<LI>if necessary repeat the release candidate/PPMC vote/IPMC ratification steps</LI>
+	<LI>Move your release candidate files to the proper people.apache.org tuscany download location</LI>
+</OL>
+<UL class="alternate" type="square">
+	<LI>/www/people.apache.org/dist/incubator/tuscany/java</LI>
+</UL>
+<OL>
+	<LI>Add your ready prepared download section to the tuscany site downloads page, rebuild and deply the site update</LI>
+	<LI>update the projects STATUS file and commit back to svn to say that the announcement has been made</LI>
+	<LI>update the tuscany site's news page</LI>
+	<LI>Announce the release by sending to anounce@apache.org (note that you must use an apache.org email address to do this), copying tuscany-dev, tuscany-user and general@incubator</LI>
+	<LI>Momentarily reflect on life's joys
+<HR>
+<H4><A name="M3ProcessNotes-Commandlog"></A>Command log</H4>
+<P>C:\Development\JiraDev\M3Release&gt;svn export svn\M3ApiRelease apiExportDir\apache-tuscany-sdo-incubating-1.0-M3\sdo-api<BR>
+Export complete.</P></LI>
+</OL>
+
+
+<P>C:\Development\JiraDev\M3Release&gt;svn export svn\M3ImplRelease implExportDir\apache-tuscany-sdo-incubating-1.0-M3\sdo<BR>
+Export complete.</P>
+
+<P>C:\Development\JiraDev\M3Release\RC1&gt;gpg -sa --detach-sig --local-user kelvingoodson@apache.org apache-tuscany-sdo-incubating<BR>
+-1.0-M3-api-src.tar.gz</P>
+
+<P>$ for i in *<BR>
+&gt; do<BR>
+&gt; gpg -sa --detach-sig --local-user kelvingoodson@apache.org $i<BR>
+&gt; done</P>
+
+<P>$ for i in *<BR>
+&gt; do<BR>
+&gt; gpg -sa --detach-sig --local-user kelvingoodson@apache.org $i<BR>
+&gt; done</P>
+
+<P>$ rm *.asc.md5</P>
+
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/mailing-lists.html b/site/trunk/site-publish/mailing-lists.html
new file mode 100644
index 0000000000..311fec16c9
--- /dev/null
+++ b/site/trunk/site-publish/mailing-lists.html
@@ -0,0 +1,186 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Mailing Lists</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47508">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Mailing Lists">Mailing Lists</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<H3><A name="MailingLists-TuscanyUserList"></A>Tuscany User List</H3>
+
+<P>The user list is for general discussion or questions on using any of the Tuscany sub-projects. Tuscany developers monitor this list and provide assistance when needed.</P>
+
+<P><B>Subscribe</B> to the user mailing list by clicking on <A href="mailto:user-subscribe@tuscany.apache.org" class="external-link" rel="nofollow">Subscribe</A><BR>
+Unsubscribe from the user mailing list by clicking on <A href="mailto:user-unsubscribe@tuscany.apache.org" class="external-link" rel="nofollow">Unsubscribe</A><BR>
+Post on the user mailing list by clicking on <A href="mailto:user@tuscany.apache.org" class="external-link" rel="nofollow">Post</A><BR>
+Read archived mail related to the user list by clicking on  <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user" class="external-link" rel="nofollow">Archive mod_box</A> or <A href="http://www.mail-archive.com/user@tuscany.apache.org/" class="external-link" rel="nofollow">Archive mail archive</A></P>
+
+<H3><A name="MailingLists-TuscanyDeveloperList"></A>Tuscany Developer List</H3>
+
+<P>The developer list is for Tuscany developers to discuss ongoing work, make decisions, and vote on technical issues. There is one list for all Tuscany sub-projects.</P>
+
+<P><B>Subscribe</B> to the developer mailing list by clicking on <A href="mailto:dev-subscribe@tuscany.apache.org" class="external-link" rel="nofollow">Subscribe</A><BR>
+Unsubscribe from the developer mailing list by clicking on <A href="mailto:dev-unsubscribe@tuscany.apache.org" class="external-link" rel="nofollow">Unsubscribe</A><BR>
+Post on the developer mailing list by clicking on <A href="mailto:dev@tuscany.apache.org" class="external-link" rel="nofollow">Post</A><BR>
+Read archived mail related to the developer list by clicking on <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev" class="external-link" rel="nofollow">Archive mod_box</A> or <A href="http://www.mail-archive.com/dev@tuscany.apache.org/" class="external-link" rel="nofollow">Archive mail archive</A></P>
+
+<H3><A name="MailingLists-TuscanyNotificationList"></A>Tuscany Notification List</H3>
+
+<P>The notification list receives notifications from the build system that run Tuscany builds.</P>
+
+<P><B>Subscribe</B> to the notification mailing list by clicking on <A href="mailto:notification-subscribe@tuscany.apache.org" class="external-link" rel="nofollow">Subscribe</A><BR>
+Unsubscribe from the notification mailing list by clicking on <A href="mailto:notification-unsubscribe@tuscany.apache.org" class="external-link" rel="nofollow">Unsubscribe</A><BR>
+Read archived mail related to notification list by clicking on <A href="http://mail-archives.apache.org/mod_mbox/tuscany-notification" class="external-link" rel="nofollow">Archive mod_box</A> or <A href="http://www.mail-archive.com/notification@tuscany.apache.org" class="external-link" rel="nofollow">Archive mail archive</A></P>
+
+<H3><A name="MailingLists-TuscanyCommitsList"></A>Tuscany Commits List</H3>
+
+<P>The commits list receives notifications with diffs when changes are committed to the Tuscany source tree.</P>
+
+<P><B>Subscribe</B> to the commits mailing list by clicking on <A href="mailto:commits-subscribe@tuscany.apache.org" class="external-link" rel="nofollow">Subscribe</A><BR>
+Unsubscribe from the commits mailing list by clicking on <A href="mailto:commits-unsubscribe@tuscany.apache.org" class="external-link" rel="nofollow">Unsubscribe</A><BR>
+Read archived mail related to commits list by clicking on <A href="http://mail-archives.apache.org/mod_mbox/tuscany-commits" class="external-link" rel="nofollow">Archive mod_box</A> or <A href="http://www.mail-archive.com/commits@tuscany.apache.org" class="external-link" rel="nofollow">Archive mail archive</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/main-menu.html b/site/trunk/site-publish/main-menu.html
new file mode 100644
index 0000000000..7e26fa89ab
--- /dev/null
+++ b/site/trunk/site-publish/main-menu.html
@@ -0,0 +1,141 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Main Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47631">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Main Menu">Main Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H4><A name="MainMenu-General"></A>General</H4>
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Home" class="external-link" rel="nofollow">Home</A><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">News &amp; Events</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A><BR>
+<A href="http://www.apache.org/" class="external-link" rel="nofollow">ASF</A></P>
+
+<H4><A name="MainMenu-Community"></A>Community</H4>
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://apache-tuscany.blogspot.com/" class="external-link" rel="nofollow">Blog</A></P>
+
+
+<H4><A name="MainMenu-TuscanySCA"></A>Tuscany SCA</H4>
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Downloads-remove%20after%20upgrade%20to%20new%20format&linkCreation=true&fromPageId=47631" class="createlink">Downloads</A></P>
+
+<H4><A name="MainMenu-TuscanySDO"></A>Tuscany SDO</H4>
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C&#43;&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+
+<H4><A name="MainMenu-TuscanyDAS"></A>Tuscany DAS</H4>
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Overview" class="external-link" rel="nofollow">DAS Overview</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Overview" class="external-link" rel="nofollow">DAS types</A><BR>
+<A href="http://incubator.apache.org/tuscany/das_downloads.html" class="external-link" rel="nofollow">Downloads</A></P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/making-releases.html b/site/trunk/site-publish/making-releases.html
new file mode 100644
index 0000000000..7382bb66c3
--- /dev/null
+++ b/site/trunk/site-publish/making-releases.html
@@ -0,0 +1,701 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Making releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60576">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Making releases">Making releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Makingreleases-GettingReady"></A>Getting Ready</H3>
+
+<P><A href="setting-up-ssh.html" title="Setting up ssh">Setting up ssh</A></P>
+
+<P><A href="create-signing-key.html" title="Create signing key">Create signing key</A></P>
+
+<P><A href="get-hold-of-rat.html" title="Get hold of RAT">Get hold of RAT</A></P>
+
+<H3><A name="Makingreleases-UsefulResources"></A>Useful Resources</H3>
+
+<P><A href="http://incubator.apache.org/guides/releasemanagement.html#best-practice" class="external-link" rel="nofollow">Incubator release best practice </A><BR>
+<A href="http://incubator.apache.org/incubation/Incubation_Policy.html" class="external-link" rel="nofollow">Incubator Policy </A><BR>
+<A href="http://www.apache.org/dev/" class="external-link" rel="nofollow">ASF Developer Guide </A><BR>
+<A href="http://www.apache.org/dev/release.html" class="external-link" rel="nofollow">ASF Release FAQ </A><BR>
+<A href="http://www.apache.org/dev/release.html#license" class="external-link" rel="nofollow">ASF Release Licensing FAQ </A><BR>
+<A href="http://www.apache.org/dev/release-signing.html" class="external-link" rel="nofollow">ASF Release Signing </A><BR>
+<A href="http://www.apache.org/dev/new-committers-guide.html#pgp" class="external-link" rel="nofollow">ASF Comitters Guide </A><BR>
+<A href="http://people.apache.org/~henkp/" class="external-link" rel="nofollow">Henk's ASF Key Guide </A><BR>
+<A href="http://pgp.surfnet.nl/" class="external-link" rel="nofollow">Surfnet Key Server </A><BR>
+<A href="http://pgp.mit.edu/" class="external-link" rel="nofollow">MIT Key Server </A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/java/etc/release-sca.sh" class="external-link" rel="nofollow">Raymond's release script</A></P>
+
+<H3><A name="Makingreleases-ReleaseReviewerCheckList"></A>Release Reviewer Check List</H3>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all RELEASE-NOTES and READMEs etc have the right release number and date<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the RAT output doesn't report missing or non-ASF licenses other than for files that can't have ASF licenses.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all files (that need it) have the ASF copyright and it's the right date<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of source distro<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of binary distro<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the LICENSE and NOTICE files appear at the top level of all /maven modules that will be distributed (these are the tricky ones as they get copied when people add new modules)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that LICENSE files have a copy of all third part licenses for the files in directories below them (jar name and version to which license relates must be clearly marked. Use the list from the distribution lib dir)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that NOTICE files have a copy of all of the copyright statements for the files in directories below the. You have to go through all dependency jars/files that have been copied in and check<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the signatures are in the right format<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the signing key is in the KEYS file and in an external repo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that there are no SNAPSHOT dependencies still in the distribution<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that there is no junk left in the distributions (.log, .tmp, .bak etc)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the distribution match the tag as far as possible. (Our NOTICE files have the module name dropped in automatically so don't match and we don't ship svg files)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the manifests in the jars that we produce have enough information (name of product and version. Scripts below should do this).<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that the project depends on the smallest number of versions of each third party jar<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all samples compile and run from the command line and where appropriate operate correctly in Tomcat/WebSphere/Jetty/Geronimo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check that all demos compile and run from the command line and where appropriate operate correctly in Tomcat/WebSphere/Jetty/Geronimo<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Check to make sure Javadocs are generated for APIs and SPIs.</P>
+
+<H3><A name="Makingreleases-ReleaseManagerReleaseProcess"></A>Release Manager Release Process</H3>
+
+<P>This page borrows many of the commands from <A href="http://svn.apache.org/repos/asf/tuscany/java/etc/release-sca.sh" class="external-link" rel="nofollow">Raymond's release script</A> but with a bit more explanation and a few extra useful commands. The commands here were taken from when release 1.1 RC3a was under preparation. Note that this document has been updated from experience gained with the SDO 1.1.1 release, which was the first release made after exiting incubation; as such, whilst the release names used in this document refer to an &quot;incubating&quot; version,  the svn repository and the maven repository have been updated to the non incubating versions. It's also fair to say that it's unlikely that you will want to run all of these commands in sequence as you generally end up repeating sections as release preparation progresses.</P>
+
+<H4><A name="Makingreleases-Callforrelease"></A>Call for release</H4>
+
+<P>At some point someone in the community will call for a release based on the features and fixes that have been under development in the trunk. Typically the first stage in the release process is to decide on who is going to be the release manager, i.e. who is going to ensure that all the steps are taken to ensure a good release. This will typical involve someone volunteering and a vote on the dev list. The next thing is the create a branch where the code can be stabilized and testing can start on the release artifacts. It's useful to try and ensure that the code is complete as possible and that all the samples run before the branch is created. This removes the need for a lot of double fixing between the branch and the trunk.</P>
+
+<H4><A name="Makingreleases-Createthebranch"></A>Create the branch</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn copy https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/java/sca https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.1  -m <SPAN class="code-quote">&quot;Branch <SPAN class="code-keyword">for</SPAN> 1.1&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Once the branch is created the version number in trunk can be updated.</P>
+
+<H4><A name="Makingreleases-Fixupthebranchwork"></A>Fix up the branch work</H4>
+
+<P>First checkout the branch so that you can work on it. These commands assume that a local directory called &quot;branches&quot; is present.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd branches
+svn co https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/branches/sca-java-1.1/ 1.1-RC3a</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Remove all the files that are not going to be part of the release, test all the samples and check all of the LICENSE and NOTICE files.</P>
+
+<P>Check dependencies are as you would expect them to be. In particular check that we aren't depending on many different versions of third part jars. If we are this has the side effect of messing up the generated build files. If module A depends on x.jar v1.2 and module B depends on x.jar v1.3 then when a build file that is generated for a sample that only depends on module A the stated x.jar dependency will be v1.2. Of course the distribution build will make sure that only v1.3 is actually shipped and so the ant build will fail.  (TODO - need better automation)</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca
+mvn -o -Pdependencies -Dmaven.test.skip=<SPAN class="code-keyword">true</SPAN>
+find . -name dependency.txt -exec cat '{}' &gt;&gt; deptotal.txt \;
+</PRE>
+</DIV></DIV>
+
+<P>or</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca
+mvn dependency:tree
+</PRE>
+</DIV></DIV>
+
+<P>Use you favorite spreadsheet tool to open deptotal.txt and order on the first column to see across the project what dependencies we have on what libraries/versions.</P>
+
+<P>Once the branch is at the stage where a release candidate can be created for testing prepare to make a tag.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>&quot;Tip&quot;</B><BR>When making changes to a branch or tag that are also relevant to the trunk,  it's much easier to apply the changes to the trunk at the time,  rather than wait and risk losing the changes.  Svn provides a simple one line way to do this with the &quot;svn merge&quot; command.  In the root directory of a checked out version of the trunk,  if you run a command like the following ...
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn merge -r 674473:674474 https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/tags/java/sdo/1.1.1-RC2a/ .</SPAN>
+</PRE>
+</DIV></DIV>
+
+
+<P>then that will apply the same edits as were made in the 674474 commit in the tag; merging them into your checked out version of the current trunk.  The earlier you do this,  the less likely that svn will present you with conflicts to resolve.</P></TD></TR></TABLE></DIV>
+
+<H4><A name="Makingreleases-CreateTag1.1RC3a"></A>Create Tag 1.1-RC3a</H4>
+
+<P>These commands assume that a local directory called &quot;tags&quot; is present.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags
+svn co https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/branches/sca-java-1.1/ 1.1-RC3a</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Notice that all we are doing here is just checking out the branch again. This allows any last minute fixes to be taken from the branch in subversion and allows the version numbers in the tag to be corrected without affecting the branch, assuming that more than one tag will be required to complete the release process.</P>
+
+<H4><A name="Makingreleases-Fixthereleasedates"></A>Fix the release dates</H4>
+
+<P>In various files under distribution/src/main/release the month of release is quoted. Fix this to be the expected release month.</P>
+
+<H4><A name="Makingreleases-Checkthenoticedates"></A>Check the notice dates</H4>
+
+<P>It's not clear what the policy for dates in notice files is currently. We have gone for the following...</P>
+
+<P>Copyright (c) 2005 - 2009 The Apache Software Foundation</P>
+
+<P>As the project moves forward we need to check that the last date matches the current year. If you need to change all the notice files here's a script</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> i in `/usr/bin/find . -name <SPAN class="code-quote">&quot;NOTICE&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> sed <SPAN class="code-quote">&quot;s/Copyright (c) 2005 - 2008/Copyright (c) 2005 - 2009/g&quot;</SPAN> $i &gt;/tmp/tmp.notice; cp /tmp/tmp.notice $i; done
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-ChangetheversionID"></A>Change the version ID</H4>
+
+<P>The &quot;-SNAPSHOT&quot; is removed from the end of the version string. This ensures that the only thing building with the release version number on your PC is the tag being tested.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a
+<SPAN class="code-keyword">for</SPAN> i in `/usr/bin/find . -name <SPAN class="code-quote">&quot;*.xml&quot;</SPAN> -o -name <SPAN class="code-quote">&quot;*.java&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> grep 1.3-SNAPSHOT $i&gt;/dev/<SPAN class="code-keyword">null</SPAN>; then sed <SPAN class="code-quote">&quot;s/1.3-SNAPSHOT/1.3/g&quot;</SPAN> $i &gt;/tmp/tmp.xml; cp /tmp/tmp.xml $i; fi; done
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-GeneratetheRATreport"></A>Generate the RAT report</H4>
+
+<P>Create the report.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags
+java -jar C:\simon\apps\rat-0.5.1\rat-0.5.1.jar 1.1-RC3a &gt; rat-1.1-RC3a.txt
+</PRE>
+</DIV></DIV>
+
+<P>Copy the report  up onto the staging repo. You should of course check the report at this stage.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scp rat-1.1-RC3a.txt slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>&quot;Tip&quot;</B><BR>If you need to regenerate the RAT report after you have started on the steps that follow run &quot;mvn clean&quot; first to avoid complains about the files under target folders</TD></TR></TABLE></DIV>
+
+<H4><A name="Makingreleases-Buildfromtoplevel"></A>Build from top level</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a
+mvn -o clean install
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/demos
+mvn -fae -o clean install
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/tutorial
+mvn -fae -o clean install
+</PRE>
+</DIV></DIV>
+
+
+<H4><A name="Makingreleases-Builddistribution"></A>Build distribution</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution
+mvn -o clean install
+</PRE>
+</DIV></DIV>
+
+<P>Check that the &quot;all&quot; jar is in place as with some JDKs this step fails intermittently</P>
+
+<H4><A name="Makingreleases-Copythedistributiontosomewhereandtryit"></A>Copy the distribution to somewhere and try it</H4>
+
+<P>Try all the samples/demos</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant run
+</PRE>
+</DIV></DIV>
+
+<P>and</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ant build
+ant run
+</PRE>
+</DIV></DIV>
+
+<P>The war samples are currently to be tested with</P>
+
+<UL class="alternate" type="square">
+	<LI>Tomcat 5.5.20 and Tomcat 6.0.14</LI>
+	<LI>Jetty 6.1.3</LI>
+	<LI>Geronimo 2.0.2 Tomcat6 jee5</LI>
+	<LI>WebSphere 6.1 fix pack 9&#43;</LI>
+</UL>
+
+
+<P>Clean you local repo of SCA modules and compile the source distro and run some samples to</P>
+
+<P>Check for copyrights in the code to ensure that are what you are expecting</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grep -iR --exclude=LICENSE --exclude=NOTICE Copyright * | awk '{<SPAN class="code-keyword">if</SPAN> (!match($0, <SPAN class="code-quote">&quot;.+ASF.+&quot;</SPAN>)) {print $0}}'
+</PRE>
+</DIV></DIV>
+
+<P>check all the NOTICE files</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> i in `find . -name NOTICE`; <SPAN class="code-keyword">do</SPAN> echo XXXXXXXXXXXXXXXXXXXXXXXXXXXX; echo $i; cat $i; done &gt; ../tmp
+</PRE>
+</DIV></DIV>
+
+<P>Check for any SNAPSHOTS left in by mistake</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grep -r --include=*.xml SNAPSHOT *
+</PRE>
+</DIV></DIV>
+
+<P>Check the LICENSE file against what is provided in the distributions. There is no automation for this bit.</P>
+
+<P>Check that all jars in the distribution\lib is mentioned on the binary LICENSE</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in *.jar; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> grep -q $fn ../LICENSE; then <SPAN class="code-quote">&quot;$fn&quot;</SPAN>; <SPAN class="code-keyword">else</SPAN> <SPAN class="code-quote">&quot;$fn NOT present&quot;</SPAN>; fi; done
+</PRE>
+</DIV></DIV>
+
+<P>For 2.x this is</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in `find . -name <SPAN class="code-quote">&quot;*.jar&quot;</SPAN> -printf <SPAN class="code-quote">&quot;%f\n&quot;</SPAN>`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> grep -q $fn ../LICENSE; then <SPAN class="code-quote">&quot;-&quot;</SPAN>; <SPAN class="code-keyword">else</SPAN> <SPAN class="code-quote">&quot;$fn NOT present&quot;</SPAN>; fi; done;
+</PRE>
+</DIV></DIV>
+
+<P>And check that all jars that are mentioned are present</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in `awk '/.jar/ {<SPAN class="code-keyword">if</SPAN> (match($0,<SPAN class="code-quote">&quot;[a-zA-Z0-9._-]+[.]jar&quot;</SPAN>)) {print substr($0, RSTART,RLENGTH) } }' ../LICENSE`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> ls | grep -q $fn; then echo <SPAN class="code-quote">&quot;$fn&quot;</SPAN>;<SPAN class="code-keyword">else</SPAN> echo <SPAN class="code-quote">&quot;&gt;&gt;&gt; $fn NOT present&quot;</SPAN>; fi; done
+</PRE>
+</DIV></DIV>
+
+<P>For 2.x this is</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> fn in `awk '/.jar/ {<SPAN class="code-keyword">if</SPAN> (match($0,<SPAN class="code-quote">&quot;[a-zA-Z0-9._-]+[.]jar&quot;</SPAN>)) {print substr($0, RSTART,RLENGTH) } }' ../LICENSE`; <SPAN class="code-keyword">do</SPAN> <SPAN class="code-keyword">if</SPAN> ls * | grep -q $fn; then echo <SPAN class="code-quote">&quot;-&quot;</SPAN>;<SPAN class="code-keyword">else</SPAN> echo <SPAN class="code-quote">&quot;&gt;&gt;&gt; $fn NOT present&quot;</SPAN>; fi; done
+</PRE>
+</DIV></DIV>
+
+<P>Check for junk included by accident</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  find . -name log -print
+  find . -name work -print
+  find . -name lck -print
+  find . -name activemq-data -print
+  find . -name temp -print
+  find . -name tmp -print
+</PRE>
+</DIV></DIV>
+
+<P>Once you are happy with the release artifacts you can sign them and make them available for review.</P>
+
+<H4><A name="Makingreleases-Signtheartifacts"></A>Sign the artifacts</H4>
+
+<P>Linux</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/target
+<SPAN class="code-keyword">for</SPAN> i in *.zip *.gz; <SPAN class="code-keyword">do</SPAN> gpg --output $i.asc --detach-sig --armor $i; done
+<SPAN class="code-keyword">for</SPAN> i in *.zip *.gz; <SPAN class="code-keyword">do</SPAN> openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' &gt; $i.md5; done
+</PRE>
+</DIV></DIV>
+
+<P>Windows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> %A in (*.zip) <SPAN class="code-keyword">do</SPAN> gpg --output %A.asc --detach-sig --armor %A
+<SPAN class="code-keyword">for</SPAN> %A in (*.gz) <SPAN class="code-keyword">do</SPAN> gpg --output %A.asc --detach-sig --armor %A
+<SPAN class="code-keyword">for</SPAN> %A in (*.zip) <SPAN class="code-keyword">do</SPAN> gpg --print-md md5 %A &gt; %A.md5
+<SPAN class="code-keyword">for</SPAN> %A in (*.gz) <SPAN class="code-keyword">do</SPAN> gpg --print-md md5 %A &gt; %A.md5
+</PRE>
+</DIV></DIV>
+
+<P>The commands above should produce artifacts of an appropriate format, as follows.</P>
+
+<P>md5 should look like</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  8fb7cb398063ed0dffa414168468fffc *apache-tuscany-sca-1.1-incubating.zip
+</PRE>
+</DIV></DIV>
+
+<P>asc should look like</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (Cygwin)
+
+iD8DBQBHnLGGE8fTrnkHPxIRAqPmAJ4tOR6W663FKCXHPi1GlLBWDyZwJgCeMqbb
+68DOq0YsU/O7kJsBHuZXhJw=
+=elh0
+-----END PGP SIGNATURE-----
+</PRE>
+</DIV></DIV>
+
+<P>Also you now need to sign the jars in the Eclipse update site.</P>
+
+<P>cd to both plugins and features and run:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/target/apache-tuscany-sca-&lt;releasenum&gt;-updatesite.dir/tuscany-sca-&lt;releasenum&gt;-updatesite/plugins
+<SPAN class="code-keyword">for</SPAN> i in *.jar; <SPAN class="code-keyword">do</SPAN> gpg --output $i.asc --detach-sig --armor $i; done
+<SPAN class="code-keyword">for</SPAN> i in *.jar; <SPAN class="code-keyword">do</SPAN> openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' &gt; $i.md5; done
+cd ../features
+<SPAN class="code-keyword">for</SPAN> i in *.jar; <SPAN class="code-keyword">do</SPAN> gpg --output $i.asc --detach-sig --armor $i; done
+<SPAN class="code-keyword">for</SPAN> i in *.jar; <SPAN class="code-keyword">do</SPAN> openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' &gt; $i.md5; done
+</PRE>
+</DIV></DIV>
+
+
+<P>And then sign site.xml in the top level of the updatesite directory</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd ..
+<SPAN class="code-keyword">for</SPAN> i in *.xml; <SPAN class="code-keyword">do</SPAN> gpg --output $i.asc --detach-sig --armor $i; done
+<SPAN class="code-keyword">for</SPAN> i in *.xml; <SPAN class="code-keyword">do</SPAN> openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' &gt; $i.md5; done
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Puttheartifactsupinyourhomedirectoryonpeople.apache.org"></A>Put the artifacts up in your home directory on people.apache.org</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/target
+scp *.asc slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+scp *.md5 slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+scp *.zip slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+scp *.gz slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/target/apache-tuscany-sca-&lt;releasenum&gt;-updatesite.dir
+scp -r * slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/src/main/release
+scp RELEASE_NOTES slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+scp CHANGES slaws@people.apache.org:public_html/tuscany/1.1-RC3a
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Checkpermissionsonthefiles"></A>Check permissions on the files</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+chmod 644 *.zip
+chmod 644 *.gz
+chmod 644 *.txt
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Deploythemavenartifacts"></A>Deploy the maven artifacts</H4>
+
+<P>Note below that the reference to &quot;apache.incubator&quot; in the &quot;id&quot; part of the &#45;DaltDeploymentRepository argument to the maven deploy plugin is simply an identifier relating to a stanza in your local maven repo's settings.xml file. Note that also if you use ssh authentication by referencing a file containing your private key from the settings.xml file, then be sure to use a file in open ssh format. &nbsp;People who have followed the apache <A href="http://www.apache.org/dev/user-ssh-windows.html" class="external-link" rel="nofollow">instructions for creating ssh keys on Windows</A> with putty will probably not have created open ssh format files. You can however convert your .ppk file to the open ssh forrmat by loading it into puttygen and using the conversion menu.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a
+mvn -N -DaltDeploymentRepository=apache.incubator::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/slaws/public_html/tuscany/1.1-RC3a/maven install gpg:sign deploy:deploy -Dgpg.passphrase=
+</SPAN>
+cd tools
+mvn clean
+mvn -DaltDeploymentRepository=apache.incubator::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/slaws/public_html/tuscany/1.1-RC3a/maven install gpg:sign deploy:deploy -Dgpg.passphrase=
+</SPAN>
+cd modules
+mvn clean
+mvn -DaltDeploymentRepository=apache.incubator::<SPAN class="code-keyword">default</SPAN>::scp:<SPAN class="code-comment">//people.apache.org/home/slaws/public_html/tuscany/1.1-RC3a/maven install gpg:sign deploy:deploy -Dgpg.passphrase=
+</SPAN>
+NOTE:Remove non jar artifacts from stage repo
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Deploythealljar"></A>Deploy the all jar</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd tags/1.1-RC3a/distribution/bundle/target
+mvn gpg:sign-and-deploy-file -DgroupId=org.apache.tuscany.sca -DartifactId=tuscany-sca-all -Dversion=1.1-incubating -Dpackaging=jar -Dfile=tuscany-bundle-1.1-incubating.jar -DrepositoryId=apache.incubator -Durl=scp:<SPAN class="code-comment">//&lt;userid@&gt;people.apache.org/home/slaws/public_html/tuscany/1.1-RC3a/maven -Dkeyname=slaws -Dpassphrase=</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> I have to go in and sign the pom for the all jar manually as it didn't happen automatically?</P>
+
+<H4><A name="Makingreleases-CheckthattheMavenartifactswork"></A>Check that the Maven artifacts work</H4>
+
+<P>Point you maven build at your p.a.o dir as a temporary mirror, for example, add mirror element to the settings.xml file (usually found at .m2/settings)</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  &lt;mirrors&gt;
+   &lt;mirror&gt;
+     &lt;id&gt;ant.staging&lt;/id&gt;
+     &lt;url&gt;http:<SPAN class="code-comment">//people.apache.org/~slaws/tuscany/1.1-RC3a/maven&lt;/url&gt;
+</SPAN>     &lt;mirrorOf&gt;apache.incubator&lt;/mirrorOf&gt;
+   &lt;/mirror&gt;
+  &lt;/mirrors&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Clean your local SCA artifacts and use maven to compile samples and see if they run.</P>
+
+<H4><A name="Makingreleases-Checkinthetag"></A>Check in the tag</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn copy 1.1-RC3a https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/tags/java/sca/1.1-RC3a/ -m <SPAN class="code-quote">&quot;Tag <SPAN class="code-keyword">for</SPAN> 1.1-RC3a&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Startvoting"></A>Start voting</H4>
+
+<P>The PPMC will vote first. This may give rise to a new release candidate being required. If so you need to go back and start at the &quot;Create Tag&quot; step but using the next RC number.</P>
+
+<P>Once the PPMC vote is complete the vote is moved across to the IPMC. Once all the votes are complete the artifacts that have been voted on can be release.</P>
+
+
+<H4><A name="Makingreleases-Onceallthevotingiscomplete"></A>Once all the voting is complete</H4>
+
+<P>Copy the artifacts from your directory on people.apache.org to:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/www/www.apache.org/dist/tuscany/java/sca/1.3.2
+</PRE>
+</DIV></DIV>
+
+<P>except for the tuscany-sca-&lt;releasenum&gt;-updatesite-publish directory. The contents of this directory should be checked into svn under:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/site/trunk/site-publish/updatesite/java/sca/&lt;releasenum&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Also check that the KEYS file is up to date.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/www/www.apache.org/dist/tuscany
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Copythestagingrepototheliverepo"></A>Copy the staging repo to the live repo</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn stage:copy -Dsource=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//people.apache.org/~slaws/tuscany/1.1-RC3a/maven&quot;</SPAN> -Dtarget=<SPAN class="code-quote">&quot;scp://&lt;userid@&gt;people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository&quot;</SPAN> -Dversion=1.1</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You'll need the maven stage plugin to do this. Since maven-stage-plugin is not published, the release manager should checkout the source for the  plugin and build it.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+http:<SPAN class="code-comment">//svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Or, instead of using the Maven stage plugin just manually copy the artifacts there:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cp -p -v -R  sca/  /x1/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/sca
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Checkthepermissionsintherepo"></A>Check the permissions in the repo</H4>
+
+<P>There is a script in the SNAPSHOT report that sets the permissions correctly.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd  /www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/sca
+/www/people.apache.org/repo/m2-snapshot-repository/fix-permissions.sh
+</PRE>
+</DIV></DIV>
+
+<H4><A name="Makingreleases-Copythereleasecandidatetagtothefinaltagname."></A>Copy the release candidate tag to the final tag name.</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn copy https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/tags/java/sca/1.1-RC3a/ https://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.1 -m <SPAN class="code-quote">&quot;Copy 1.1-RC3a tag as 1.1&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/maven-plugins.html b/site/trunk/site-publish/maven-plugins.html
new file mode 100644
index 0000000000..36129b2ef6
--- /dev/null
+++ b/site/trunk/site-publish/maven-plugins.html
@@ -0,0 +1,183 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Maven Plugins</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45849">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Maven Plugins">Maven Plugins</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<H1><A name="MavenPlugins-MavenPlugins"></A>Maven Plugins</H1>
+
+<P>Apache Tuscany provides a set of <A href="http://maven/apache.org/index.html" class="external-link" rel="nofollow">Apache Maven</A> Plugins to assist in the development of SCA applications. These simplify common build-time tasks such as generating code, packaging artifacts such as wars, and testing applications.</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Plugin</TH>
+<TH class="confluenceTh">Id</TH>
+<TH class="confluenceTh">Description</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-composite-plugin" class="external-link" rel="nofollow">Composite</A></TD>
+<TD class="confluenceTd">org.apache.tuscany:tuscany-composite-plugin</TD>
+<TD class="confluenceTd">Simplifies packaging of SCA composites.</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-war-plugin" class="external-link" rel="nofollow">WAR Packaging</A></TD>
+<TD class="confluenceTd">org.apache.tuscany:tuscany-war-plugin</TD>
+<TD class="confluenceTd">Adds an Apache Tuscany runtime to a web application.</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-itest-plugin" class="external-link" rel="nofollow">Integration Test</A></TD>
+<TD class="confluenceTd">org.apache.tuscany:tuscany-itest-plugin</TD>
+<TD class="confluenceTd">Supports integration testing of SCA components during a build.</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/menu3.html b/site/trunk/site-publish/menu3.html
new file mode 100644
index 0000000000..7d5ad6c9da
--- /dev/null
+++ b/site/trunk/site-publish/menu3.html
@@ -0,0 +1,90 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Menu3 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55873">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="Menu3">Menu3</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-developer-guide.html" title="SCA Java Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/menus.html b/site/trunk/site-publish/menus.html
new file mode 100644
index 0000000000..83748f633a
--- /dev/null
+++ b/site/trunk/site-publish/menus.html
@@ -0,0 +1,149 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Menus</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54955">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Menus">Menus</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-component-type.html b/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-component-type.html
new file mode 100644
index 0000000000..a5c090bcae
--- /dev/null
+++ b/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-component-type.html
@@ -0,0 +1,155 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Mike Edwards Ramble through Adding a New Component Type : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=53224">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">SCA Java Extension Development Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Mike Edwards Ramble through Adding a New Component Type">Mike Edwards Ramble through Adding a New Component Type</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H2><A name="MikeEdwardsRamblethroughAddingaNewComponentType-AddingaNewComponentType"></A>Adding a New Component Type</H2>
+
+<P>(3rd May 2007) I wanted to get the Spring and BPEL component types running with the new Tuscany Java core.&nbsp; This page and those hung off it are my ramblings as I go through the process of building the code for these component types.&nbsp; I hope that these will help anyone else who wants to venture down the path of adding a component type.&nbsp; Beware that I make no claims as to great insight or special knowledge - and I am sure that there will be things that I have not tackled.</P>
+
+<P>Associated with this general page is a set of pages dedicated to <A href="adding-the-spring-component-type.html" title="Adding the Spring Component Type">Adding the Spring Component Type</A> where specifics relating to the Spring implementation are described.</P>
+
+<H2><A name="MikeEdwardsRamblethroughAddingaNewComponentType-BasicInformationaboutcodeforaComponentType%26nbsp%3B"></A>Basic Information about code for a Component Type&nbsp;</H2>
+
+<P>To create a Module which supports a Component Type, you need to implement a series of interfaces to the Tuscany Core, plus a set of related files which declare your Module to the core:</P>
+<UL>
+	<LI>xxxModuleActivator class, which implements the ModuleActivator interface</LI>
+	<LI>ModuleActivator file</LI>
+	<LI>xxxArtifactProcessor class, which processes the XML for an implementation type</LI>
+	<LI>xxxImplementation class, which represents a runtime instance of the implementation type</LI>
+</UL>
+
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewComponentType-HowdoesaComponentTypeModuledeclaretheXMLthatithandles%3F"></A>How does a Component Type Module declare the XML that it handles?</H3>
+
+<P>For a Component Type module, it is going to handle the XML &lt;implementation.xxx.../&gt;, which is a child of a &lt;component.../&gt; element in the SCDL.</P>
+
+<P>How does the module indicate to the core that it handles the &lt;implementation.xxx.../&gt; element?</P>
+
+<P>TODO: Get an answer to this question....&nbsp;</P>
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewComponentType-xxxModuleActivatorclass"></A>xxxModuleActivator class</H3>
+
+<P>Called when the Tuscany core is loading, starting and stopping the Module which implements the component type.</P>
+
+<P>Implements ModuleActivator interface, with 3 methods:</P>
+<UL>
+	<LI>start</LI>
+	<LI>stop</LI>
+	<LI>getExtensionPoints</LI>
+</UL>
+
+
+<P>Of these, start() is the most important - it seems possible to get by with the other 2 doing nothing.</P>
+
+<P>Start handles:&nbsp;</P>
+<UL>
+	<LI>Registration of xxxArtifactProcessor, which handles the &lt;implementation.xxx..../&gt; XML</LI>
+	<LI>Registration of xxxComponentBuilder, which builds a component of the type handled by the module</LI>
+	<LI>Registration of xxxPropertyValueObjectFactory</LI>
+</UL>
+
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewComponentType-TheModuleActivatorfile%26nbsp%3B"></A>The ModuleActivator file&nbsp;</H3>
+
+<P>This must be placed into the location</P>
+
+<P>META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator</P>
+
+<P>... this will be under the Resources directory in the source tree</P>
+
+<P>The file contains the class name for the implementation of your Module, eg:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"># Implementation class <SPAN class="code-keyword">for</SPAN> the ExtensionActivator <SPAN class="code-keyword">for</SPAN> module Foo
+org.apache.tuscany.implementation.foo.FooModuleActivator</PRE>
+</DIV></DIV>
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewComponentType-ThexxxArtifactProcessorclass"></A>The xxxArtifactProcessor class</H3>
+
+<P>This class is called to deal with the XML in the composite SCDL files which relates to the implementation type - ie. &lt;implementation.xxx.../&gt;</P>
+
+<P>The class is passed an XML stream which it reads and parses out the contents of the &lt;implementation.xxx.../&gt; element, principally getting all of the attributes and child elements (if present).</P>
+
+<P>When the information has been parsed out, the xxxArtifactProcessor class creates an xxxImplementation object which represents the runtime component corresponding to the implementation.xxx element.</P>
+
+<P>One other step that is handled by the xxxArtifactProcessor class is the resolution of the componentType for the component - teasing out its services, references and properties.&nbsp; This is either done by introspection of the implementation (instance) or via reading a componentType side file.&nbsp;</P>
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewComponentType-xxxImplementationclass"></A>xxxImplementation class</H3>
+
+<P>The xxxImplementation class represents the implementation instances themselves.</P>
+
+<P>Implements the org.apache.tuscany.assembly.Implementation interface&nbsp;</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-implementation-type.html b/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-implementation-type.html
new file mode 100644
index 0000000000..3fb2672b36
--- /dev/null
+++ b/site/trunk/site-publish/mike-edwards-ramble-through-adding-a-new-implementation-type.html
@@ -0,0 +1,191 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Mike Edwards Ramble through Adding a New Implementation Type</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53224">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">SCA Java Extension Development Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Mike Edwards Ramble through Adding a New Implementation Type">Mike Edwards Ramble through Adding a New Implementation Type</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-AddingaNewImplementationType"></A>Adding a New Implementation Type</H2>
+
+<P>(3rd May 2007) I wanted to get the Spring and BPEL implementation types running with the new Tuscany Java core.&nbsp; This page and those hung off it are my ramblings as I go through the process of building the code for these implementation types.&nbsp; I hope that these will help anyone else who wants to venture down the path of adding an implementation type.&nbsp; Beware that I make no claims as to great insight or special knowledge - and I am sure that there will be things that I have not tackled.</P>
+
+<P>Associated with this general page is a set of pages dedicated to <A href="adding-the-spring-implementation-type.html" title="Adding the Spring Implementation Type">Adding the Spring Implementation Type</A> where specifics relating to the Spring implementation are described.</P>
+
+<H2><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-BasicInformationaboutcodeforanImplementationType%26nbsp%3B"></A>Basic Information about code for an Implementation Type&nbsp;</H2>
+
+<P>To create a Module which supports an Implementation Type, you need to implement a series of interfaces to the Tuscany Core, plus a set of related files which declare your Module to the core:</P>
+<UL>
+	<LI>xxxModuleActivator class, which implements the ModuleActivator interface</LI>
+	<LI>ModuleActivator file, which identifies your code to the core as providing an implementation type</LI>
+	<LI>xxxArtifactProcessor class, which processes the XML for an implementation type</LI>
+	<LI>xxxImplementation class, which represents a runtime instance of the implementation type</LI>
+</UL>
+
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-HowdoesaImplementationTypeModuledeclaretheXMLthatithandles%3F"></A>How does a Implementation Type Module declare the XML that it handles?</H3>
+
+<P>For an Implementation Type module, it is going to handle the XML &lt;implementation.xxx.../&gt;, which is a child of a &lt;component.../&gt; element in the SCDL.</P>
+
+<P>How does the module indicate to the core that it handles the &lt;implementation.xxx.../&gt; element?</P>
+
+<P>This is done through the xxxArtifactProcessor.getArtifactType() method.&nbsp; This method returns a QName for the XML element that it implements (ie a combination of the Namespace and the Element name of the element).&nbsp;</P>
+
+<P>The QName for the implementation type is read by the core at the point where the xxxModuleActivator class invokes the addArtifactProcessor() method of the StAXArtifactProcessorExtensionPoint for the core Registry, typically in the start() method of the xxxModuleActivator class.</P>
+
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-xxxModuleActivatorclass"></A>xxxModuleActivator class</H3>
+
+<P>Called when the Tuscany core is loading, starting and stopping the Module which provides the implementation type.</P>
+
+<P>Implements ModuleActivator interface, with 3 methods:</P>
+<UL>
+	<LI>start</LI>
+	<LI>stop</LI>
+	<LI>getExtensionPoints</LI>
+</UL>
+
+
+<P>Of these, start() is the most important - it seems possible to get by with the other 2 doing nothing.</P>
+
+<P>start() handles:&nbsp;</P>
+<UL>
+	<LI>Registration of xxxArtifactProcessor, which handles the &lt;implementation.xxx..../&gt; XML</LI>
+	<LI>Registration of xxxImplementationProviderFactory, which is a factory class for xxxImplementation objects, which represent instances of the implementation type provided by the module</LI>
+	<LI>Creation of objects of various types that may be required by the xxxArtifactProcessor and xxxImplementationProviderFactory classes</LI>
+</UL>
+
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-TheModuleActivatorfile%26nbsp%3B"></A>The ModuleActivator file&nbsp;</H3>
+
+<P>This must be placed into the location</P>
+
+<P>META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator</P>
+
+<P>... this will be under the Resources directory in the source tree</P>
+
+<P>The file contains the class name for the implementation of your Module, eg:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"># Implementation class <SPAN class="code-keyword">for</SPAN> the ExtensionActivator <SPAN class="code-keyword">for</SPAN> module Foo
+org.apache.tuscany.implementation.foo.FooModuleActivator
+</PRE>
+</DIV></DIV>
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-ThexxxArtifactProcessorclass"></A>The xxxArtifactProcessor class</H3>
+
+<P>This class is called to deal with the XML in the composite SCDL files which relates to the implementation type - ie. &lt;implementation.xxx.../&gt;</P>
+
+<P>The class is passed an XML stream which it reads and parses out the contents of the &lt;implementation.xxx.../&gt; element, principally getting all of the attributes and child elements (if present).</P>
+
+<P>When the information has been parsed out, the xxxArtifactProcessor class creates an xxxImplementation object which represents the runtime component corresponding to the implementation.xxx element.</P>
+
+<P>One other step that is handled by the xxxArtifactProcessor class is the resolution of the componentType for the component - teasing out its services, references and properties.&nbsp; This is either done by introspection of the implementation (instance) or via reading a componentType side file.&nbsp;</P>
+
+<H3><A name="MikeEdwardsRamblethroughAddingaNewImplementationType-xxxImplementationclass"></A>xxxImplementation class</H3>
+
+<P>The xxxImplementation class represents the implementation instances themselves.</P>
+
+<P>Implements the org.apache.tuscany.assembly.Implementation interface&nbsp;</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/named-parameters-support.html b/site/trunk/site-publish/named-parameters-support.html
new file mode 100644
index 0000000000..5c6601450a
--- /dev/null
+++ b/site/trunk/site-publish/named-parameters-support.html
@@ -0,0 +1,195 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Named parameters support</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66139">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Named parameters support">Named parameters support</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Namedparameterssupport-Namedparameterssupport"></A>Named parameters support</H1>
+
+<P>JDB API requires indexed parameter setting. i.e. statement.setXXX(int, value). But in the DAS client<BR>
+it may be helpful to provide named parameters setting on the command. This is particularly convenient<BR>
+when the table involves many columns during insert/update. </P>
+
+<P>Below are config schema portion supporting this.</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;xsd:complexType name=&quot;Parameter&quot;&gt;
+  &lt;xsd:attribute name=&quot;name&quot; type=&quot;xsd:string&quot;/&gt;
+  &lt;xsd:attribute name=&quot;columnType&quot; type=&quot;xsd:string&quot;/&gt;
+  &lt;xsd:attribute name=&quot;direction&quot; type=&quot;xsd:string&quot; default=&quot;IN&quot;/&gt;
+  &lt;xsd:attribute name=&quot;index&quot; type=&quot;xsd:int&quot;/&gt;
+&lt;/xsd:complexType&gt;
+&lt;xsd:complexType name=&quot;Parameters&quot;&gt;
+  &lt;xsd:sequence&gt;
+	&lt;xsd:element maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot; name=&quot;Parameter&quot; type=&quot;config:Parameter&quot;/&gt;
+  &lt;/xsd:sequence&gt;
+&lt;/xsd:complexType&gt;
+&lt;xsd:complexType name=&quot;Create&quot;&gt;
+  &lt;xsd:sequence&gt;
+    &lt;xsd:element maxOccurs=&quot;1&quot; minOccurs=&quot;0&quot; name=&quot;Parameters&quot; type=&quot;config:Parameters&quot;/&gt;
+  &lt;/xsd:sequence&gt;
+  &lt;xsd:attribute name=&quot;sql&quot; type=&quot;xsd:string&quot;/&gt;
+&lt;/xsd:complexType&gt;
+&lt;xsd:complexType name=&quot;Update&quot;&gt;
+  &lt;xsd:sequence&gt;
+    &lt;xsd:element maxOccurs=&quot;1&quot; minOccurs=&quot;0&quot; name=&quot;Parameters&quot; type=&quot;config:Parameters&quot;/&gt;
+  &lt;/xsd:sequence&gt;
+  &lt;xsd:attribute name=&quot;sql&quot; type=&quot;xsd:string&quot;/&gt;
+&lt;/xsd:complexType&gt;
+&lt;xsd:complexType name=&quot;Delete&quot;&gt;
+  &lt;xsd:sequence&gt;
+    &lt;xsd:element maxOccurs=&quot;1&quot; minOccurs=&quot;0&quot; name=&quot;Parameters&quot; type=&quot;config:Parameters&quot;/&gt;
+  &lt;/xsd:sequence&gt;
+  &lt;xsd:attribute name=&quot;sql&quot; type=&quot;xsd:string&quot;/&gt;
+&lt;/xsd:complexType&gt;
+&lt;xsd:complexType name=&quot;Command&quot;&gt;
+  &lt;xsd:sequence&gt;
+     &lt;xsd:element maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot; name=&quot;Parameter&quot; type=&quot;config:Parameter&quot;/&gt;
+     &lt;xsd:element maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot; name=&quot;ResultDescriptor&quot; type=&quot;config:ResultDescriptor&quot;/&gt;
+  &lt;/xsd:sequence&gt;
+  &lt;xsd:attribute name=&quot;name&quot; type=&quot;xsd:string&quot;/&gt;
+  &lt;xsd:attribute name=&quot;SQL&quot; type=&quot;xsd:string&quot;/&gt;
+  &lt;xsd:attribute name=&quot;kind&quot; type=&quot;xsd:string&quot;/&gt;
+&lt;/xsd:complexType&gt;
+</PRE>
+</DIV></DIV>
+
+<P>User can do Command.setParameter(String name, Object value), getParameter(String name). Indexed set/getParameter() is available as before. Also &lt;create&gt;, &lt;update&gt;, &lt;delete&gt; from Config support named parameters.</P>
+
+<P>example config:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xmlns=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt; 
+&lt;Table tableName=&quot;CUSTOMER&quot;&gt;  		 
+  &lt;create sql=&quot;insert into customer values (?, ?, ?)&quot; &gt;
+    &lt;Parameters&gt;
+      &lt;Parameter name=&quot;ID&quot; index=&quot;1&quot;/&gt;
+      &lt;Parameter name=&quot;LASTNAME&quot; index=&quot;1&quot;/&gt;
+      &lt;Parameter name=&quot;ADDRESS&quot; index=&quot;3&quot;/&gt;
+    &lt;/Parameters&gt;
+  &lt;/create&gt;
+&lt;/Table&gt;
+&lt;Command name=&quot;createCustomer&quot; SQL=&quot;insert into CUSTOMER values ( ?, ?, ?)&quot; kind=&quot;Insert&quot;&gt;
+   &lt;Parameter name=&quot;ID&quot; index=&quot;1&quot;/&gt;
+   &lt;Parameter name=&quot;LASTNAME&quot; index=&quot;2&quot;/&gt;
+   &lt;Parameter name=&quot;ADDRESS&quot; index=&quot;3&quot;/&gt;
+&lt;/Command&gt;
+</PRE>
+</DIV></DIV>
+
+<P>if +ve index is specified in Parameter, it is used, else auto-increment is used. As List is an ordered collection, the sequence(index value) appearing in the cofig file will be maintained. Partially specifying indexes is not supported (i.e. give index for 2 out of 3 params and leave one without it, is not supported)<BR>
+Also, if indexes are specified, the ordering in config is flexible, i.e. below is valid.</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Command name=&quot;createCustomer&quot; SQL=&quot;insert into CUSTOMER values ( ?, ?, ?)&quot; kind=&quot;Insert&quot;&gt;   
+   &lt;Parameter name=&quot;LASTNAME&quot; index=&quot;2&quot;/&gt;
+   &lt;Parameter name=&quot;ID&quot; index=&quot;1&quot;/&gt;
+   &lt;Parameter name=&quot;ADDRESS&quot; index=&quot;3&quot;/&gt;
+&lt;/Command&gt;
+</PRE>
+</DIV></DIV>
+
+<P><B>Note</B> Convention over config is followed, if Parameters are not defined in config, the sequence<BR>
+should match the table columns <B>convention</B>,else user should specify params on command in config and specify index attributes in them <B>config</B></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/native-sca-menu.html b/site/trunk/site-publish/native-sca-menu.html
new file mode 100644
index 0000000000..585d2f0923
--- /dev/null
+++ b/site/trunk/site-publish/native-sca-menu.html
@@ -0,0 +1,125 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Native SCA Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55292">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Native SCA Menu">Native SCA Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="error"><SPAN class="error">Unable to render {include}</SPAN> Couldn't find a page to include called: <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA&linkCreation=true&fromPageId=55292" class="createlink">SCA</A></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforCpp_V0.95.pdf?version=1" class="external-link" rel="nofollow">User Guide</A><BR>
+<A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/GettingStarted.html" class="external-link" rel="nofollow">Getting Started</A><BR>
+<SPAN class="error">&#91;Architecture Guide|&#93;</SPAN><BR>
+<A href="http://incubator.apache.org/tuscany/cpp-projects.html" class="external-link" rel="nofollow">Developer Guide</A><BR>
+<SPAN class="error">&#91;Extension Developer Guide|&#93;</SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=55292" class="createlink">FAQ</A><BR>
+<A href="http://incubator.apache.org/tuscany/cpp-projects.html" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/native-sdo-menu.html b/site/trunk/site-publish/native-sdo-menu.html
new file mode 100644
index 0000000000..2bec557d2d
--- /dev/null
+++ b/site/trunk/site-publish/native-sdo-menu.html
@@ -0,0 +1,67 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Native SDO Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55316">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="sdo.html" title="SDO">SDO</A>&nbsp;&gt;&nbsp;<A href="" title="Native SDO Menu">Native SDO Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/navigation.html b/site/trunk/site-publish/navigation.html
new file mode 100644
index 0000000000..1bef61cfb9
--- /dev/null
+++ b/site/trunk/site-publish/navigation.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Navigation</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54464">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Navigation">Navigation</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/new-home-page.html b/site/trunk/site-publish/new-home-page.html
new file mode 100644
index 0000000000..3e8828fd5d
--- /dev/null
+++ b/site/trunk/site-publish/new-home-page.html
@@ -0,0 +1,286 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>New Home Page : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=101611">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="New Home Page">New Home Page</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <IMG src="community.data/chinese.jpg" align="absmiddle" border="0"><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<SPAN class="nobr"><A href="java-sca-tools.html" title="Visit page outside Confluence" rel="nofollow">Tools<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="NewHomePage-WelcometoTuscany"></A>Welcome to Tuscany</H3>
+<P>Apache Tuscany simplifies the task of developing SOA solutions by providing a comprehensive infrastructure for SOA development and management that is based on Service Component Architecture (SCA) standard. With SCA as it's foundation, Tuscany offers solution developers the following advantages. </P>
+<UL>
+	<LI>Provides a composition model that defines the services in a solution, such as fruit store, and how they interact with one another. Services that constitute a solution can be implemented using any technology.</LI>
+	<LI>Enables service developers to create reusable services that only contain business logic. Protocols are pushed out of business logic and are handled through pluggable bindings. This lowers development cost.</LI>
+	<LI>Applications that can easily adapt to infrastructure changes without recoding since protocols are handled via pluggable bindings and quality of services (transaction, security) are handled declaratively.</LI>
+	<LI>Existing applications can work with new SCA compositions enabling incremental growth towards a more flexible architecture.</LI>
+</UL>
+
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+
+<P>In addition, Tuscany is integrated with various technologies and offers:</P>
+<UL>
+	<LI>a wide range of bindings (pluggable protocols)</LI>
+	<LI>various component types including and not limited to Java, C++, BPEL, Spring and scripting</LI>
+	<LI>an end to end service and data solution which includes support for Jaxb and SDO</LI>
+	<LI>a lightweight runtime that works standalone or with other application servers</LI>
+	<LI>a modular architecture that makes it easy to integrate with different technologies and to extend</LI>
+	<LI>Integration with web20 technologies</LI>
+</UL>
+
+
+<P>Apache Tuscany SCA is implemented in <SPAN class="nobr"><A href="http://tuscany.apache.org/sca-java.html" title="Visit page outside Confluence" rel="nofollow">Java<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>  and <SPAN class="nobr"><A href="http://tuscany.apache.org/sca-native.html" title="Visit page outside Confluence" rel="nofollow">C++ (referred to as Native) <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. <SPAN class="nobr"><A href="sca-overview.html" title="Visit page outside Confluence" rel="nofollow">Learn more about SCA <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>   </P>
+
+<P>Please join us to create a practical SOA infrastructure that addresses the challenges which small to large scale businesses face.  </P>
+
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD>
+<TD class="confluenceTd" valign="top" width="25%">
+<DIV class="panel" style="border-style: solid; border-color: #BEBFD6; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #BEBFD6; background-color: #BEBFD6; "><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8; ">
+<UL>
+	<LI><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.0-M1</B> <EM>(February, 2009)</EM></A></LI>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.4</B> <EM>(January, 2009)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+<DIV class="panel" style="border-style: solid; border-color: #BEBFD6; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #BEBFD6; background-color: #BEBFD6; "><B>Tuscany News Dashboard</B></DIV><DIV class="panelContent" style="background-color: white; ">
+<P>
+    <TABLE width="100%" cellspacing="0" class="grid">
+                <TR>
+            <TH style="text-align: left;">
+                                <A href="http://feeds.feedburner.com/apache-tuscany"><IMG src="http://cwiki.apache.org/confluence/images/icons/rss.gif" border="0" height="15" width="27" align="right"></A>
+                <A href="http://apache-tuscany.blogspot.com/">Apache Tuscany</A>
+                <SPAN class="smalltext">(rss_2.0)</SPAN>
+                                    <BR>
+                    <SPAN class="smalltext">(...making SOA easy)</SPAN>
+                            </TH>
+        </TR>
+                                            <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2009/02/tour-of-tuscany-information-resources.html">A Tour of Tuscany Information Resources</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Feb 01, 2009 13:07</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </TABLE>
+</P>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/news-and-events.html b/site/trunk/site-publish/news-and-events.html
new file mode 100644
index 0000000000..68de96559c
--- /dev/null
+++ b/site/trunk/site-publish/news-and-events.html
@@ -0,0 +1,199 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>News and Events</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="News and Events">News and Events</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">News and Events</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47610">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47610">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47610">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47610">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47610">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47610">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on May 24, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=47610&originalId=55052">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="home.html" title="Visit page outside Confluence" rel="nofollow">Home <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="" title="News and Events">Events </A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">ASF <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="NewsandEvents-UpcomingEvents"></A>Upcoming Events</H3>
+
+<P><B>June 25-27 2007 &ndash; SOA World, New York</B></P>
+
+<P>Tuscany committer Simon Laws will be presenting 'Building SOA applications using Apache Tuscany' at SOA World 2007 in New York. <BR>
+For more information, see <SPAN class="nobr"><A href="http://www.soaeosconference.sys-con.com/general/session07.htm?id=33" title="Visit page outside Confluence" rel="nofollow">http://www.soaeosconference.sys-con.com/general/session07.htm?id=33<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P><B>June 12-14 2007 &ndash; Sigmod, China</B></P>
+
+<P>*June 18-20 2007 &ndash; Open Source Summit, China *</P>
+
+
+<H3><A name="NewsandEvents-PastNewsandEvents"></A>Past News and Events</H3>
+
+<P><B>May 8-11 2007 &ndash; JavaOne, San Francisco</B></P>
+
+<P>A BOF on SCA will be presented entitled &quot;Building Composite Services Applications&quot;. Many of Tuscany community members will also be attending JavaOne. </P>
+
+<P><B>May 16-18, 2007 &ndash; <SPAN class="nobr"><A href="http://hades.phparch.com/ceres/public/tek/page/index.php/schedule" title="Visit page outside Confluence" rel="nofollow">PHP Tek<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, Chicago, Ill.</B><BR>
+Caroline Maynard, Tuscany user through PHP project will present 'Services Made Simple with PHP' on May 16th, tack 2.</P>
+
+
+<P><B>March 21-23 2007 &ndash; Serverside Symposium, Las Vegas</B></P>
+
+<P>Tuscany Committers Jeremy Boynes, Meeraj Kunnumpurath, and Jim Marino will be presenting at the Las Vegas Serverside Symposium on the Java SCA project. For information, see <SPAN class="nobr"><A href="http://javasymposium.techtarget.com/lasvegas/index.html" title="Visit page outside Confluence" rel="nofollow">http://javasymposium.techtarget.com/lasvegas/index.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P><B>December 11-15 2006 - JavaPolis 2006 - Belgium</B></P>
+
+<P>Tuscany Committer Andy Borley presented &quot;Apache Tuscany - Not The Same Old Architecture&quot;. See the presentation <SPAN class="nobr"><A href="http://www.bejug.org/confluenceBeJUG/display/PARLEYS/Apache%20Tuscany%20-%20Not%20the%20Same%20Old%20Architecture?showComments=true" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+
+<P><B>December 22 2006 &ndash; Java SCA M2 released</B></P>
+
+<P>The Tuscany community released SCA Java Milestone 2. Please see <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Downloads&linkCreation=true&fromPageId=47610" title="Create Page: Downloads" class="createlink">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+
+<P><B>November 20 2006 &ndash; Tuscany Java DAS M2 released</B></P>
+
+<P>The Tuscany team released DAS Java Milestone 2. Please see <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Downloads&linkCreation=true&fromPageId=47610" title="Create Page: Downloads" class="createlink">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+
+<P><B>November 14 2006 &ndash; Tuscany Java SDO M2 released</B></P>
+
+<P>The Tuscany team released SDO Java Milestone 2. Please see <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Downloads&linkCreation=true&fromPageId=47610" title="Create Page: Downloads" class="createlink">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+
+<P><B>November 3 2006 &ndash; Tuscany makes available C++ SCA M2 released</B></P>
+
+<P>The Tuscany team released SCA C++ Milestone 2. Please see <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Downloads&linkCreation=true&fromPageId=47610" title="Create Page: Downloads" class="createlink">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+</TD></TR></TBODY></TABLE>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/news-past-events.html b/site/trunk/site-publish/news-past-events.html
new file mode 100644
index 0000000000..8ceccb86b9
--- /dev/null
+++ b/site/trunk/site-publish/news-past-events.html
@@ -0,0 +1,201 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : News - Past Events</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66017">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="News - Past Events">News - Past Events</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="News-PastEvents-pastevents"></A>past events</H3>
+
+
+<P><B>May 11, 2008 -</B> <B><A href="http://www.pycon.it/pycon2/schedule" class="external-link" rel="nofollow"><B>PyCon Italia Due</B></A></B><BR>
+Giorgio Zoppi presents <B>Python e Service Component Architecture</B>  covering Python in SCA</P>
+
+<P><B>April 27, 2008 -</B> <B><A href="sca-java-12-incubating.html" title="SCA Java 1.2-incubating"><B>Tuscany Java SCA 1.2 released&#33;</B></A></B></P>
+
+<P><B>April 15, 2008 -</B> <B><A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating"><B>Tuscany Java SDO 1.1 released&#33;</B></A></B></P>
+
+<P><B>Feb 05, 2008 -</B> <B><A href="sca-java-11-incubating.html" title="SCA Java 1.1-incubating"><B>Tuscany Java SCA 1.1 released&#33;</B></A></B></P>
+
+<P><B>Nov 12-13, 2007 -</B> <B><A href="http://www.soaworld2007.com/" class="external-link" rel="nofollow"><B>SOAWorld Conference &amp; Expo 2007 West</B></A></B><BR>
+Raymond Feng presents <B><A href="http://www.soaworld2007.com/general/session1107.htm?id=20" class="external-link" rel="nofollow"><B>Practical SOA with Apache Tuscany</B></A></B></P>
+
+<P><B>Oct 06, 2007 -</B> <B><A href="das-java-beta2.html" title="DAS Java Beta2"><B>Tuscany DAS Beta2 released&#33;</B></A></B></P>
+
+<P><B>Sept 24, 2007 -</B> <B><A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating"><B>Tuscany Java SCA 1.0 released&#33;</B></A></B></P>
+
+<P><B>Sept 12-13, 2007 -</B> <B><A href="http://www4.java.no/web/show.do?page=153%3B252" class="external-link" rel="nofollow"><B>Java Zone, Europe</B></A></B><BR>
+Simon Laws SCA and Tuscany</P>
+
+
+<P><B>Nov 12-16 2007 -</B> <B><A href="http://us.apachecon.com/us2007/program/speaker/6070" class="external-link" rel="nofollow"><B>ApacheCon US</B></A></B><B>, Atlanta, Georgia in US</B><BR>
+Jean Sebastien Delfino and Mario Antollini will hold a 3 hours tutorial session for SCA and Tuscany</P>
+
+<P><B>July 23-27 2007 - <A href="http://conferences.oreillynet.com/cs/os2007/view/e_sess/14724" class="external-link" rel="nofollow">OSCON</A>, Portland, Oregon</B><BR>
+Patrick Leonard, VP Product Development, Rogue Wave Software will host a BoF around &quot;The Current State of the Tuscany Project and Future Direction for Java, C++ and Other Supported Programming Languages&quot;</P>
+
+<P><B>June 25-27 2007 -</B> <B><A href="http://www.soaeosconference.sys-con.com/general/session07.htm?id=33" class="external-link" rel="nofollow"><B>SOA World</B></A></B><B>, New York</B><BR>
+Simon Laws will be presenting 'Building SOA applications using Apache Tuscany' and 'PHP SCA @ Your Service'.</P>
+
+<P><B>June 11-14 2007 -</B> <A href="http://sigmod07.riit.tsinghua.edu.cn/" class="external-link" rel="nofollow"><B>ACM SIGMOD/PODS 2007 Conference</B></A><B>, Beijing, China</B><BR>
+Raymond Feng will be presenting. Presentation co-authored by Luciano Resende.</P>
+
+<P><B>June 21-22 2007 -</B> <B><A href="http://www.oss.org.cn/index.php?option=com_content&task=view&id=625&Itemid=67" class="external-link" rel="nofollow"><B>2007 Open Source China Open Source World Summit</B></A></B><B>, GuangZhou, China</B><BR>
+Raymond Feng will be presenting.</P>
+
+<P><B>May 8-11 2007 - JavaOne, San Francisco</B></P>
+
+<P>A BOF on SCA will be presented entitled &quot;Building Composite Services Applications&quot;. Many of Tuscany community members will also be attending JavaOne.</P>
+
+<P><B>May 16-18, 2007 -</B> <B><A href="http://hades.phparch.com/ceres/public/tek/page/index.php/schedule" class="external-link" rel="nofollow"><B>PHP Tek</B></A></B><B>, Chicago, Ill.</B><BR>
+Caroline Maynard, Tuscany user through PHP project will present 'Services Made Simple with PHP' on May 16th, tack 2.</P>
+
+<P><B>March 21-23 2007 - Serverside Symposium, Las Vegas</B><BR>
+Tuscany Committers Jeremy Boynes, Meeraj Kunnumpurath, and Jim Marino will be presenting at the Las Vegas Serverside Symposium on the Java SCA project. For information, see <A href="http://javasymposium.techtarget.com/lasvegas/index.html" class="external-link" rel="nofollow">http://javasymposium.techtarget.com/lasvegas/index.html</A></P>
+
+<P><B>December 11-15 2006 - JavaPolis 2006 - Belgium</B><BR>
+Tuscany Committer Andy Borley presented &quot;Apache Tuscany - Not The Same Old Architecture&quot;. See the presentation <A href="http://www.bejug.org/confluenceBeJUG/display/PARLEYS/Apache%20Tuscany%20-%20Not%20the%20Same%20Old%20Architecture?showComments=true" class="external-link" rel="nofollow">here</A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/news.data/BuildingSOAWithApacheTuscany.ppt b/site/trunk/site-publish/news.data/BuildingSOAWithApacheTuscany.ppt
new file mode 100644
index 0000000000..4b40e717b8
--- /dev/null
+++ b/site/trunk/site-publish/news.data/BuildingSOAWithApacheTuscany.ppt
diff --git a/site/trunk/site-publish/news.html b/site/trunk/site-publish/news.html
new file mode 100644
index 0000000000..eaea67bde7
--- /dev/null
+++ b/site/trunk/site-publish/news.html
@@ -0,0 +1,157 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : News</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68184">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="News">News</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="News-News"></A>News</H3>
+
+<UL>
+	<LI><B>October 13, 2008 -</B> <B>PR: Apache Tuscany enables service oriented architecture solutions to more easily respond to new business requirements.</B><BR>
+Apache Tuscany, a new Top-Level Project of the Apache Software Foundation (ASF), <BR>
+today <A href="http://www.apache.org/foundation/press/pr_2008_10_14.html" class="external-link" rel="nofollow">announced</A> the release of version 1.3.2 of its Service Component Architecture (SCA) for Java -<BR>
+ the Project's latest release since its graduation from the ASF Incubator four months ago.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>October 13, 2008 -</B> <B><A href="sca-java-132.html" title="SCA Java 1.3.2"><B>Tuscany Java SCA 1.3.2 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>August 30, 2008 -</B> <B><A href="sca-java-131.html" title="SCA Java 1.3.1"><B>Tuscany Java SCA 1.3.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>August 5, 2008 -</B> <B><A href="sca-java-13.html" title="SCA Java 1.3"><B>Tuscany Java SCA 1.3 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>July 22, 2008 -</B> <B><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>Tuscany Java SDO 1.1.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>June 08, 2008 -</B> <B><A href="sca-java-121-incubating.html" title="SCA Java 1.2.1-incubating"><B>Tuscany Java SCA 1.2.1 released&#33;</B></A></B></LI>
+</UL>
+
+
+<UL>
+	<LI><B>May 21, 2008 -</B> <B>Apache Tuscany is now an offical ASF project!</B><BR>
+The ASF board has <A href="http://apache.markmail.org/message/2oa7uidwhqb66ydp" class="external-link" rel="nofollow">approved graduation</A> from the Apache Incubator to be a fully endorsed ASF top level project.</LI>
+</UL>
+
+
+<UL>
+	<LI>To view a <B>list of previous releases</B> please go to the download page of each subproject.</LI>
+	<LI><A href="news-past-events.html" title="News - Past Events">past Tuscany events</A></LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/obtaining-a-tuscany-java-sca-implementation.html b/site/trunk/site-publish/obtaining-a-tuscany-java-sca-implementation.html
new file mode 100644
index 0000000000..0d313c3500
--- /dev/null
+++ b/site/trunk/site-publish/obtaining-a-tuscany-java-sca-implementation.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Obtaining a Tuscany Java SCA Implementation</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Obtaining a Tuscany Java SCA Implementation">Obtaining a Tuscany Java SCA Implementation</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ObtainingaTuscanyJavaSCAImplementation-Choosingbetweenapackageruntimeandbuildingyourown"></A>Choosing between a package runtime and building your own</H1>
+
+<H1><A name="ObtainingaTuscanyJavaSCAImplementation-Downloadingandinstallingarelease"></A>Downloading and installing a release</H1>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/obtaining-the-sdo-21-cts.html b/site/trunk/site-publish/obtaining-the-sdo-21-cts.html
new file mode 100644
index 0000000000..46f2117d3a
--- /dev/null
+++ b/site/trunk/site-publish/obtaining-the-sdo-21-cts.html
@@ -0,0 +1,185 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Obtaining the SDO 2.1 CTS</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46776">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cts.html" title="SDO CTS">SDO CTS</A>&nbsp;&gt;&nbsp;<A href="" title="Obtaining the SDO 2.1 CTS">Obtaining the SDO 2.1 CTS</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<H3><A name="ObtainingtheSDO2.1CTS-ObtainingandusingtheCTS"></A>Obtaining and using the CTS</H3>
+
+<P>Currently the SDO CTS is only available in source form from the subversion repository. You will need the following:</P>
+<UL>
+	<LI>A <A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">subversion</A> client</LI>
+	<LI>A <A href="http://maven.apache.org/" class="external-link" rel="nofollow">Maven 2</A> build environment.</LI>
+</UL>
+
+
+<P>The code can be down loaded from <A href="https://svn.apache.org/repos/asf/tuscany/sdo-java/trunk-cts/" class="external-link" rel="nofollow">the subversion repository</A> using :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn co http:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sdo-java/trunk-cts/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>The SDO CTS project currently contains two sub-projects:</P>
+<UL>
+	<LI>cts/sdo2.1 contains the acutal test cases</LI>
+	<LI>cts/sdo2.1-tuscany executes the test cases against the current Tuscany Implementation</LI>
+</UL>
+
+
+<P>To build the CST and run it against the Tuscany implementation all you need do is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+me@mine:~$ cd cts
+me@mine:~/cts$  mvn
+</PRE>
+</DIV></DIV>
+
+<P>If you would like to execute the SDO CTS against a different implementation then you will need to provide a helper class. For more info on this see the <A href="contributing-to-the-sdo-cts.html" title="Contributing to the SDO CTS">Contributing</A> section.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/obtaining-tuscanys-java-sca-implementation.html b/site/trunk/site-publish/obtaining-tuscanys-java-sca-implementation.html
new file mode 100644
index 0000000000..4e0385a9e0
--- /dev/null
+++ b/site/trunk/site-publish/obtaining-tuscanys-java-sca-implementation.html
@@ -0,0 +1,137 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Obtaining Tuscany's Java SCA Implementation</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Obtaining Tuscany's Java SCA Implementation">Obtaining Tuscany's Java SCA Implementation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Obtaining Tuscany's Java SCA Implementation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=44875&originalId=45536">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="ObtainingTuscany%27sJavaSCAImplementation-Choosingbetweenapackageruntimeandbuildingyourown"></A>Choosing between a package runtime and building your own</H1>
+
+<H1><A name="ObtainingTuscany%27sJavaSCAImplementation-Downloadingandinstallingarelease"></A>Downloading and installing a release</H1>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="pre-packaged-or-roll-your-own.html" title="Pre-packaged or roll your own?">Pre-packaged or roll your own?</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="building-your-own.html" title="Building your own">Building your own</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/old-sandbox.html b/site/trunk/site-publish/old-sandbox.html
new file mode 100644
index 0000000000..defc31d846
--- /dev/null
+++ b/site/trunk/site-publish/old-sandbox.html
@@ -0,0 +1,167 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : old-Sandbox</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45888">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="" title="old-Sandbox">old-Sandbox</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>Welcome</B> to the open source Apache Tuscany project!  The Tuscany community is working together to create a robust infrastructure that aims to simplify the development of service oriented (SOA) systems. </P>
+
+<P>Tuscany is based on open standards defined by the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open SOA Collaboration</A> and is comprised of independent technologies designed to work well together based on:</P>
+
+<P>Apache Tuscany is based on independent technologies that together provide following:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> enables composition of service networks through assembly of existing and new services. As an example, a service can be implemented as JAX-WS service, Spring Bean or EJB and exposed as a web service. Tuscany SCA allows services to be implemented in variety of languages such as Java, JavaScript and C&#43;&#43;. The Tuscany SCA runtime is implemented in Java and C&#43;&#43; and can easily be extended to support any communication transport, qualities of service or programming model and can be used in conjunction with other technologies such as Spring, Axis and Celtix.</LI>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C+&#43; implementations for SDO.</LI>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS.</LI>
+</UL>
+
+
+
+<P>Please join us to develop this innovative infrastructure and/or provide feedback based on your experiences.  With your help Apache Tuscany will become a first class solution for simplifying the development of SOA-based systems.</P>
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The <A href="http://www.apache.org/" class="external-link" rel="nofollow">Apache Software Foundation (ASF)</A>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/optimisticconcurrencycontrol.html b/site/trunk/site-publish/optimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..98e0da9979
--- /dev/null
+++ b/site/trunk/site-publish/optimisticconcurrencycontrol.html
@@ -0,0 +1,129 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : OptimisticConcurrencyControl</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52822">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="OptimisticConcurrencyControl">OptimisticConcurrencyControl</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="OptimisticConcurrencyControl-OptimisticConcurrencyControl"></A>OptimisticConcurrencyControl</H1>
+
+
+<P>The RDB DAS is intended for use in disconnected scenarios. When the DAS returns a graph of SDO DataObjects as the result of a query, there are no locks held on the underlying database and the data is no longer associated with any database connection or transaction. However, although locks are not held, the DAS does employ a mechanism called <A href="http://en.wikipedia.org/wiki/Optimistic_locking" class="external-link" rel="nofollow">Optimistic Concurrency Control</A> (OCC) to manage concurrency.</P>
+
+<P>Basically, when OCC is being utilized, the DAS checks whether the state of the database has changed since the original data was read before applying any writes to the same location. For example, suppose that a DAS client reads a set of Customers, modifies one Customer and then attempts to write the change back to the database:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> Command select = das.createCommand(&quot;Select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObject root = select.executeQuery();</P>
+
+<P> DataObject customer = (DataObject) root.get(&quot;CUSTOMER[1]&quot;);<BR>
+ customer.set(&quot;LASTNAME&quot;, &quot;Pavick&quot;);</P>
+
+<P> //Some period of time passes in which &quot;CUSTOMER[1]&quot; could be modified by another process or application</P>
+
+<P> das.applyChanges(root);</P>
+</DIV></DIV>
+<P>If OCC is enabled then as part of &quot;applyChanges&quot; processing the DAS will ensure that the table row representing &quot;CUSTOMER[1]&quot; has not been changed since it was read. This is possible because a feature of the original SDO graph is to &quot;remember&quot; its original state along with any changes that have been made. The DAS has access to this original state and uses it to create an &quot;overqualified&quot; update statement. When the DAS executes this update statement against the database, it will fail if the underlying data has been modified (a collision has occurred) and, if so, an exception will be thrown and the transaction rolled back. If there is no collision then the update statement execution succeeds and the change is applied. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG
new file mode 100644
index 0000000000..3f6509baca
--- /dev/null
+++ b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG
diff --git a/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg
new file mode 100644
index 0000000000..a5180fa0dd
--- /dev/null
+++ b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG.jpeg
diff --git a/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg
new file mode 100644
index 0000000000..29853f9e1e
--- /dev/null
+++ b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg
diff --git a/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg
new file mode 100644
index 0000000000..3dd9af44be
--- /dev/null
+++ b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg.jpeg
diff --git a/site/trunk/site-publish/osgi-aware-programming-in-tuscany.html b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.html
new file mode 100644
index 0000000000..ba033043a3
--- /dev/null
+++ b/site/trunk/site-publish/osgi-aware-programming-in-tuscany.html
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>OSGi Aware Programming in Tuscany : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=101617">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="OSGi Aware Programming in Tuscany">OSGi Aware Programming in Tuscany</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <H2><A name="OSGiAwareProgramminginTuscany-MotivationforOSGi"></A>Motivation for OSGi</H2>
+
+<P>   The Apache Tuscany project has become a large project, with various extensions and component types that brings to the SCA Runtime different levels of dependencies. With its growth, Tuscany also started to have it's SPIs violated by some of these extensions, and some of the boundaries between sub-systems are broken, as there wasn't any enforcement of these boundaries.</P>
+
+<P>   The OSGi model provides a very powerful and flexible framework to develop applications in a modular fashion with a high degree of control over classloading inter-dependencies over modules. An OSGi module (a.k.a bundle) have a manifest file (META-INF\manifest.mf) that contains module information such as &quot;name&quot;, &quot;version&quot; and also a list of what packages are being exported, and what packages are being imported from the given bundle, providing ways to easily enforce module boundaries.</P>
+
+<P>   In summary:</P>
+<UL>
+	<LI>Better class loading mechanism for our modules</LI>
+	<LI>Create clean boundaries between sub-systems</LI>
+</UL>
+
+
+<H2><A name="OSGiAwareProgramminginTuscany-TuscanyandOSGi3rdpartydependencies"></A>Tuscany and OSGi - 3rd party dependencies</H2>
+
+<P>   Currently we are wrapping the 3rd party dependencies as OSGi bundles, but leaving it unpacked (a.k.a folder structure). This allow use to use the same dependency jars in a OSGi environment as well as in a non-OSGI environment and generating no side effect on our distribution footprint.</P>
+
+<P>   <IMG src="osgi-aware-programming-in-tuscany.data/osgi_3rd_party_dependencies.JPG" align="absmiddle" border="0"></P>
+
+
+<H2><A name="OSGiAwareProgramminginTuscany-TuscanyandOSGiGranularity"></A>Tuscany and OSGi - Granularity</H2>
+
+<P>   The granularity used to define modules should be very familiar to all tuscany developers, </P>
+
+<P>   Tuscany Modules      --&gt; OSGi Bundles<BR>
+   3rd Party Libraries  --&gt; OSGi Bundles (using unpacked wrap style bundle)</P>
+
+<H2><A name="OSGiAwareProgramminginTuscany-ProperlydefiningnewTuscanymodulesasanOSGibundle"></A>Properly defining new Tuscany modules as an OSGi bundle</H2>
+
+<P> When adding new modules to the Tuscany project, the developer will need to create the OSGi Manifest to properly describe the new module as an OSGi bundle. These artifacts can be automatically generated using the Felix maven-bundle-plugin and should be available from svn repository once it's stable.</P>
+
+<H4><A name="OSGiAwareProgramminginTuscany-GeneratingOSGimanifestwithFelixmavenbundleplugin"></A>Generating OSGi manifest with Felix maven-bundle-plugin</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>&quot;configuring maven to generate the OSGi manifest&quot;</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;plugin&gt;
+    &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;
+    &lt;artifactId&gt;maven-bundle-plugin&lt;/artifactId&gt;
+    &lt;configuration&gt;
+        &lt;instructions&gt;
+            &lt;!-- Bundle versioned from Tuscany version --&gt;
+            &lt;Bundle-Version&gt;${tuscany.version}&lt;/Bundle-Version&gt;
+            &lt;!-- Bundle Symbolic name --&gt;
+            &lt;Bundle-SymbolicName&gt;org.apache.tuscany.sca.api&lt;/Bundle-SymbolicName&gt;
+            &lt;!-- Bundle description from pom description --&gt;
+            &lt;Bundle-Description&gt;${pom.description}&lt;/Bundle-Description&gt;
+            &lt;!-- Export org.osoa.sca and all sub-packages --&gt;
+            &lt;Export-Package&gt;org.osoa.sca*&lt;/Export-Package&gt;
+            &lt;!-- No Import-Package so calculate imports from code dependencies --&gt;
+        &lt;/instructions&gt;
+    &lt;/configuration&gt;
+&lt;/plugin&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Below is a manifest that was generated for one of the Tuscany modules using the felix maven-bundle-plugin.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>&quot;OSGi Manifest (META-INF\manifest.mf)&quot;</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Manifest-Version: 1.0
+Export-Package: org.apache.tuscany.sca.assembly;uses:=&quot;javax.xml.xpath
+ ,org.apache.tuscany.sca.assembly.impl,org.apache.tuscany.sca.policy,o
+ rg.apache.tuscany.sca.interfacedef,javax.xml.namespace<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;
+ ,org.apache.tuscany.sca.assembly.impl;uses:=&quot;javax.xml.xpath,org.apac
+ he.tuscany.sca.assembly,org.apache.tuscany.sca.policy,org.apache.tusc
+ any.sca.interfacedef,javax.xml.namespace<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;,org.apache.tu
+ scany.sca.assembly.builder;uses:=&quot;org.apache.tuscany.sca.assembly,org
+ .apache.tuscany.sca.definitions,org.apache.tuscany.sca.core,org.apach
+ e.tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef,org.apache.
+ tuscany.sca.extensibility<SPAN class="code-quote">&quot;;version=&quot;</SPAN>1.4&quot;
+Private-Package: org.apache.tuscany.sca.assembly.builder.impl;version=
+ <SPAN class="code-quote">&quot;1.4&quot;</SPAN>
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Assembly Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1225397097203
+Bundle-ManifestVersion: 2
+Bundle-License: http:<SPAN class="code-comment">//www.apache.org/licenses/LICENSE-2.0.txt
+</SPAN>Bundle-Description: Apache Tuscany SCA Assembly Model
+Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.transf
+ orm,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.xpath,o
+ rg.apache.tuscany.sca.assembly;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.a
+ ssembly.builder;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.assembly.impl;ve
+ rsion=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.core;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tusc
+ any.sca.definitions;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.extensibilit
+ y;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.interfacedef;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org
+ .apache.tuscany.sca.monitor;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.poli
+ cy;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org.apache.tuscany.sca.policy.util;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>,org
+ .w3c.dom,org.xml.sax,junit.framework;resolution:=optional,org.apache.
+ tuscany.sca.interfacedef.impl;version=<SPAN class="code-quote">&quot;1.4&quot;</SPAN>;resolution:=optional,org.
+ junit;resolution:=optional
+Bundle-SymbolicName: org.apache.tuscany.sca.assembly
+Bundle-DocURL: http:<SPAN class="code-comment">//www.apache.org/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="OSGiAwareProgramminginTuscany-TweakingtheOSGimanifest"></A>Tweaking the OSGi manifest</H2>
+
+<P>   Eclipse PDE provides good tooling for editing and maintaining OSGi manifest files. There are various scenarios we might need to tweak the OSGi manifest manualy :</P>
+
+<UL>
+	<LI>Updating imported/exported packages</LI>
+	<LI>Marking test dependencies optional
+	<UL>
+		<LI>Avoid issues when tests have references to external packages</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>   <IMG src="osgi-aware-programming-in-tuscany.data/osgi_manifest_editor.jpg" align="absmiddle" border="0"></P>
+
+<H2><A name="OSGiAwareProgramminginTuscany-PDEintegrationoftuscanymodules"></A>PDE integration of tuscany modules</H2>
+<P>1) We generate the .classpath from maven dependencies.</P>
+
+<P>2) For maven compile/provided dependencies, the modules explicit references <BR>
+these dependencies via packages. We define corresponding Import-Package <BR>
+header in the MANIFEST.MF for OSGi, and these get resolved to other bundles <BR>
+that export the matching packages. This magic comes from the <BR>
+&quot;org.eclipse.pde.core.requiredPlugins&quot; classpath container which is <BR>
+contributed by the Eclipse PDE. The classpath container resolves the OSGi <BR>
+dependencies such as Import-Package or Required-Bundle and automatically add <BR>
+the required bundles to the classpath as we see in Eclipse project under the <BR>
+&quot;Plugin Dependencies&quot;.</P>
+
+<P>3) The exported packages come from three types of sources:</P>
+<UL>
+	<LI>System packages (exported by the System Bundle, i.e., org.eclipse.osgi).<BR>
+Different JDK levels have different list of system packages, for example, <BR>
+javax.xml.stream is not in J2SE-1.5 but in JSEJava-1.6. You can find the <BR>
+complete list by looking the .profile files within osgi-&lt;version&gt;.jar.</LI>
+	<LI>Tuscany modules in the Eclipse workspace. The classpath entry will be<BR>
+listed as a project under &quot;Plugin Dependencies&quot;</LI>
+	<LI>3rd-party jars (already as OSGi bundles contributed by the target<BR>
+platform). The classpath entry will be listed as a jar under &quot;Plugin <BR>
+Dependencies&quot;</LI>
+</UL>
+
+
+<P>4) For maven runtime dependencies, there is no corresponding Import-Package <BR>
+and the dependencies are used in runtime. Ideally in OSGi, they could be a <BR>
+Required-Bundle or a bundle available at runtime. To run the project in JSE <BR>
+inside Eclipse, we generate an explicit classpath entry.</P>
+
+<P>5) For maven test dependencies, there are two types: one is for test <BR>
+compilation and the other for test runtime. For the first type, we use <BR>
+optional Import-Package to pull in the dependencies if the same project has <BR>
+the compile dependency for the same artifact. Otherwise, we generate an <BR>
+explicit classpath entry for JSE testing.</P>
+
+<P>6) For test cases which require extra dependencies in addition to the <BR>
+compile/provided/runtime dependencies for the main code, they probably <BR>
+should not be unit tests. We need to consider how to move them into the <BR>
+itest bucket.</P>
+
+
+
+
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/othermenu.html b/site/trunk/site-publish/othermenu.html
new file mode 100644
index 0000000000..b15880cc75
--- /dev/null
+++ b/site/trunk/site-publish/othermenu.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : otherMenu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=101640">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="otherMenu">otherMenu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>includes <BR>
+committer<BR>
+license<BR>
+...</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/overview.html b/site/trunk/site-publish/overview.html
new file mode 100644
index 0000000000..fd07b6ec40
--- /dev/null
+++ b/site/trunk/site-publish/overview.html
@@ -0,0 +1,120 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Overview">Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47718">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47718">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47718">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=47718">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47718">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=47718">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A> on Mar 03, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="Overview-JavaSCAProject"></A>Java SCA Project</H3>
+
+<P>The Java SCA project provides infrastructure for creating service-based systems. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/partialupdate.html b/site/trunk/site-publish/partialupdate.html
new file mode 100644
index 0000000000..f124fc940a
--- /dev/null
+++ b/site/trunk/site-publish/partialupdate.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : PartialUpdate</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52818">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="PartialUpdate">PartialUpdate</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="PartialUpdate-PartialUpdate"></A>PartialUpdate</H1>
+
+<P>The RDB DAS uses the SDO Change Summary to generate a set of database write operations. Rather than generated a statement to update all columns in a table that maps to a SDO DataObject Type, the DAS generates statements that update ony those columns that map to a modified DataObject property. For example, consider a Customer DataObject that has had the LastName property changed. The <B>partial update</B> statement generated by the DAS will look something like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = ? WHERE ID = ?
+</PRE>
+</DIV></DIV>
+<P>Rather than a statement that updates all columns like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET FIRSTNAME = ?, SET LASTNAME = ?, SET ADDRESS = ?, SET PHONE = ?, SET AGE = ?, SET SHOESIZE = ? WHERE ID = ?
+</PRE>
+</DIV></DIV>
+<P>There are a couple of very good reasons for using a partial update approach. For one, a performance boost can be realized by applications writing to wide tables. For example, tables with over 100 columns are not unheard of. It can be a huge waste of resource to update 100 columns when only one was modified. Another reason for partial update is that some databases employ <A href="http://en.wikipedia.org/wiki/Database_trigger" class="external-link" rel="nofollow">triggers</A>on specific columns in a table. Partial updates are necessary when column triggers are employed to avoid tripping the trigger on every row update rather than only on updates to the specific column. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/past-events.html b/site/trunk/site-publish/past-events.html
new file mode 100644
index 0000000000..ffe38134dc
--- /dev/null
+++ b/site/trunk/site-publish/past-events.html
@@ -0,0 +1,139 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Past Events : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=66017">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Past Events">Past Events</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="projects-using-tuscany.html" title="Projects Using Tuscany">User Feedback</A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="PastEvents-pastevents"></A>past events</H3>
+
+<P><B>July 23-27 2007 - <SPAN class="nobr"><A href="http://conferences.oreillynet.com/cs/os2007/view/e_sess/14724" title="Visit page outside Confluence" rel="nofollow">OSCON<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, Portland, Oregon</B><BR>
+Patrick Leonard, VP Product Development, Rogue Wave Software will host a BoF around &quot;The Current State of the Tuscany Project and Future Direction for Java, C++ and Other Supported Programming Languages&quot;</P>
+
+<P><B>June 25-27 2007 -</B> <B><SPAN class="nobr"><A href="http://www.soaeosconference.sys-con.com/general/session07.htm?id=33" title="Visit page outside Confluence" rel="nofollow"><B>SOA World</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, New York</B><BR>
+Simon Laws will be presenting 'Building SOA applications using Apache Tuscany' and 'PHP SCA @ Your Service'.</P>
+
+<P><B>June 11-14 2007 -</B> <SPAN class="nobr"><A href="http://sigmod07.riit.tsinghua.edu.cn/" title="Visit page outside Confluence" rel="nofollow"><B>ACM SIGMOD/PODS 2007 Conference</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>*, Beijing, China*<BR>
+Raymond Feng will be presenting. Presentation co-authored by Luciano Resende.</P>
+
+<P><B>June 21-22 2007 -</B> <B><SPAN class="nobr"><A href="http://www.oss.org.cn/index.php?option=com_content&task=view&id=625&Itemid=67" title="Visit page outside Confluence" rel="nofollow"><B>2007 Open Source China Open Source World Summit</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, GuangZhou, China</B><BR>
+Raymond Feng will be presenting.</P>
+
+<P><B>May 8-11 2007 - JavaOne, San Francisco</B></P>
+
+<P>A BOF on SCA will be presented entitled &quot;Building Composite Services Applications&quot;. Many of Tuscany community members will also be attending JavaOne.</P>
+
+<P><B>May 16-18, 2007 -</B> <B><SPAN class="nobr"><A href="http://hades.phparch.com/ceres/public/tek/page/index.php/schedule" title="Visit page outside Confluence" rel="nofollow"><B>PHP Tek</B><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B><B>, Chicago, Ill.</B><BR>
+Caroline Maynard, Tuscany user through PHP project will present 'Services Made Simple with PHP' on May 16th, tack 2.</P>
+
+<P><B>March 21-23 2007 - Serverside Symposium, Las Vegas</B><BR>
+Tuscany Committers Jeremy Boynes, Meeraj Kunnumpurath, and Jim Marino will be presenting at the Las Vegas Serverside Symposium on the Java SCA project. For information, see <SPAN class="nobr"><A href="http://javasymposium.techtarget.com/lasvegas/index.html" title="Visit page outside Confluence" rel="nofollow">http://javasymposium.techtarget.com/lasvegas/index.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P><B>December 11-15 2006 - JavaPolis 2006 - Belgium</B><BR>
+Tuscany Committer Andy Borley presented &quot;Apache Tuscany - Not The Same Old Architecture&quot;. See the presentation <SPAN class="nobr"><A href="http://www.bejug.org/confluenceBeJUG/display/PARLEYS/Apache%20Tuscany%20-%20Not%20the%20Same%20Old%20Architecture?showComments=true" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P></TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/php-sca.html b/site/trunk/site-publish/php-sca.html
new file mode 100644
index 0000000000..2f27ae1786
--- /dev/null
+++ b/site/trunk/site-publish/php-sca.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : PHP SCA</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50758">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="PHP SCA">PHP SCA</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>A PHP implementation of SCA is available outside of Apache in <A href="http://pecl.php.net/package/sca_sdo" class="external-link" rel="nofollow">PECL.php</A>. This information is provided here as a reference for those interested in a PHP open source implementation of SCA.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/place-holder-for-the-old-user-guide-page.html b/site/trunk/site-publish/place-holder-for-the-old-user-guide-page.html
new file mode 100644
index 0000000000..881223ab4e
--- /dev/null
+++ b/site/trunk/site-publish/place-holder-for-the-old-user-guide-page.html
@@ -0,0 +1,604 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : place holder for the old user guide page</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=107029">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="place holder for the old user guide page">place holder for the old user guide page</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>this is a copy of what used to have for user guide while we are trying to clean this up. Some of the changes are shoing here already.</P>
+<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SCA User Guide</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Quick%20Guide%20to%20SCA" class="external-link" rel="nofollow"><B>Introduction to SCA</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-Intro"><B>About Tuscany User Guide</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-CreateYourFirstApplication"><B>Create Your First Application</B></A>
+	<UL>
+		<LI>Single node, Tuscany standalone environment</LI>
+	</UL>
+	</LI>
+	<LI><A href="#placeholderfortheolduserguidepage-distributedapplication"><B>Create a Distributed Application</B></A>
+	<UL>
+		<LI>Multi node, Tuscany standalone environment</LI>
+	</UL>
+	</LI>
+	<LI><A href="#placeholderfortheolduserguidepage-CreateaStoreApplication"><B>Create a Store Application</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-webapp">*Create a web application *</A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-HostEmbedded"><B>Host Embedded</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-TuscanySCANodeImplementation"><B>Tuscany SCA Node Implementation</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-HostingTuscanySCANodes"><B>Hosting Tuscany SCA Nodes</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-TuscanySCADomain"><B>Tuscany SCA Domain</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-TuscanyDomainManager"><B>Tuscany web based Domain Manager Tool</B></A></LI>
+	<LI><A href="http://tuscany.apache.org/sca-java-web-applications.html" class="external-link" rel="nofollow"><B>Deploying as Web Application</B></A></LI>
+	<LI><A href="#placeholderfortheolduserguidepage-Tuscanydependencies"><B>Understanding Tuscany's Depedencies</B></A> (To be done)</LI>
+	<LI><A href="#placeholderfortheolduserguidepage-TuscanySCAExtensions"><B>Tuscany SCA Extensions</B></A>
+	<UL>
+		<LI><A href="#placeholderfortheolduserguidepage-TheExtensibleRuntime">The Extensible Runtime</A></LI>
+		<LI><A href="#placeholderfortheolduserguidepage-UsingExtensions">Using Extensions</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#placeholderfortheolduserguidepage-TuscanySCAAndIDEs"><B>Tuscany SCA And IDEs</B></A>
+	<UL>
+		<LI><A href="#placeholderfortheolduserguidepage-UsingTheSamplesInAnIDEWithoutMaven">Using The Samples In An IDE Without Maven</A></LI>
+		<LI><A href="#placeholderfortheolduserguidepage-UsingTheSamplesInAnIDEIfYouHaveMaven">Using The Samples In An IDE If You Have Maven</A><BR class="atl-forced-newline">
+&nbsp;</LI>
+	</UL>
+	</LI>
+</UL>
+</DIV></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><DIV class="" align="center">This page is undergoing complete re-write to be more like a user guide than it is today. You are welcome to help review and complete it. </DIV>
+</TD></TR></TABLE></DIV>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-Intro"></A><DIV class="" style="background-color: #C3CDA1;">About Tuscany User Guide</DIV>
+</H2>
+<P>It is assumed that by now you have browsed through the <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Quick%20Guide%20to%20SCA" class="external-link" rel="nofollow">introduction to SCA</A><BR>
+ section or are familiar with SCA. This user guide helps you learn more about SCA through Tuscany. It starts with building a simple application and progresses into more advanced features through references to samples that reside in Tuscany. </P>
+
+<P>Before we start, let's emphasise that it is Tuscany's goal to provide an implementaiton that avoids imposing rules and requirements on how you write your applications. In fact the goal is to let you write application code without being concerned about the technology you choose or the environment in which it will be used. You focus on your business logic and Tuscany infrastructure will handle the rest.  </P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-CreateYourFirstApplication"></A><DIV class="" style="background-color: #C3CDA1;">Create Your First Application</DIV>
+</H2>
+<P>This simple exercise provides you with a hands-on experience for creating an SCA calculator application. Although this is a simple application, it will cover the following items:</P>
+<UL>
+	<LI>Creating SCA POJO-based components</LI>
+	<LI>Composing an application</LI>
+	<LI>Deploying the application</LI>
+	<LI>Modifying the application to use a different binding</LI>
+</UL>
+
+
+<P>Give <A href="getting-started-with-tuscany-using-the-command-line.html" title="Getting Started with Tuscany ( using the Command Line)">create a calculator application</A> a try.  </P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-CreateaStoreApplication"></A><DIV class="" style="background-color: #C3CDA1;">Create a Store Application</DIV>
+</H2>
+
+<P>Now that you have created a simple calculator application, let's move on to a more interesting application called store. This application is developed in Eclipse enviromment and uses more advanced features that are offered in Tuscany. You will notice that it is as simple to create this application as it was to create the calculator application.</P>
+
+<P><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Getting Started with Tuscany using a Tuscany Distribution In Eclipse</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany SCA distribution manually installed into Eclipse</P>
+
+<P><A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Getting Started with Tuscany using the Tuscany Eclipse Plugin</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany Eclipse plugin.</P>
+
+<P><A href="build-your-first-web-services-with-tuscany.html" title="Build your first Web Services with Tuscany">First Steps - Building your first web services using Tuscany</A><BR>
+This is a quick guide that go through the steps of exposing your pojo component as web services.</P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-distributed"></A><DIV class="" style="background-color: #C3CDA1;">Create a Distributed Application</DIV>
+</H2>
+<P>A Tuscany application can be run in a single or multi-node environment. Here we introduce SCA node and walk you through an example that demonstrates how the calculator example can be distributed. This exercise will cover the following:</P>
+<UL>
+	<LI>What is a node?</LI>
+	<LI>How to create and configure a node?<BR>
+Give <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=distributed%20calculator&linkCreation=true&fromPageId=107029" class="createlink">distributed calculator</A> a try.<BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=note&linkCreation=true&fromPageId=107029" class="createlink">note</A> the following sections need to go into a tutorial for distributed sample</LI>
+</UL>
+
+
+<H3><A name="placeholderfortheolduserguidepage-TuscanySCANode"></A>Tuscany SCA Node</H3>
+<P>In order to run an SCA application Tuscany SCA Java provides a runtime that is wrapped up in a Node. The runtime itself is made up of many of the modules that are present in the modules directory of the Tuscany SCA Java distribution. As you might expect there are functions that read XML, create an in memory mode model of the SCA assembly, create the components and wire them together ready to process incoming messages. All of these functions are wrapped up in a Node. A node is configured using SCA contributions and will run a single composite. When running standalone the node also defines the scope of component services that references can target by name. SCA defines the term Domain to describe this scope. <SPAN class="error">Unable to render embedded object: File (calculator2.png) not found.</SPAN><BR>
+A node runs within a single JVM. A JVM can run many Nodes.</P>
+
+<H3><A name="placeholderfortheolduserguidepage-hostembedded"></A>host embedded</H3>
+<P>For a long time in Tuscany we have had a modules called <A href="sca-java-hostembedded.html" title="SCA JAVA host.embedded">host.embedded</A> that contains the code required to get the runtime up and running in standalone configuration. This was developed before the distributed domain support was added but the main interface here is called an SCADomain. It's just a very small domain with only one node inside it. You can't see the node and you configure and access it via the SCADomain interface. The majority of samples and tests use this today. However the new SCA Node implementation can work in both standalone and distributed configuration so may be more appropriate in situations other than the simple Tuscany samples and tests. We will convert more samples ant tests to this approach over time to show the benefit of using the node implementation.</P>
+
+<H3><A name="placeholderfortheolduserguidepage-TuscanySCANodeImplementation"></A>Tuscany SCA Node Implementation</H3>
+<P>Available from release 1.2 there is a new domain/node implementation. The node part of this can be run either stand alone or as part of a distributed domain. Most of the sample and test code has not started using this implementation yet and there may be more changes to the API.</P>
+
+<H4><A name="placeholderfortheolduserguidepage-CreatingandConfiguringNode"></A>Creating and Configuring Node</H4>
+
+<P>Creating a node in code is straightforward. For example,</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromClassLoader(<SPAN class="code-quote">&quot;calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">null</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>The node uses current classes classloader to located the named composite file. The location of the composite file is assumed to be the location if the SCA contribution. The assumption here is that only one contribution is required. </P>
+
+<P>If more contributions must be loaded by the node the following interface can be used.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2  node = SCANode2Factory.newInstance().createSCANode(<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>,
+        		                               <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>),
+                                                       <SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution2&quot;</SPAN>,
+        		                                                               <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution2&quot;</SPAN>));
+</PRE>
+</DIV></DIV>
+<P>Where</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1/Calculator.composite&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Is the explicit location of the composite file to be run and</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">new</SPAN> SCAContribution(<SPAN class="code-quote">&quot;CalculatorContribution1&quot;</SPAN>,
+        		        <SPAN class="code-quote">&quot;file:/C:/CalculatorContribution1&quot;</SPAN>)
+</PRE>
+</DIV></DIV>
+<P>Shows how to provide contribution details. Multiple contributions can be specified. You might have multiple contributions if, for example,  you have chosen to separate common artifacts from those specific to this composite. The contribution containing common artifacts can then be used in other SCA applications without change.</P>
+
+<H4><A name="placeholderfortheolduserguidepage-StartingaNode"></A>Starting a Node</H4>
+
+<P>Once the node is created it is configured and ready for use. It can be started as follows.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.start();
+</PRE>
+</DIV></DIV>
+
+<H4><A name="placeholderfortheolduserguidepage-LocatingServices"></A>Locating Services</H4>
+
+<P>A local service reference can be retrieved in the following way.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+calculatorService = ((SCAClient)node).getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="placeholderfortheolduserguidepage-StoppingaNode"></A>Stopping a Node</H4>
+
+<P>If you are done with the node or need to stop is processing messages use the following.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+node.stop();
+</PRE>
+</DIV></DIV>
+
+<H4><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-HostingTuscanySCANodes"></A></H4>
+
+<DIV class="" style="background-color: #C3CDA1;">Hosting Tuscany SCA Nodes</DIV>
+
+<P>You can run SCA applications in many different ways but the same underlying runtime is used but packaged in slightly different ways as follows</P>
+
+<H4><A name="placeholderfortheolduserguidepage-CommandLine"></A>Command Line</H4>
+
+<P>Most of the samples that are shipped with the Tuscany SCA Java distribution run from the command line by driving the Node API or old SCADomain API programmatically.</P>
+
+<P>There is a pre-packaed launcher that has a mainline for starting nodes. When run from the command line it expects to be running in the context of the binary distribution where &quot;modules&quot; and &quot;lib&quot; directories are present.</P>
+
+<P>It loads all of the jars from</P>
+
+<P>1) the directory where the launcher class is found.<BR>
+2) the ../modules directory<BR>
+3) the ../libs directory</P>
+
+<P>It then repeats the process looking for ../modules and ../lib dirs based on the contents of  a TUSCANY_HOME environment variable</P>
+
+<P>With the final list it creates a URLClassLoader with the current classloader as the parent and enforces a parent first classloading strategy.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO - how does it find the composite file to run?</P>
+
+<H3><A name="placeholderfortheolduserguidepage-WebApp"></A>WebApp</H3>
+
+<P>Some of the samples that are shipped with the Tuscany SCA Java distribution run as web apps<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="placeholderfortheolduserguidepage-Tomcat"></A>Tomcat</H4>
+
+<P>Running a Tuscany SCA Java enabled webapp in Tomcat is as simple as copying the webapp to the Tomcat webapps directory.</P>
+
+<H4><A name="placeholderfortheolduserguidepage-Geronimo"></A>Geronimo</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="placeholderfortheolduserguidepage-WebSphere"></A>WebSphere</H4>
+
+<P>Please see this blog entry to learn how to do this: <A href="http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html" class="external-link" rel="nofollow">http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html</A></P>
+
+<H4><A name="placeholderfortheolduserguidepage-WebLogic"></A>WebLogic</H4>
+
+<P>Please see this user's blog to learn how to do this: <A href="http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html" class="external-link" rel="nofollow">http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html</A></P>
+
+<H3><A name="placeholderfortheolduserguidepage-Eclipse"></A>Eclipse</H3>
+
+<P>There are two Getting Started documents that discuss this.</P>
+
+<P><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Getting Started with Tuscany using a Tuscany Distribution In Eclipse</A><BR>
+<A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Getting Started with Tuscany using the Tuscany Eclipse Plugin</A></P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-TuscanySCADomain"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Tuscany SCA Domain</DIV>
+
+<P>SCA has the concept of a domain. Section 10 of the SCA Assembly specification describes an SCA Domain as defining &quot;the boundary of visibility for all SCA mechanisms&quot;. SCA wires can be used to connect components within a single SCA Domain.</P>
+
+<P>From the calculator sample you can see that the wires between the component references and services, formed by adding a target component name to a reference, are resolved inside an SCA domain. For example, this section of the calculator composite file shows how the CalcuatorServiceComponent targets the AddServiceComponent.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> target=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;AddServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.AddServiceImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+<P>The target=&quot;AddServiceComponent&quot; of the CalculatorServiceComponent's addService reference refers to the AddServiceComponent defined later on in this composite. A domain can consist of more than one composite and wires can run between components defined in the composites. The SCA Domain describes the boundary within which target component services can be located.</P>
+
+<P>To connect to services outside of the SCA Domain (whether they be services provided by SCA or by other means) you configure an explicit binding, for example,  lets assume that the AddServiceComponent is a non-sca web service out there on the network somewhere. As this is outside the SCA domain we can use an explicit remote binding to talk to it.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+		&lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> &gt;
+           &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.AddService&quot;</SPAN> /&gt;
+            &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/sample-calculator-ws-webapp/AddServiceComponent&quot;</SPAN>/&gt;
+</SPAN>        &lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> target=<SPAN class="code-quote">&quot;SubtractServiceComponent&quot;</SPAN>&gt;&lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> target=<SPAN class="code-quote">&quot;MultiplyServiceComponent&quot;</SPAN>&gt;&lt;/reference&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> target=<SPAN class="code-quote">&quot;DivideServiceComponent&quot;</SPAN>&gt;&lt;/reference&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+<P>Tuscany SCA supports running an SCA Domain in a single Node or spread across multiple Nodes potentially on different machines. We have seen a domain with a single node before.<BR>
+<SPAN class="error">Unable to render embedded object: File (calculator2.png) not found.</SPAN><BR>
+A domain with multiple nodes allows wires to run between components running in the separate nodes which may be running on different JVMs on different machines. <BR>
+<SPAN class="error">Unable to render embedded object: File (calculator3.png) not found.</SPAN><BR>
+When reference and service are in different composites the domain manager is used to pre-process each composited prior to the composites being deployed to nodes for running. Contributions (containing the composites) are added to the domain manager. Configuration must be provided which tells the workspace where the nodes are that are going to run the composites and which composites they will run. Based on this information the domain manager makes an atom feed available for each composite that is deployed to a node. The node to which the composite is assigned must read the correct atom feed in order to configure itself by downloading the composite to run and the contributions required provide the artifacts required by the composite. There is a Node API that takes as input the URL of an atom feed exposed by the domain manager as follows. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromURL(<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:9990/node-config/NodeA&quot;</SPAN>);</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>The URL <A href="http://localhost:9990/node-config/NodeA" class="external-link" rel="nofollow">http://localhost:9990/node-config/NodeA</A> is the URL of the atom feed that the domain manager provides.</P>
+
+<P>The domain manager processes all the relationships between all composite components and provides a fully configured composite to each node, i.e. all of the binding URIs are filled out correctly so it's basically a pre-processing step. You can simulate the effect by manually adding the full uri to the reference binding.ws if you don't want to run with the domain manager</P>
+
+<P>The calculator-distributed sample is a simple example of the use of the workspace. You can fire up the workspace and play with the gui or look at the 3 xml files in the top directory of that sample which the workspace relies on for configuration.</P>
+
+<H3><A name="placeholderfortheolduserguidepage-StartingADomain"></A>Starting A Domain</H3>
+
+<P>There is a launcher that has a mainline for starting the domain. For example, </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
+        DomainManagerLauncher.main(args);
+    }
+</PRE>
+</DIV></DIV>
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO - how is this run without having to create your own mainline. </P>
+
+<H3><A name="placeholderfortheolduserguidepage-ConfiguringADomainThroughTheWebInterface"></A>Configuring A Domain Through The Web Interface</H3>
+
+<P>One the domain manager is running you can get to the web interface of the default domain point you browser at <A href="http://localhost:9990/ui" class="external-link" rel="nofollow">http://localhost:9990/ui</A>. This provides a number of different pages allowing you to </P>
+
+<UL>
+	<LI>Add contributions to the domain</LI>
+	<LI>Add node configurations to the domain</LI>
+	<LI>Configure composites to run on specific nodes</LI>
+	<LI>Start local node instances to test the configuration</LI>
+</UL>
+
+
+
+<H3><A name="placeholderfortheolduserguidepage-ConfiguringaDomainThroughTheFileSystem"></A>Configuring a Domain Through The File System</H3>
+
+<P>Behind the domain manager web application there are three files where the configuration information is stored. </P>
+
+<P><B>workspace.xml</B> - stores the ID and location of each contribution that has been added to the domain.</P>
+
+<P><B>domain.composite</B> - the virtual domain composite. This is an SCA composite that represents the virtual domain which includes all of the composites that will run in the domain. A URI is provided which indicates which contribution each composite comes from. Ultimately an SCANode2 instance will be started for each composite included in the virtual domain. Each SCANode2 instance can be running on separate/distributed processors. So the virtual domain is a consolidated description of you distributed SCA application</P>
+
+<P><B>cloud.composite</B> - describes the compute cloud (the set of distributed SCANode2 instances) being used to run the SCA application. Each node is assigned a composite and also has details of the configuration of bindings when they run on that node, for example, the root URI is set. It's possibly slightly confusing that this file is in SCA composite format also but this is a convenience because firstly we didn't have to create a new file format and secondly there may be some benefit in the future of representing this network of nodes as a network of SCA services for management purposes although we don't do that yet.</P>
+
+<P>These files are updated when you make changes to the domain through the domain manager interface but they have a fairly simple XML format and can be edited manually or new utilities could be constructed to edit them automatically.</P>
+
+<P><A name="placeholderfortheolduserguidepage-TuscanyDomainManager"></A></P>
+<H2><A name="placeholderfortheolduserguidepage-TuscanyWebbasedDomainManagerTool"></A>Tuscany Web-based Domain Manager Tool</H2>
+
+<P>This <A href="http://www.ibm.com/developerworks/webservices/library/ws-sca-tuscany/index.html?S_TACT=105AGX04&S_CMP=EDU" class="external-link" rel="nofollow">article</A> that is hosted outside of Tuscany provides a step by step instruction for how to use the Tuscany web-based domain manager UI to administer an SCA domain and how to use the domain administrative UI to deploy an SOA solution comprised of SCA components.</P>
+
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-TuscanySCACoreFeatures"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Tuscany SCA Core Features</DIV>
+
+
+<H3><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-Policy"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Policy</DIV>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-TuscanySCAExtensions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Tuscany SCA Extensions</DIV>
+
+
+<H3><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-TheExtensibleRuntime"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">The Extensible Runtime</DIV>
+
+<P>The Tuscany SCA runtime comprises a small set of core software which deals with:</P>
+<UL>
+	<LI>Managing extesions to the Tuscany SCA Runtime(<EM>core</EM>)</LI>
+	<LI>Building and in memory assembly model of SCA applications (<EM>assembly</EM>)</LI>
+	<LI>Processing SCA applcations that are contributed (<EM>contribution</EM>)</LI>
+	<LI>Supporting databindings (<EM>databinding</EM>)</LI>
+	<LI>Supporting Tuscany SCA when its embedded in other environments (<EM>embedded</EM>)</LI>
+	<LI>Supporting Tuscany SCA when its running in a servlet container (<EM>http</EM>)</LI>
+</UL>
+
+
+<P>The collections of interfaces that describe these features are referred to as the System Programming Interface (SPI). The <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Developer%20Guide&linkCreation=true&fromPageId=107029" class="createlink">developer guide</A> discusses them in more detail but from a user perspective the important thing to realize is that the majority of interesting functionality in Tuscany SCA is provided by extensions which build upon this core SPI. These extensions provide Tuscany SCA with its ability to support a wide variety features.</P>
+<UL>
+	<LI>Implementation types</LI>
+	<LI>Binding types</LI>
+	<LI>Databinding types</LI>
+	<LI>Interface description styles</LI>
+	<LI>Hosting environments</LI>
+</UL>
+
+
+<P>So to understand how to use the Tuscany SCA runtime is to understand how to use its extensions. The available extensions are described in the <A href="sca-java-user-reference.html" title="SCA Java User Reference">User Reference</A></P>
+
+<H3><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-UsingExtensions"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Using Extensions</DIV>
+
+<P>Extensions are loaded into the Tuscany SCA runtime using the Java service loading mechanism. Each extension is packaged as a jar and provides a file;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+</PRE>
+</DIV></DIV>
+<P>Using this information the Tuscany SCA runtime will load each extensions present on the the Java CLASSPATH. So if you want to use a particular feature make sure that it's available on your classpath. Conversely if you don't want a particular feature to be active remove it from the classpath.</P>
+
+<P>Writing a new extension is a subject in its own right and is described in the <A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">extension guide</A></P>
+
+<H2><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-TuscanySCAAndIDEs"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Tuscany SCA And IDEs</DIV>
+
+
+<H3><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-UsingTheSamplesInAnIDEWithoutMaven"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Using The Samples In An IDE Without Maven</DIV>
+
+<P>We don't provide any IDE project files with our disitributions so you will have to import the sample files into your IDE manually. Here's an example of how it can be done using Eclipse. Here the directory tuscany_sca_install_dir is the directory whch holds the Tuscany SCA Java binary installation after it's been extracted from its archive file, for example, for the 0.90 release this will be tuscany-sca-0.90-incubating.</P>
+
+<P>In a new or existing workspace</P>
+<UL>
+	<LI>Create a new java project to represent the sample you want to work on, e.g.
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>my working dir/calculator
+</PRE>
+</DIV></DIV></LI>
+	<LI>Import all of the sample code and resources into this project, e.g.
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>Use the File,Import menu and then select  tuscany_sca_install_dir/samples/calculator from the filesystem
+</PRE>
+</DIV></DIV></LI>
+	<LI>Configure the source path to include
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>tuscany_sca_install_dir/samples/calculator/src/main/java
+tuscany_sca_install_dir/samples/calculator/src/main/resources
+</PRE>
+</DIV></DIV></LI>
+	<LI>Configure the output folder to be
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>tuscany_sca_install_dir/samples/calculator/target
+</PRE>
+</DIV></DIV></LI>
+	<LI>Configure the build path to include all of the jars provided in
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>tuscany_sca_install_dir/lib
+</PRE>
+</DIV></DIV></LI>
+	<LI>If you select calculator.CalculatorClient.java and run as &quot;Java Application&quot; you should see
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>3 + 2=5.0
+3 - 2=1.0
+3 * 2=6.0
+3 / 2=1.5
+</PRE>
+</DIV></DIV></LI>
+</UL>
+
+
+<P>The details of how to do this for other development environments will vary but the process will be similar.</P>
+
+<H3><A name="placeholderfortheolduserguidepage-"></A><A name="placeholderfortheolduserguidepage-UsingTheSamplesInAnIDEIfYouHaveMaven"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Using The Samples In An IDE If You Have Maven</DIV>
+
+<P>If you are a Maven user you can use it to generate all of the IDE project files for you automatically. This works best if you generate IDE projects for all of the Apache Tuscany modules. You can then include the ones you are interested in working with in you IDE.</P>
+
+<P>To build IDE project files for all of the modules in Apache Tuscany SCA;</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>cd sca
+</PRE>
+</DIV></DIV>
+<P>If you are an Eclipse user do the following</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>mvn -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+<P>If you are an IDEA user do the following</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>mvn idea:idea
+</PRE>
+</DIV></DIV>
+<P>These commands generate project files for each module in Apache Tuscany SCA. The modules you are interested in can now be included in your IDE, for example, in Eclipse, if you create a new Java project and use the option to &quot;create a new project from existing source&quot; you can specify an SCA module directory, which includes the generated project files, and Eclipse will treat it like any other Java project.</P>
+
+<P></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/composite-mojo.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/composite-mojo.html
new file mode 100644
index 0000000000..89102f282a
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/composite-mojo.html
@@ -0,0 +1,216 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - 
+    tuscany-composite-plugin - tuscany-composite:composite</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        
+  
+  
+    <a name="tuscany-composite:composite"></a><div class="section"><h2>tuscany-composite:composite</h2>
+      <p>Packages an SCA Composite archive.</p>
+      <p><b>Mojo Attributes</b>:<ul>
+          <li>Requires a Maven 2.0 project to execute.</li>
+          <li>Automatically executes within the lifecycle phase: <code>package</code></li>
+          </ul>
+        
+      <a name="Required Parameters"></a><div class="section"><h3>Required Parameters</h3>
+        <table class="bodyTable">
+          <tr class="a">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#classesDirectory">classesDirectory</a></b></td>
+            <td><code>File</code></td>
+            <td>Directory containing the classes to include in the archive.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#outputDirectory">outputDirectory</a></b></td>
+            <td><code>File</code></td>
+            <td>Build output directory.</td>
+            </tr>
+          </table>
+        </div>
+      <a name="Optional Parameters"></a><div class="section"><h3>Optional Parameters</h3>
+        <table class="bodyTable">
+          <tr class="b">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#archive">archive</a></b></td>
+            <td><code>MavenArchiveConfiguration</code></td>
+            <td>Standard Maven archive configuration.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#classifier">classifier</a></b></td>
+            <td><code>String</code></td>
+            <td>Classifier to add to the generated artifact.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#compositeName">compositeName</a></b></td>
+            <td><code>String</code></td>
+            <td>Name of the generated composite archive.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#projectHelper">projectHelper</a></b></td>
+            <td><code>MavenProjectHelper</code></td>
+            <td>No description.</td>
+            </tr>
+          </table>
+        </div>
+      <a name="Parameter Details"></a><div class="section"><h3>Parameter Details</h3>
+        <b><a name="archive">archive</a></b>
+        <p>Standard Maven archive configuration.</p>
+        <ul>
+          <li><b>Type</b>: <code>org.apache.maven.archiver.MavenArchiveConfiguration</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><b><a name="classesDirectory">classesDirectory</a></b>
+        Directory containing the classes to include in the archive.
+        <ul>
+          <li><b>Type</b>: <code>java.io.File</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>${project.build.outputDirectory}</code></li>
+          </ul><hr></hr><b><a name="classifier">classifier</a></b>
+        Classifier to add to the generated artifact.
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><b><a name="compositeName">compositeName</a></b>
+        Name of the generated composite archive.
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          <li><b>Expression</b>: <code>${project.build.finalName}</code></li>
+          </ul><hr></hr><b><a name="outputDirectory">outputDirectory</a></b>
+        Build output directory.
+        <ul>
+          <li><b>Type</b>: <code>java.io.File</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>${project.build.directory}</code></li>
+          </ul><hr></hr><b><a name="projectHelper">projectHelper</a></b>
+        No Description.
+        <ul>
+          <li><b>Type</b>: <code>org.apache.maven.project.MavenProjectHelper</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul>
+        </div>
+      </div>
+    
+  
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-base.css b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-base.css
new file mode 100644
index 0000000000..5fe1845a4d
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-base.css
@@ -0,0 +1,148 @@
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+  text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+  float:right;
+  text-shadow: #7CFC00;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+  border: 1px solid black;
+  width: 90px;
+  height: 30px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-theme.css b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-theme.css
new file mode 100644
index 0000000000..c982168bf2
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/maven-theme.css
@@ -0,0 +1,141 @@
+body {
+  padding: 0px 0px 10px 0px;
+}
+body, td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 13px;
+}
+code{
+  font-family: Courier, monospace;
+  font-size: 13px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#36a;
+}
+a:visited  {
+  color:#47a;
+}
+a:active, a:hover {
+  color:#69c;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #999;
+  color: #900;
+  background-color: #ddd;
+  font-weight:900;
+  font-size: x-large;
+}
+h3 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  color: #900;
+  background-color: #eee;
+  font-weight: normal;
+  font-size: large;
+}
+h4 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #bbb;
+  color: #900;
+  background-color: #fff;
+  font-weight: normal;
+  font-size: large;
+}
+h5 {
+  padding: 4px 4px 4px 6px;
+  color: #900;
+  font-size: normal;
+}
+p {
+  line-height: 1.3em;
+  font-size: small;
+}
+#breadcrumbs {
+  border-top: 1px solid #aaa;
+  border-bottom: 1px solid #aaa;
+  background-color: #ccc;
+}
+#leftColumn {
+  margin: 10px 0 0 5px;
+  border: 1px solid #999;
+  background-color: #eee;
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  color: #000;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 1em;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+.source {
+  border: 1px solid #999;
+}
+dl {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  background-color: #ffc;
+}
+dt {
+  color: #900;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 8px;
+}
+#banner {
+  border-bottom: 1px solid #fff;
+}
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}
+
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/print.css b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/print.css
new file mode 100644
index 0000000000..26ad7f0b59
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/css/print.css
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/dependencies.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/dependencies.html
new file mode 100644
index 0000000000..a8f5a5cf3b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/dependencies.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Dependencies</h2><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="a"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="b"><td>org.apache.maven</td><td>maven-archiver</td><td>2.2</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-plugin-api</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Transitive Dependencies</h2><p>The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.</p><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="b"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="a"><td>classworlds</td><td>classworlds</td><td>1.1-alpha-2</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>junit</td><td>junit</td><td>3.8.1</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-artifact</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-artifact-manager</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-model</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-profile</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-project</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-repository-metadata</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-settings</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven.wagon</td><td>wagon-provider-api</td><td>1.0-alpha-6</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.codehaus.plexus</td><td>plexus-archiver</td><td>1.0-alpha-7</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.codehaus.plexus</td><td>plexus-container-default</td><td>1.0-alpha-9</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.codehaus.plexus</td><td>plexus-utils</td><td>1.1</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Dependency Graph</h2><div class="section"><h3>Dependency Tree</h3><p><ul><li><a href="#org.apache.tuscany:tuscany-composite-plugin:maven-plugin">org.apache.tuscany:tuscany-composite-plugin:maven-plugin</a><ul><li><a href="#org.apache.maven:maven-archiver:jar">org.apache.maven:maven-archiver:jar</a><ul><li><a href="#org.apache.maven:maven-project:jar">org.apache.maven:maven-project:jar</a></li><li><a href="#org.codehaus.plexus:plexus-archiver:jar">org.codehaus.plexus:plexus-archiver:jar</a><ul><li><a href="#org.codehaus.plexus:plexus-container-default:jar">org.codehaus.plexus:plexus-container-default:jar</a></li><li><a href="#org.codehaus.plexus:plexus-utils:jar">org.codehaus.plexus:plexus-utils:jar</a></li></ul></li><li><a href="#org.apache.maven:maven-artifact:jar">org.apache.maven:maven-artifact:jar</a></li></ul></li><li><a href="#org.apache.maven:maven-plugin-api:jar">org.apache.maven:maven-plugin-api:jar</a></li></ul></li></ul></p></div><div class="section"><h3>Dependency Listings</h3><p><a name="org.apache.tuscany:tuscany-composite-plugin:maven-plugin"><b>Apache Tuscany Composite Plugin</b></a></p><p>An Apache Maven plugin for packaging SCA composite archives.</p><p><a href="http://www.apache.org/parent/sca/tuscany-composite-plugin">http://www.apache.org/parent/sca/tuscany-composite-plugin</a></p><p><a name="org.apache.maven:maven-archiver:jar"><b>Maven Archiver</b></a></p><p>Maven shared components</p><p><a href="http://maven.apache.org/shared/maven-archiver">http://maven.apache.org/shared/maven-archiver</a></p><p><a name="org.apache.maven:maven-project:jar"><b>Maven Project Builder</b></a></p><p>This library is used to not only read Maven project object model files, but to assemble inheritence
+    and to retrieve remote models as required.</p><p><a href="http://maven.apache.org/maven-project">http://maven.apache.org/maven-project</a></p><p><a name="org.codehaus.plexus:plexus-archiver:jar"><b>Plexus Archiver Component</b></a></p><p><a name="org.codehaus.plexus:plexus-container-default:jar"><b>Default Plexus Container</b></a></p><p><a name="org.codehaus.plexus:plexus-utils:jar"><b>Plexus Common Utilities</b></a></p><p><a name="org.apache.maven:maven-artifact:jar"><b>Maven Artifact</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven-artifact">http://maven.apache.org/maven-artifact</a></p><p><a name="org.apache.maven:maven-plugin-api:jar"><b>Maven Plugin API</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven-plugin-api">http://maven.apache.org/maven-plugin-api</a></p></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/collapsed.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/collapsed.gif
new file mode 100644
index 0000000000..6e71084064
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/collapsed.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/expanded.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/expanded.gif
new file mode 100644
index 0000000000..0fef3d89e0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/expanded.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/external.png b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/external.png
new file mode 100644
index 0000000000..3f999fc88b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/external.png
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_error_sml.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_error_sml.gif
new file mode 100644
index 0000000000..61132ef2b0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_error_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_info_sml.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_info_sml.gif
new file mode 100644
index 0000000000..c6cb9ad7ce
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_info_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_success_sml.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_success_sml.gif
new file mode 100644
index 0000000000..52e85a430a
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_success_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_warning_sml.gif b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_warning_sml.gif
new file mode 100644
index 0000000000..873bbb52cb
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/icon_warning_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/logos/maven-feather.png b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/logos/maven-feather.png
new file mode 100644
index 0000000000..5beac166dd
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/logos/maven-feather.png
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/newwindow.png b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/newwindow.png
new file mode 100644
index 0000000000..6287f72bd0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/images/newwindow.png
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/index.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/index.html
new file mode 100644
index 0000000000..24241da4da
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/index.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - About</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <strong>Introduction</strong>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>About Apache Tuscany Composite Plugin</h2><p>An Apache Maven plugin for packaging SCA composite archives.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/integration.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/integration.html
new file mode 100644
index 0000000000..3acd4c84db
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/integration.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Continuous Integration</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Continuous Integration</h2><p>No continuous integration management system is defined. Please check back at a later date.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/issue-tracking.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/issue-tracking.html
new file mode 100644
index 0000000000..a2009441c6
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/issue-tracking.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Issue Tracking</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2>This project uses <a href="http://www.atlassian.com/software/jira">Jira</a> a J2EE-based, issue tracking and project management application.</div><div class="section"><h2>Issue Tracking</h2><p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p><div class="source"><pre><a href="http://issues.apache.org/jira/browse/TUSCANY">http://issues.apache.org/jira/browse/TUSCANY</a></pre></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/license.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/license.html
new file mode 100644
index 0000000000..46c6aaed5c
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/license.html
@@ -0,0 +1,321 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Project License</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2><p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p></div><div class="section"><h2>Project License</h2><div class="section"><h3>The Apache Software License, Version 2.0</h3><div class="source"><pre>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      &quot;control&quot; means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      &quot;Source&quot; form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      &quot;Object&quot; form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      &quot;Work&quot; shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      &quot;Contribution&quot; shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+
+      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same &quot;printed page&quot; as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/mail-lists.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/mail-lists.html
new file mode 100644
index 0000000000..9bbac71d9b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/mail-lists.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Project Mailing Lists</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Mailing Lists</h2><p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p><table class="bodyTable"><tr class="a"><th>Name</th><th>Subscribe</th><th>Unsubscribe</th><th>Post</th><th>Archive</th></tr><tr class="b"><td>Apache Announce List</td><td><a href="mailto:announce-subscribe@apache.org">Subscribe</a></td><td><a href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td><td><a href="mailto:announce@apache.org">Post</a></td><td><a href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/plugin-info.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/plugin-info.html
new file mode 100644
index 0000000000..c70699d237
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/plugin-info.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Plugin documentation</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <strong>Goals</strong>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Plugin documentation</h2><p>Goals available:</p><table class="bodyTable"><tr class="a"><th>Goal</th><th>Description</th></tr><tr class="b"><td><a href="composite-mojo.html">tuscany-composite:composite</a></td><td>Packages an SCA Composite archive.</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-info.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-info.html
new file mode 100644
index 0000000000..4899e64438
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-info.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Project Information</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Information</h2><p>This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by <a href="http://maven.apache.org">Maven</a> on behalf of the project.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="index.html">About</a></td><td>An Apache Maven plugin for packaging SCA composite archives.</td></tr><tr class="a"><td><a href="license.html">Project License</a></td><td>This is a link to the definitions of project licenses.</td></tr><tr class="b"><td><a href="dependencies.html">Dependencies</a></td><td>This document lists the projects dependencies and provides information on each dependency.</td></tr><tr class="a"><td><a href="team-list.html">Project Team</a></td><td>This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.</td></tr><tr class="b"><td><a href="mail-lists.html">Mailing Lists</a></td><td>This document provides subscription and archive information for this project's mailing lists.</td></tr><tr class="a"><td><a href="integration.html">Continuous Integration</a></td><td>This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.</td></tr><tr class="b"><td><a href="source-repository.html">Source Repository</a></td><td>This is a link to the online source repository that can be viewed via a web browser.</td></tr><tr class="a"><td><a href="project-summary.html">Project Summary</a></td><td>This document lists other related information of this project</td></tr><tr class="b"><td><a href="issue-tracking.html">Issue Tracking</a></td><td>This is a link to the issue management system for this project. Issues (bugs, features, change requests) can be created and queried using this link.</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-reports.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-reports.html
new file mode 100644
index 0000000000..56617844d5
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-reports.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Generated Reports</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Generated Reports</h2><p>This document provides an overview of the various reports that are automatically generated by <a href="http://maven.apache.org">Maven</a> Each report is briefly described below.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="plugin-info.html">Plugin documentation</a></td><td>This report provides goals and parameters documentation of a plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-summary.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-summary.html
new file mode 100644
index 0000000000..99c0ccde27
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/project-summary.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Project Summary</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Summary</h2><div class="section"><h3>Project Information</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Tuscany Composite Plugin</td></tr><tr class="a"><td>Description</td><td>An Apache Maven plugin for packaging SCA composite archives.</td></tr><tr class="b"><td>Homepage</td><td><a href="http://www.apache.org/parent/sca/tuscany-composite-plugin">http://www.apache.org/parent/sca/tuscany-composite-plugin</a></td></tr></table></div><div class="section"><h3>Project Organization</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Software Foundation</td></tr><tr class="a"><td>URL</td><td><a href="http://www.apache.org/">http://www.apache.org/</a></td></tr></table></div><div class="section"><h3>Build Information</h3><table class="bodyTable"><tr class="b"><th>Field</th><th>Value</th></tr><tr class="a"><td>GroupId</td><td>org.apache.tuscany</td></tr><tr class="b"><td>ArtifactId</td><td>tuscany-composite-plugin</td></tr><tr class="a"><td>Version</td><td>1.0-alpha-incubating-SNAPSHOT</td></tr><tr class="b"><td>Type</td><td>maven-plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/source-repository.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/source-repository.html
new file mode 100644
index 0000000000..0971045c33
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/source-repository.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Source Repository</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Source Repository</h2><p>No source configuration management system is defined. Please check back at a later date.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/team-list.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/team-list.html
new file mode 100644
index 0000000000..369ada5002
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/team-list.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - Team list</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>The Team</h2><p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p><p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p><div class="section"><h3>Members</h3><p>There are no developers working on this project.</p></div><div class="section"><h3>Contributors</h3><p>There are no contributors listed for this project. Please check back again later.</p></div></div><script type="text/javascript">
+function offsetDate(id, offset) {
+    var now = new Date();
+    var nowTime = now.getTime();
+    var localOffset = now.getTimezoneOffset();
+    var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );
+    var developerDate = new Date(developerTime);
+
+    document.getElementById(id).innerHTML = developerDate;
+}
+
+function init(){
+}
+
+window.onLoad = init();
+</script>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-composite-plugin/usage.html b/site/trunk/site-publish/plugins/tuscany-composite-plugin/usage.html
new file mode 100644
index 0000000000..fc411e0a6b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-composite-plugin/usage.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Composite Plugin - </title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Composite Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+            <div class="xleft">
+        Last Published: 03/02/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <strong>Usage</strong>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Usage</h2><p>The <tt>tuscany-composite-plugin</tt> can be used to package and integration-test an SCA composite. It is associated with artifacts with a type of <tt>composite</tt> and is activated by including it in the <tt>build</tt> section of your pom:</p><div class="source"><pre>    &lt;packaging&gt;composite&lt;/packaging&gt;
+    ...
+    &lt;build&gt;
+        &lt;plugins&gt;
+            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.tuscany&lt;/groupId&gt;
+                &lt;artifactId&gt;tuscany-composite-plugin&lt;/artifactId&gt;
+                &lt;extensions&gt;true&lt;/extensions&gt;
+            &lt;/plugin&gt;
+        &lt;/plugins&gt;
+    &lt;/build&gt;</pre></div><p>The build lifecycle for the project is the same as for normal Java jar artifacts with default support for compiling Java code, processing resources, building and running unit tests. The plugin also associates the <a href="../tuscany-itest-plugin/index.html"><tt>tuscany-itest-plugin</tt></a> with the integration-test phase of the build for testing the composite itself.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-base.css b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-base.css
new file mode 100644
index 0000000000..044d12d206
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-base.css
@@ -0,0 +1,145 @@
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+  text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+  float:right;
+  text-shadow: #7CFC00;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-theme.css b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-theme.css
new file mode 100644
index 0000000000..c982168bf2
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/maven-theme.css
@@ -0,0 +1,141 @@
+body {
+  padding: 0px 0px 10px 0px;
+}
+body, td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 13px;
+}
+code{
+  font-family: Courier, monospace;
+  font-size: 13px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#36a;
+}
+a:visited  {
+  color:#47a;
+}
+a:active, a:hover {
+  color:#69c;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #999;
+  color: #900;
+  background-color: #ddd;
+  font-weight:900;
+  font-size: x-large;
+}
+h3 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  color: #900;
+  background-color: #eee;
+  font-weight: normal;
+  font-size: large;
+}
+h4 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #bbb;
+  color: #900;
+  background-color: #fff;
+  font-weight: normal;
+  font-size: large;
+}
+h5 {
+  padding: 4px 4px 4px 6px;
+  color: #900;
+  font-size: normal;
+}
+p {
+  line-height: 1.3em;
+  font-size: small;
+}
+#breadcrumbs {
+  border-top: 1px solid #aaa;
+  border-bottom: 1px solid #aaa;
+  background-color: #ccc;
+}
+#leftColumn {
+  margin: 10px 0 0 5px;
+  border: 1px solid #999;
+  background-color: #eee;
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  color: #000;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 1em;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+.source {
+  border: 1px solid #999;
+}
+dl {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  background-color: #ffc;
+}
+dt {
+  color: #900;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 8px;
+}
+#banner {
+  border-bottom: 1px solid #fff;
+}
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}
+
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/print.css b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/print.css
new file mode 100644
index 0000000000..26ad7f0b59
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/css/print.css
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/dependencies.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/dependencies.html
new file mode 100644
index 0000000000..81878725ba
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/dependencies.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Dependencies</h2><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="a"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="b"><td>commons-codec</td><td>commons-codec</td><td>1.3</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>commons-io</td><td>commons-io</td><td>1.3</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>junit</td><td>junit</td><td>3.8.1</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-artifact</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-plugin-api</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven.surefire</td><td>surefire-api</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven.surefire</td><td>surefire-junit</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.tuscany</td><td>commonj-api_r1.1</td><td>1.0-incubator-M2</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.tuscany.sca.kernel</td><td>core</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-api</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-host-api</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-spi</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.codehaus.plexus</td><td>plexus-utils</td><td>1.1</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.osoa</td><td>sca-api-r1.0</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>stax</td><td>stax-api</td><td>1.0.1</td><td>-</td><td>jar</td><td> </td></tr></table></div><div class="section"><h3>runtime</h3><p>The following is a list of runtime dependencies for this project. These dependencies are required to run the application:</p><table class="bodyTable"><tr class="a"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="b"><td>javax.servlet</td><td>servlet-api</td><td>2.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.codehaus.woodstox</td><td>wstx-asl</td><td>3.2.0</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Transitive Dependencies</h2><p>The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.</p><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="b"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="a"><td>commons-codec</td><td>commons-codec</td><td>1.3</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>commons-io</td><td>commons-io</td><td>1.3</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>junit</td><td>junit</td><td>3.8.1</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-artifact</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-plugin-api</td><td>2.0.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven.surefire</td><td>surefire-api</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven.surefire</td><td>surefire-junit</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.tuscany</td><td>commonj-api_r1.1</td><td>1.0-incubator-M2</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.tuscany.sca.kernel</td><td>core</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-api</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-host-api</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.tuscany.sca.kernel</td><td>tuscany-spi</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.codehaus.plexus</td><td>plexus-utils</td><td>1.1</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.osoa</td><td>sca-api-r1.0</td><td>1.0-incubator-SNAPSHOT</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>stax</td><td>stax-api</td><td>1.0.1</td><td>-</td><td>jar</td><td> </td></tr></table></div><div class="section"><h3>runtime</h3><p>The following is a list of runtime dependencies for this project. These dependencies are required to run the application:</p><table class="bodyTable"><tr class="b"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="a"><td>javax.servlet</td><td>servlet-api</td><td>2.4</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.codehaus.woodstox</td><td>wstx-asl</td><td>3.2.0</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Dependency Graph</h2><div class="section"><h3>Dependency Tree</h3><p><ul><li><a href="#org.apache.tuscany.sca:tuscany-itest-plugin:maven-plugin">org.apache.tuscany.sca:tuscany-itest-plugin:maven-plugin</a><ul><li><a href="#org.apache.maven.surefire:surefire-junit:jar">org.apache.maven.surefire:surefire-junit:jar</a><ul><li><a href="#junit:junit:jar">junit:junit:jar</a></li></ul></p></li><li><a href="#org.apache.maven:maven-artifact:jar">org.apache.maven:maven-artifact:jar</a><ul><li><a href="#org.codehaus.plexus:plexus-utils:jar">org.codehaus.plexus:plexus-utils:jar</a></li></ul></p></li><li><a href="#org.apache.maven:maven-plugin-api:jar">org.apache.maven:maven-plugin-api:jar</a></li><li><a href="#org.apache.tuscany.sca.kernel:core:jar">org.apache.tuscany.sca.kernel:core:jar</a><ul><li><a href="#commons-codec:commons-codec:jar">commons-codec:commons-codec:jar</a></li><li><a href="#commons-io:commons-io:jar">commons-io:commons-io:jar</a></li><li><a href="#org.apache.tuscany.sca.kernel:tuscany-spi:jar">org.apache.tuscany.sca.kernel:tuscany-spi:jar</a><ul><li><a href="#stax:stax-api:jar">stax:stax-api:jar</a></li></ul></p></li><li><a href="#org.codehaus.woodstox:wstx-asl:jar">org.codehaus.woodstox:wstx-asl:jar</a></li><li><a href="#org.apache.tuscany.sca.kernel:tuscany-host-api:jar">org.apache.tuscany.sca.kernel:tuscany-host-api:jar</a><ul><li><a href="#org.apache.tuscany.sca.kernel:tuscany-api:jar">org.apache.tuscany.sca.kernel:tuscany-api:jar</a><ul><li><a href="#org.osoa:sca-api-r1.0:jar">org.osoa:sca-api-r1.0:jar</a></li></ul></p></li></ul></p></li><li><a href="#org.apache.tuscany:commonj-api_r1.1:jar">org.apache.tuscany:commonj-api_r1.1:jar</a></li></ul></p></li><li><a href="#org.apache.maven.surefire:surefire-api:jar">org.apache.maven.surefire:surefire-api:jar</a></li><li><a href="#javax.servlet:servlet-api:jar">javax.servlet:servlet-api:jar</a></li></ul></p></li></ul></p></div><div class="section"><h3>Dependency Listings</h3><p><a name="org.apache.tuscany.sca:tuscany-itest-plugin:maven-plugin"><b>Apache Tuscany Integration Test Plugin</b></a></p><p>A plugin for Apache Maven that simplifies integration testing of SCA components.</p><p><a href="http://www.apache.org/parent/parent/tuscany-itest-plugin">http://www.apache.org/parent/parent/tuscany-itest-plugin</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.maven.surefire:surefire-junit:jar"><b>SureFire JUnit Runner</b></a></p><p>Surefire is a test framework project.</p><p><a href="http://maven.apache.org/surefire/surefire-providers/surefire-junit">http://maven.apache.org/surefire/surefire-providers/surefire-junit</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="junit:junit:jar"><b>Unnamed - junit:junit:jar:3.8.1</b></a></p><p>Project License: No project license is defined for this project.</p><hr /><p><a name="org.apache.maven:maven-artifact:jar"><b>Maven Artifact</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven-artifact">http://maven.apache.org/maven-artifact</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.codehaus.plexus:plexus-utils:jar"><b>Plexus Common Utilities</b></a></p><p>Project License: No project license is defined for this project.</p><hr /><p><a name="org.apache.maven:maven-plugin-api:jar"><b>Maven Plugin API</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven-plugin-api">http://maven.apache.org/maven-plugin-api</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.tuscany.sca.kernel:core:jar"><b>Apache Tuscany SCA Core</b></a></p><p>Core Tuscany runtime.</p><p><a href="http://www.apache.org/parent/parent/parent/core">http://www.apache.org/parent/parent/parent/core</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="commons-codec:commons-codec:jar"><b>Codec</b></a></p><p>The codec package contains simple encoder and decoders for
+   various formats such as Base64 and Hexadecimal.  In addition to these
+   widely used encoders and decoders, the codec package also maintains a
+   collection of phonetic encoding utilities.</p><p><a href="http://jakarta.apache.org/commons/codec/">http://jakarta.apache.org/commons/codec/</a></p><p>Project License: <a href="/LICENSE.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="commons-io:commons-io:jar"><b>IO</b></a></p><p>Commons-IO contains utility classes, stream implementations, file filters, and endian classes.</p><p><a href="http://jakarta.apache.org/commons/io/">http://jakarta.apache.org/commons/io/</a></p><p>Project License: <a href="/LICENSE.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.tuscany.sca.kernel:tuscany-spi:jar"><b>Apache Tuscany SCA SPI</b></a></p><p>Tuscany Service Provider Interfaces.</p><p><a href="http://www.apache.org/parent/parent/parent/tuscany-spi">http://www.apache.org/parent/parent/parent/tuscany-spi</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="stax:stax-api:jar"><b>StAX API</b></a></p><p>StAX API is the standard java XML processing API defined by JSR-173</p><p><a href="http://stax.codehaus.org/">http://stax.codehaus.org/</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.codehaus.woodstox:wstx-asl:jar"><b>Woodstox</b></a></p><p>Woodstox is a high-performance XML processor that implements Stax (JSR-173) API</p><p><a href="http://woodstox.codehaus.org">http://woodstox.codehaus.org</a></p><p>Project License: No project license is defined for this project.</p><hr /><p><a name="org.apache.tuscany.sca.kernel:tuscany-host-api:jar"><b>Apache Tuscany Host API</b></a></p><p>Tuscany Host Programming Interfaces.</p><p><a href="http://www.apache.org/parent/parent/parent/tuscany-host-api">http://www.apache.org/parent/parent/parent/tuscany-host-api</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.tuscany.sca.kernel:tuscany-api:jar"><b>Apache Tuscany SCA API</b></a></p><p>Tuscany Application Programming Interfaces.</p><p><a href="http://www.apache.org/parent/parent/parent/tuscany-api">http://www.apache.org/parent/parent/parent/tuscany-api</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.osoa:sca-api-r1.0:jar"><b>SCA API Version 1.0</b></a></p><p>API classes for the Service Component Architecture</p><p><a href="http://www.apache.org/parent/sca-api-r1.0">http://www.apache.org/parent/sca-api-r1.0</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.tuscany:commonj-api_r1.1:jar"><b>Commonj API for Timer and Work Manager</b></a></p><p>Commonj API for Timer and Work Manager</p><p><a href="http://www.apache.org/parent/commonj-api_r1.1">http://www.apache.org/parent/commonj-api_r1.1</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.maven.surefire:surefire-api:jar"><b>SureFire API</b></a></p><p>Surefire is a test framework project.</p><p><a href="http://maven.apache.org/surefire/surefire-api">http://maven.apache.org/surefire/surefire-api</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="javax.servlet:servlet-api:jar"><b>Unnamed - javax.servlet:servlet-api:jar:2.4</b></a></p><p>Project License: No project license is defined for this project.</p><hr /></div></div><div class="section"><h2>Licenses</h2><p><b>Unknown: </b>Plexus Common Utilities, Unnamed - javax.servlet:servlet-api:jar:2.4, Unnamed - junit:junit:jar:3.8.1, Woodstox </p><p><b>The Apache Software License, Version 2.0: </b>Apache Tuscany Host API, Apache Tuscany Integration Test Plugin, Apache Tuscany SCA API, Apache Tuscany SCA Core, Apache Tuscany SCA SPI, Codec, Commonj API for Timer and Work Manager, IO, Maven Artifact, Maven Plugin API, SCA API Version 1.0, StAX API, SureFire API, SureFire JUnit Runner </p></div><div class="section"><h2>Dependency File Details</h2><table class="bodyTable"><tr class="a"><th>Filename</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th><th>Sealed</th></tr><tr class="b"><td>commons-codec-1.3.jar</td><td>46,725</td><td>42</td><td>25</td><td>5</td><td>1.2</td><td>debug</td><td>-</td></tr><tr class="a"><td>commons-io-1.3.jar</td><td>83,619</td><td>69</td><td>58</td><td>4</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="b"><td>servlet-api-2.4.jar</td><td>97,693</td><td>67</td><td>42</td><td>2</td><td>1.2</td><td>debug</td><td>-</td></tr><tr class="a"><td>junit-3.8.1.jar</td><td>121,070</td><td>119</td><td>100</td><td>6</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="b"><td>maven-artifact-2.0.4.jar</td><td>80,264</td><td>102</td><td>75</td><td>15</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="a"><td>maven-plugin-api-2.0.4.jar</td><td>8,331</td><td>21</td><td>9</td><td>2</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="b"><td>surefire-api-2.0.jar</td><td>48,567</td><td>48</td><td>31</td><td>6</td><td>1.3</td><td>debug</td><td>-</td></tr><tr class="a"><td>surefire-junit-2.0.jar</td><td>12,001</td><td>17</td><td>5</td><td>1</td><td>1.3</td><td>debug</td><td>-</td></tr><tr class="b"><td>commonj-api_r1.1-1.0-incubator-M2.jar</td><td>14,071</td><td>26</td><td>14</td><td>2</td><td>1.4</td><td>debug</td><td>-</td></tr><tr class="a"><td>tuscany-itest-plugin-1.0-incubator-SNAPSHOT.jar</td><td>53,569</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="b"><td>core-1.0-incubator-SNAPSHOT.jar</td><td>505,823</td><td>403</td><td>334</td><td>41</td><td>1.5</td><td>debug</td><td>-</td></tr><tr class="a"><td>tuscany-api-1.0-incubator-SNAPSHOT.jar</td><td>11,923</td><td>20</td><td>6</td><td>2</td><td>1.5</td><td>debug</td><td>-</td></tr><tr class="b"><td>tuscany-host-api-1.0-incubator-SNAPSHOT.jar</td><td>17,707</td><td>38</td><td>19</td><td>7</td><td>1.5</td><td>debug</td><td>-</td></tr><tr class="a"><td>tuscany-spi-1.0-incubator-SNAPSHOT.jar</td><td>221,625</td><td>311</td><td>267</td><td>31</td><td>1.5</td><td>debug</td><td>-</td></tr><tr class="b"><td>plexus-utils-1.1.jar</td><td>168,568</td><td>91</td><td>73</td><td>8</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="a"><td>wstx-asl-3.2.0.jar</td><td>504,968</td><td>257</td><td>247</td><td>19</td><td>1.2</td><td>debug</td><td>-</td></tr><tr class="b"><td>sca-api-r1.0-1.0-incubator-SNAPSHOT.jar</td><td>30,574</td><td>54</td><td>33</td><td>2</td><td>1.5</td><td>debug</td><td>-</td></tr><tr class="a"><td>stax-api-1.0.1.jar</td><td>26,514</td><td>48</td><td>40</td><td>5</td><td>1.2</td><td>debug</td><td>-</td></tr><tr class="b"><td>18 total dependencies</td><td>2,053,612</td><td>1,733</td><td>1,378</td><td>158</td><td>1.5</td><td>17</td><td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/faq.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/faq.html
new file mode 100644
index 0000000000..a877a3a469
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/faq.html
@@ -0,0 +1,156 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Frequently Asked Questions</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <strong>FAQ</strong>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2><a name="top">Frequently Asked Questions</a></h2><ol type="1"><li><a href="#junit4-support">Does the plugin support JUnit 4.0?</a></li><li><a href="#extensions">How do I add extensions to the runtime?</a></li><li><a href="#service-support">Can I use services provided by another systems?</a></li><li><a href="#domain-support">Can I use services provided by another SCA domain?</a></li></ol></div><dl><dt><a name="junit4-support">Does the plugin support JUnit 4.0?</a></dt><dd>
+                <p>
+                    Not at this time.
+               </p>
+            <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr /></dd><dt><a name="extensions">How do I add extensions to the runtime?</a></dt><dd>
+                <p>
+                    The plugin uses the normal extension mechanisms provided by
+                    the Apache Tuscany runtime.
+               </p>
+                <p>
+                    At the moment this requires supplying a custom system SCDL file that
+                    includes the extension composites. In the future, we plan to load
+                    extensions dynamically - please check back later.
+               </p>
+            <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr /></dd><dt><a name="service-support">Can I use services provided by another systems?</a></dt><dd>
+                <p>
+                    You can define &lt;reference&gt; elements in your composite to access
+                    services using a binding. Those can be standard web services, or any
+                    other type of service that there is a binding for.
+               </p>
+            <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr /></dd><dt><a name="domain-support">Can I use services provided by another SCA domain?</a></dt><dd>
+                <p>
+                    As we add federation support, the local runtime will be able to
+                    join any SCA domain (subject to authorization) and use its services.
+               </p>
+            <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table></dd></dl>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/collapsed.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/collapsed.gif
new file mode 100644
index 0000000000..6e71084064
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/collapsed.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/expanded.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/expanded.gif
new file mode 100644
index 0000000000..0fef3d89e0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/expanded.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/external.png b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/external.png
new file mode 100644
index 0000000000..3f999fc88b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/external.png
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_error_sml.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_error_sml.gif
new file mode 100644
index 0000000000..61132ef2b0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_error_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_info_sml.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_info_sml.gif
new file mode 100644
index 0000000000..c6cb9ad7ce
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_info_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_success_sml.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_success_sml.gif
new file mode 100644
index 0000000000..52e85a430a
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_success_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_warning_sml.gif b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_warning_sml.gif
new file mode 100644
index 0000000000..873bbb52cb
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/icon_warning_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/logos/maven-feather.png b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/logos/maven-feather.png
new file mode 100644
index 0000000000..8dfb4ffce7
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/logos/maven-feather.png
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/newwindow.png b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/newwindow.png
new file mode 100644
index 0000000000..6287f72bd0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/images/newwindow.png
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/index.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/index.html
new file mode 100644
index 0000000000..a0914bdc1a
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/index.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - About</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <strong>Introduction</strong>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>About Apache Tuscany Integration Test Plugin</h2><p>A plugin for Apache Maven that simplifies integration testing of SCA components.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/integration.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/integration.html
new file mode 100644
index 0000000000..a074d8f1da
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/integration.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Continuous Integration</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Continuous Integration</h2><p>No continuous integration management system is defined. Please check back at a later date.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/issue-tracking.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/issue-tracking.html
new file mode 100644
index 0000000000..03d381e104
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/issue-tracking.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Issue Tracking</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2>This project uses <a href="http://www.atlassian.com/software/jira">Jira</a> a J2EE-based, issue tracking and project management application.</div><div class="section"><h2>Issue Tracking</h2><p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p><div class="source"><pre><a href="http://issues.apache.org/jira/browse/TUSCANY">http://issues.apache.org/jira/browse/TUSCANY</a></pre></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/license.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/license.html
new file mode 100644
index 0000000000..ee86e71492
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/license.html
@@ -0,0 +1,333 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Project License</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2><p>Typically the licenses listed for the project are that of the project itself, and not of dependencies.</p></div><div class="section"><h2>Project License</h2><div class="section"><h3>The Apache Software License, Version 2.0</h3><div class="source"><pre>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      &quot;control&quot; means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      &quot;Source&quot; form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      &quot;Object&quot; form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      &quot;Work&quot; shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      &quot;Contribution&quot; shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+
+      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same &quot;printed page&quot; as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/mail-lists.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/mail-lists.html
new file mode 100644
index 0000000000..f581e0ca4c
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/mail-lists.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Project Mailing Lists</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Mailing Lists</h2><p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p><table class="bodyTable"><tr class="a"><th>Name</th><th>Subscribe</th><th>Unsubscribe</th><th>Post</th><th>Archive</th></tr><tr class="b"><td>Apache Announce List</td><td><a href="mailto:announce-subscribe@apache.org">Subscribe</a></td><td><a href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td><td><a href="mailto:announce@apache.org">Post</a></td><td><a href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/plugin-info.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/plugin-info.html
new file mode 100644
index 0000000000..5de400fbfe
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/plugin-info.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Plugin documentation</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <strong>Goals</strong>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Plugin documentation</h2><p>Goals available:</p><table class="bodyTable"><tr class="a"><th>Goal</th><th>Description</th></tr><tr class="b"><td><a href="test-mojo.html">tuscany-itest:test</a></td><td>Integration-tests an SCA composite by running it in local copy of Apache Tuscany
+and calling JUnit-based test components to exercise it.</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-info.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-info.html
new file mode 100644
index 0000000000..ac8b6327ca
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-info.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Project Information</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Information</h2><p>This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by <a href="http://maven.apache.org">Maven</a> on behalf of the project.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="license.html">Project License</a></td><td>This is a link to the definitions of project licenses.</td></tr><tr class="a"><td><a href="index.html">About</a></td><td>A plugin for Apache Maven that simplifies integration testing of SCA components.</td></tr><tr class="b"><td><a href="dependencies.html">Dependencies</a></td><td>This document lists the projects dependencies and provides information on each dependency.</td></tr><tr class="a"><td><a href="team-list.html">Project Team</a></td><td>This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.</td></tr><tr class="b"><td><a href="mail-lists.html">Mailing Lists</a></td><td>This document provides subscription and archive information for this project's mailing lists.</td></tr><tr class="a"><td><a href="integration.html">Continuous Integration</a></td><td>This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.</td></tr><tr class="b"><td><a href="source-repository.html">Source Repository</a></td><td>This is a link to the online source repository that can be viewed via a web browser.</td></tr><tr class="a"><td><a href="issue-tracking.html">Issue Tracking</a></td><td>This is a link to the issue management system for this project. Issues (bugs, features, change requests) can be created and queried using this link.</td></tr><tr class="b"><td><a href="project-summary.html">Project Summary</a></td><td>This document lists other related information of this project</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-reports.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-reports.html
new file mode 100644
index 0000000000..6f0d320b48
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-reports.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Generated Reports</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Generated Reports</h2><p>This document provides an overview of the various reports that are automatically generated by <a href="http://maven.apache.org">Maven</a> Each report is briefly described below.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="plugin-info.html">Plugin documentation</a></td><td>This report provides goals and parameters documentation of a plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-summary.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-summary.html
new file mode 100644
index 0000000000..0dcd07954b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/project-summary.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Project Summary</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Summary</h2><div class="section"><h3>Project Information</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Tuscany Integration Test Plugin</td></tr><tr class="a"><td>Description</td><td>A plugin for Apache Maven that simplifies integration testing of SCA components.</td></tr><tr class="b"><td>Homepage</td><td><a href="http://www.apache.org/parent/parent/tuscany-itest-plugin">http://www.apache.org/parent/parent/tuscany-itest-plugin</a></td></tr></table></div><div class="section"><h3>Project Organization</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Software Foundation</td></tr><tr class="a"><td>URL</td><td><a href="http://www.apache.org/">http://www.apache.org/</a></td></tr></table></div><div class="section"><h3>Build Information</h3><table class="bodyTable"><tr class="b"><th>Field</th><th>Value</th></tr><tr class="a"><td>GroupId</td><td>org.apache.tuscany.sca</td></tr><tr class="b"><td>ArtifactId</td><td>tuscany-itest-plugin</td></tr><tr class="a"><td>Version</td><td>1.0-incubator-SNAPSHOT</td></tr><tr class="b"><td>Type</td><td>maven-plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/source-repository.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/source-repository.html
new file mode 100644
index 0000000000..1d9249a076
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/source-repository.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Source Repository</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2>This project uses <a href="http://subversion.tigris.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</div><div class="section"><h2>Web Access</h2><p>The following is a link to the online source repository.</p><div class="source"><pre><a href="http://svn.apache.org/viewvc/incubator/tuscany/java/parent/tuscany-itest-plugin">http://svn.apache.org/viewvc/incubator/tuscany/java/parent/tuscany-itest-plugin</a></pre></div></div><div class="section"><h2>Anonymous access</h2><p>The source can be checked out anonymously from SVN with this command:</p><div class="source"><pre>$ svn checkout http://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-itest-plugin tuscany-itest-plugin</pre></div></div><div class="section"><h2>Developer access</h2><p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p><div class="source"><pre>$ svn checkout https://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-itest-plugin tuscany-itest-plugin</pre></div><p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p><div class="source"><pre>$ svn commit --username your-username -m &quot;A message&quot;</pre></div></div><div class="section"><h2>Access from behind a firewall</h2><p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p><div class="source"><pre>$ svn checkout https://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-itest-plugin tuscany-itest-plugin</pre></div></div><div class="section"><h2>Access through a proxy</h2><p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your &quot;servers&quot; configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory &quot;~/.subversion&quot;. On Windows it is in &quot;%APPDATA%\Subversion&quot;. (Try &quot;echo %APPDATA%&quot;, note this is a hidden directory.)</p><p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p><p>Example : Edit the 'servers' file and add something like :</p><div class="source"><pre>[global]
+http-proxy-host = your.proxy.name
+http-proxy-port = 3128
+</pre></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/team-list.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/team-list.html
new file mode 100644
index 0000000000..f71a9c4c5e
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/team-list.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - Team list</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>The Team</h2><p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p><p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p><div class="section"><h3>Members</h3><p>There are no developers working on this project.</p></div><div class="section"><h3>Contributors</h3><p>There are no contributors listed for this project. Please check back again later.</p></div></div><script type="text/javascript">
+function offsetDate(id, offset) {
+    var now = new Date();
+    var nowTime = now.getTime();
+    var localOffset = now.getTimezoneOffset();
+    var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );
+    var developerDate = new Date(developerTime);
+
+    document.getElementById(id).innerHTML = developerDate;
+}
+
+function init(){
+}
+
+window.onLoad = init();
+</script>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/test-mojo.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/test-mojo.html
new file mode 100644
index 0000000000..a6fd81c682
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/test-mojo.html
@@ -0,0 +1,255 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - 
+    tuscany-itest-plugin - tuscany-itest:test</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        
+  
+  
+    <a name="tuscany-itest:test"></a><div class="section"><h2>tuscany-itest:test</h2>
+      <p>Integration-tests an SCA composite by running it in local copy of Apache Tuscany
+and calling JUnit-based test components to exercise it.</p>
+      <p><b>Mojo Attributes</b>:<ul>
+          <li>Requires a Maven 2.0 project to execute.</li>
+          <li>Automatically executes within the lifecycle phase: <code>integration-test</code></li>
+          </ul>
+        </p>
+      <a name="required_parameters"></a><div class="section"><h3>Required Parameters</h3>
+        <table class="bodyTable">
+          <tr class="a">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#testClassesDirectory">testClassesDirectory</a></b></td>
+            <td><code>File</code></td>
+            <td>The directory containing generated test classes of the project being tested.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#testComponentName">testComponentName</a></b></td>
+            <td><code>String</code></td>
+            <td>The name of the component that will be implemented by the test harness composite.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#testDomain">testDomain</a></b></td>
+            <td><code>String</code></td>
+            <td>The SCA domain in which to deploy the test components.</td>
+            </tr>
+          </table>
+        </div>
+      <a name="optional_parameters"></a><div class="section"><h3>Optional Parameters</h3>
+        <table class="bodyTable">
+          <tr class="a">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#reportsDirectory">reportsDirectory</a></b></td>
+            <td><code>File</code></td>
+            <td>The directory where reports will be written.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#systemScdl">systemScdl</a></b></td>
+            <td><code>URL</code></td>
+            <td>The location of the SCDL that configures the Apache Tuscany runtime.
+This allows the default runtime configuration supplied in this plugin
+to be overridden.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#testScdl">testScdl</a></b></td>
+            <td><code>File</code></td>
+            <td>The location if the SCDL that defines the test harness composite.
+The source for this would normally be placed in the test/resources
+directory and be copied by the resource plugin; this allows property
+substitution if required.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#trimStackTrace">trimStackTrace</a></b></td>
+            <td><code>boolean</code></td>
+            <td>Whether to trim the stack trace in the reports to just the lines within
+the test, or show the full trace. Default value is <code>true</code>.</td>
+            </tr>
+          </table>
+        </div>
+      <a name="parameter_details"></a><div class="section"><h3>Parameter Details</h3>
+        <p><b><a name="reportsdirectory">reportsDirectory</a></b></p>
+        <p>The directory where reports will be written.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.io.File</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          <li><b>Expression</b>: <code>${project.build.directory}/surefire-reports</code></li>
+          </ul><hr></hr><p><b><a name="systemscdl">systemScdl</a></b></p>
+        <p>The location of the SCDL that configures the Apache Tuscany runtime.
+This allows the default runtime configuration supplied in this plugin
+to be overridden.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.net.URL</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="testclassesdirectory">testClassesDirectory</a></b></p>
+        <p>The directory containing generated test classes of the project being tested.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.io.File</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>${project.build.testOutputDirectory}</code></li>
+          </ul><hr></hr><p><b><a name="testcomponentname">testComponentName</a></b></p>
+        <p>The name of the component that will be implemented by the test harness composite.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>testHarness</code></li>
+          </ul><hr></hr><p><b><a name="testdomain">testDomain</a></b></p>
+        <p>The SCA domain in which to deploy the test components.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>itest://localhost/testDomain/</code></li>
+          </ul><hr></hr><p><b><a name="testscdl">testScdl</a></b></p>
+        <p>The location if the SCDL that defines the test harness composite.
+The source for this would normally be placed in the test/resources
+directory and be copied by the resource plugin; this allows property
+substitution if required.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.io.File</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          <li><b>Expression</b>: <code>${project.build.testOutputDirectory}/itest.scdl</code></li>
+          </ul><hr></hr><p><b><a name="trimstacktrace">trimStackTrace</a></b></p>
+        <p>Whether to trim the stack trace in the reports to just the lines within
+the test, or show the full trace.</p>
+        <ul>
+          <li><b>Type</b>: <code>boolean</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          <li><b>Expression</b>: <code>${trimStackTrace}</code></li>
+          <li><b>Default</b>: <code>true</code></li>
+          </ul>
+        </div>
+      </div>
+    
+  
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-itest-plugin/usage.html b/site/trunk/site-publish/plugins/tuscany-itest-plugin/usage.html
new file mode 100644
index 0000000000..32f475446f
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-itest-plugin/usage.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany Integration Test Plugin - </title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany Integration Test Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <strong>Usage</strong>
+        </li>
+              
+    <li class="none">
+              <a href="faq.html">FAQ</a>
+        </li>
+          </ul>
+          <h5>Examples</h5>
+        <ul>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Usage</h2><p>The <tt>tuscany-itest-plugin</tt> is associated with the <tt>integration-test</tt> phase of the build lifecycle.</p><p>The plugin can be invoked directly from the command line:</p><div class="source"><pre>mvn org.apache.tuscany.sca:tuscany-itest-plugin:test</pre></div><p>or can be included in the build definition for your project:</p><div class="source"><pre>    &lt;build&gt;
+        &lt;plugins&gt;
+            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt;
+                &lt;artifactId&gt;tuscany-itest-plugin&lt;/artifactId&gt;
+                &lt;executions&gt;
+                    &lt;execution&gt;
+                        &lt;goals&gt;
+                            &lt;goal&gt;test&lt;/goal&gt;
+                        &lt;/goals&gt;
+                    &lt;/execution&gt;
+                &lt;/executions&gt;
+            &lt;/plugin&gt;
+        &lt;/plugins&gt;
+    &lt;/build&gt;</pre></div><div class="section"><h3>Writing Integration Tests</h3><p>Integration tests are written as JUnit TestCases (currently only JUnit 3.8.1 is supported but other frameworks may be added later) that use SCA references to access services provided by the components under test. The references are injected into your testcase before its setUp method is called (using constructor, setter or field injection).</p><p>For example, to test a component that implemented the <tt>MyService</tt> interface you could write:</p><div class="source"><pre>public class ServiceTestComponent extends TestCase {
+
+    @Reference
+    public MyService service;
+
+    public void testSomething() {
+        assertEquals(result, service.doSomething);
+    }
+}</pre></div><p>This TestCase is used as a component within a SCA composite that defines the test suite as described in the next section. This separates TestCase's for normal unit tests from those that are integration tests.</p><p>If any methods have an SCA <tt>@Init</tt> or <tt>@Destroy</tt> annotation they will be called before and after executing tests; if no methods are annotated in this way the normal JUnit <tt>setUp</tt> and <tt>tearDown</tt> methods will be called.</p><p>If the component's scope is <tt>STATELESS</tt> (the default), then a new instance of the test component will used to run each test; if the component's scope is <tt>COMPOSITE</tt> then a single instance will be used to run all tests. The scope can be set with the standard SCA <tt>@Scope</tt> annotation.</p></div><div class="section"><h3>Defining an SCA Test Suite</h3><p>The Test Suite for your integration tests is defined by an SCA composite file that contains the test components written above wired to the production components for the application. The test components must use an implementation type of <tt> &lt;tuscany:junit&gt; </tt>.</p><p>A simple way to achieve this is to use a SCDL <i>include</i> element to include the content of production composite in the test harness; this gives the test components access to all of the components and references in the production composite.</p><p>For example, the following SCDL configures the <tt>ServiceTestComponent</tt> above to test the <tt>MyServiceComponent</tt> in the production composite <tt>ProductionComposite</tt>:</p><div class="source"><pre>&lt;composite xmlns=&quot;http://www.osoa.org/xmlns/sca/1.0&quot;
+           xmlns:tuscany=&quot;http://tuscany.apache.org/xmlns/sca/1.0&quot;
+           name=&quot;PropertyTestHarnessComposite&quot;&gt;
+
+    &lt;include name=&quot;ProductionComposite&quot; scdlResource=&quot;META-INF/sca/default.scdl&quot;/&gt;
+
+    &lt;component name=&quot;testMyService&quot;&gt;
+        &lt;tuscany:junit class=&quot;ServiceTestComponent&quot;/&gt;
+        &lt;reference name=&quot;service&quot;&gt;MyServiceImpl&lt;/reference&gt;
+    &lt;/component&gt;
+&lt;/composite&gt;</pre></div><p>Alternatively, the production composite can be tested as a black box by using it to implement a component and wiring test components to it. This allows the externally visible services to be tested without knowledge of the internals of the composite.</p><p>For example, the following SCDL tests the <tt>ProductionComposite</tt> in this way:</p><div class="source"><pre>&lt;composite xmlns=&quot;http://www.osoa.org/xmlns/sca/1.0&quot;
+           xmlns:tuscany=&quot;http://tuscany.apache.org/xmlns/sca/1.0&quot;
+           name=&quot;PropertyTestHarnessComposite&quot;&gt;
+
+    &lt;component name=&quot;ProductionComponent&quot;&gt;
+        &lt;implementation.composite name=&quot;ProductionComposite&quot;
+                                  scdlResource=&quot;META-INF/sca/default.scdl&quot;/&gt;
+    &lt;/component&gt;
+
+    &lt;component name=&quot;testMyService&quot;&gt;
+        &lt;tuscany:junit class=&quot;ServiceTestComponent&quot;/&gt;
+        &lt;reference name=&quot;service&quot;&gt;ProductionComponent&lt;/reference&gt;
+    &lt;/component&gt;
+&lt;/composite&gt;</pre></div><p>The location of this test composite definition can be specified using the <tt>testScdl</tt> plugin configuration property; the default location is <tt>$<a name="project.build.testoutputdirectory">project.build.testOutputDirectory</a>/itest.scdl</tt> which allows the <tt>itest.scdl</tt> source file to be placed in the test resources (<tt>src/test/resources</tt>).</p></div><div class="section"><h3>Test Result Output</h3><p>The test results are output using Surefire's reporting framework for integration with other test reports. XML and test results are stored in the normal test output directory (<tt>target/surefire-reports</tt>) with a summary displayed on the console:</p><div class="source"><pre>[INFO] [tuscany-itest:test {execution: default}]
+[INFO] Starting Tuscany...
+[INFO] Deploying test SCDL from .../target/test-classes/itest.scdl
+[INFO] Executing tests...
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Running testMyService
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec
+
+Results :
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+[INFO] Stopping Tuscany...</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-base.css b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-base.css
new file mode 100644
index 0000000000..044d12d206
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-base.css
@@ -0,0 +1,145 @@
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+  text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+  float:right;
+  text-shadow: #7CFC00;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-theme.css b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-theme.css
new file mode 100644
index 0000000000..c982168bf2
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/maven-theme.css
@@ -0,0 +1,141 @@
+body {
+  padding: 0px 0px 10px 0px;
+}
+body, td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 13px;
+}
+code{
+  font-family: Courier, monospace;
+  font-size: 13px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#36a;
+}
+a:visited  {
+  color:#47a;
+}
+a:active, a:hover {
+  color:#69c;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #999;
+  color: #900;
+  background-color: #ddd;
+  font-weight:900;
+  font-size: x-large;
+}
+h3 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  color: #900;
+  background-color: #eee;
+  font-weight: normal;
+  font-size: large;
+}
+h4 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #bbb;
+  color: #900;
+  background-color: #fff;
+  font-weight: normal;
+  font-size: large;
+}
+h5 {
+  padding: 4px 4px 4px 6px;
+  color: #900;
+  font-size: normal;
+}
+p {
+  line-height: 1.3em;
+  font-size: small;
+}
+#breadcrumbs {
+  border-top: 1px solid #aaa;
+  border-bottom: 1px solid #aaa;
+  background-color: #ccc;
+}
+#leftColumn {
+  margin: 10px 0 0 5px;
+  border: 1px solid #999;
+  background-color: #eee;
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  color: #000;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 1em;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+.source {
+  border: 1px solid #999;
+}
+dl {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  background-color: #ffc;
+}
+dt {
+  color: #900;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 8px;
+}
+#banner {
+  border-bottom: 1px solid #fff;
+}
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}
+
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/css/print.css b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/print.css
new file mode 100644
index 0000000000..26ad7f0b59
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/css/print.css
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/dependencies.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/dependencies.html
new file mode 100644
index 0000000000..acb47f0d18
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/dependencies.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Dependencies</h2><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="a"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="b"><td>commons-io</td><td>commons-io</td><td>1.2</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-artifact</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-plugin-api</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.codehaus.plexus</td><td>plexus-utils</td><td>1.0.4</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Transitive Dependencies</h2><p>The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.</p><div class="section"><h3>compile</h3><p>The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:</p><table class="bodyTable"><tr class="b"><th>GroupId</th><th>ArtifactId</th><th>Version</th><th>Classifier</th><th>Type</th><th>Optional</th></tr><tr class="a"><td>commons-io</td><td>commons-io</td><td>1.2</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.apache.maven</td><td>maven-artifact</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="a"><td>org.apache.maven</td><td>maven-plugin-api</td><td>2.0</td><td>-</td><td>jar</td><td> </td></tr><tr class="b"><td>org.codehaus.plexus</td><td>plexus-utils</td><td>1.0.4</td><td>-</td><td>jar</td><td> </td></tr></table></div></div><div class="section"><h2>Project Dependency Graph</h2><div class="section"><h3>Dependency Tree</h3><p><ul><li><a href="#org.apache.tuscany.sca:tuscany-war-plugin:maven-plugin">org.apache.tuscany.sca:tuscany-war-plugin:maven-plugin</a><ul><li><a href="#org.apache.maven:maven-artifact:jar">org.apache.maven:maven-artifact:jar</a><ul><li><a href="#org.codehaus.plexus:plexus-utils:jar">org.codehaus.plexus:plexus-utils:jar</a></li></ul></p></li><li><a href="#org.apache.maven:maven-plugin-api:jar">org.apache.maven:maven-plugin-api:jar</a></li><li><a href="#commons-io:commons-io:jar">commons-io:commons-io:jar</a></li></ul></p></li></ul></p></div><div class="section"><h3>Dependency Listings</h3><p><a name="org.apache.tuscany.sca:tuscany-war-plugin:maven-plugin"><b>Apache Tuscany War Plugin</b></a></p><p>A plugin for Apache Maven that adds a Tuscany runtime to a war.</p><p><a href="http://www.apache.org/parent/parent/tuscany-war-plugin">http://www.apache.org/parent/parent/tuscany-war-plugin</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.apache.maven:maven-artifact:jar"><b>Maven Artifact</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven2/maven-artifact">http://maven.apache.org/maven2/maven-artifact</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="org.codehaus.plexus:plexus-utils:jar"><b>Plexus Common Utilities</b></a></p><p>Project License: No project license is defined for this project.</p><hr /><p><a name="org.apache.maven:maven-plugin-api:jar"><b>Maven Plugin API</b></a></p><p>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</p><p><a href="http://maven.apache.org/maven2/maven-plugin-api">http://maven.apache.org/maven2/maven-plugin-api</a></p><p>Project License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p><hr /><p><a name="commons-io:commons-io:jar"><b>IO</b></a></p><p>Commons-IO contains utility classes, stream implementations, file filters, and endian classes.</p><p><a href="http://jakarta.apache.org/commons/io/">http://jakarta.apache.org/commons/io/</a></p><p>Project License: <a href="/LICENSE.txt">The Apache Software License, Version 2.0</a></p><hr /></div></div><div class="section"><h2>Licenses</h2><p><b>Unknown: </b>Plexus Common Utilities </p><p><b>The Apache Software License, Version 2.0: </b>Apache Tuscany War Plugin, IO, Maven Artifact, Maven Plugin API </p></div><div class="section"><h2>Dependency File Details</h2><table class="bodyTable"><tr class="a"><th>Filename</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th><th>Sealed</th></tr><tr class="b"><td>commons-io-1.2.jar</td><td>65,621</td><td>55</td><td>44</td><td>4</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="a"><td>maven-artifact-2.0.jar</td><td>78,761</td><td>101</td><td>74</td><td>15</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="b"><td>maven-plugin-api-2.0.jar</td><td>10,133</td><td>21</td><td>9</td><td>2</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="a"><td>tuscany-war-plugin-1.0-incubator-SNAPSHOT.jar</td><td>30,579</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="b"><td>plexus-utils-1.0.4.jar</td><td>163,803</td><td>85</td><td>68</td><td>7</td><td>1.1</td><td>debug</td><td>-</td></tr><tr class="a"><td>5 total dependencies</td><td>348,897</td><td>262</td><td>195</td><td>28</td><td>1.1</td><td>4</td><td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/collapsed.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/collapsed.gif
new file mode 100644
index 0000000000..6e71084064
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/collapsed.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/expanded.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/expanded.gif
new file mode 100644
index 0000000000..0fef3d89e0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/expanded.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/external.png b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/external.png
new file mode 100644
index 0000000000..3f999fc88b
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/external.png
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_error_sml.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_error_sml.gif
new file mode 100644
index 0000000000..61132ef2b0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_error_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_info_sml.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_info_sml.gif
new file mode 100644
index 0000000000..c6cb9ad7ce
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_info_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_success_sml.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_success_sml.gif
new file mode 100644
index 0000000000..52e85a430a
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_success_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_warning_sml.gif b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_warning_sml.gif
new file mode 100644
index 0000000000..873bbb52cb
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/icon_warning_sml.gif
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/logos/maven-feather.png b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/logos/maven-feather.png
new file mode 100644
index 0000000000..8dfb4ffce7
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/logos/maven-feather.png
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/images/newwindow.png b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/newwindow.png
new file mode 100644
index 0000000000..6287f72bd0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/images/newwindow.png
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/index.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/index.html
new file mode 100644
index 0000000000..20e2f0f455
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/index.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - About</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <strong>Introduction</strong>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>About Apache Tuscany War Plugin</h2><p>A plugin for Apache Maven that adds a Tuscany runtime to a war.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/integration.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/integration.html
new file mode 100644
index 0000000000..8dd7b1be62
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/integration.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Continuous Integration</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Continuous Integration</h2><p>No continuous integration management system is defined. Please check back at a later date.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/issue-tracking.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/issue-tracking.html
new file mode 100644
index 0000000000..d8cef81b91
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/issue-tracking.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Issue Tracking</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2>This project uses <a href="http://www.atlassian.com/software/jira">Jira</a> a J2EE-based, issue tracking and project management application.</div><div class="section"><h2>Issue Tracking</h2><p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p><div class="source"><pre><a href="http://issues.apache.org/jira/browse/TUSCANY">http://issues.apache.org/jira/browse/TUSCANY</a></pre></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/license.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/license.html
new file mode 100644
index 0000000000..46960cb314
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/license.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - </title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/mail-lists.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/mail-lists.html
new file mode 100644
index 0000000000..de5ad250c0
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/mail-lists.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Project Mailing Lists</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Mailing Lists</h2><p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p><table class="bodyTable"><tr class="a"><th>Name</th><th>Subscribe</th><th>Unsubscribe</th><th>Post</th><th>Archive</th></tr><tr class="b"><td>Apache Announce List</td><td><a href="mailto:announce-subscribe@apache.org">Subscribe</a></td><td><a href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td><td><a href="mailto:announce@apache.org">Post</a></td><td><a href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/plugin-info.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/plugin-info.html
new file mode 100644
index 0000000000..93ee0ced83
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/plugin-info.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Plugin documentation</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <strong>Goals</strong>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Plugin documentation</h2><p>Goals available:</p><table class="bodyTable"><tr class="a"><th>Goal</th><th>Description</th></tr><tr class="b"><td><a href="tuscany-war-mojo.html">tuscany-war:tuscany-war</a></td><td>Build the tuscany war file by adding the tuscany dependencies.
+
+Performs the following tasks.
+
+<ul>
+<li>Adds the boot dependencies transitively to WEB-INF/tuscany/boot</li>
+<li>By default boot libraries are transitively resolved from webapp-host</li>
+<li>The version of boot libraries can be specified using configuration/runTimeVersion element</li>
+<li>Boot libraries can be overridden using the configuration/bootLibs element in the plugin</li>
+<li>Adds the extension artifacts specified using configuration/extensions to WEB-INF/tuscany/extensions</li>
+<li>If configuration/loadExtensionsDependency is set to true extension dependencies are transitivel loaded</li>
+<li>Extension dependencies are loaded into WEB-INF/tuscany/repository directory in a Maven repo format</li>
+<li>Extension dependency metadata is written to WEB-INF/tuscany/repository/dependency.metadata file</li>
+</ul></td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/project-info.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-info.html
new file mode 100644
index 0000000000..e4cac873ea
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-info.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Project Information</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Information</h2><p>This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by <a href="http://maven.apache.org">Maven</a> on behalf of the project.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="license.html">Project License</a></td><td>This is a link to the definitions of project licenses.</td></tr><tr class="a"><td><a href="index.html">About</a></td><td>A plugin for Apache Maven that adds a Tuscany runtime to a war.</td></tr><tr class="b"><td><a href="dependencies.html">Dependencies</a></td><td>This document lists the projects dependencies and provides information on each dependency.</td></tr><tr class="a"><td><a href="team-list.html">Project Team</a></td><td>This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.</td></tr><tr class="b"><td><a href="mail-lists.html">Mailing Lists</a></td><td>This document provides subscription and archive information for this project's mailing lists.</td></tr><tr class="a"><td><a href="integration.html">Continuous Integration</a></td><td>This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.</td></tr><tr class="b"><td><a href="source-repository.html">Source Repository</a></td><td>This is a link to the online source repository that can be viewed via a web browser.</td></tr><tr class="a"><td><a href="issue-tracking.html">Issue Tracking</a></td><td>This is a link to the issue management system for this project. Issues (bugs, features, change requests) can be created and queried using this link.</td></tr><tr class="b"><td><a href="project-summary.html">Project Summary</a></td><td>This document lists other related information of this project</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/project-reports.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-reports.html
new file mode 100644
index 0000000000..f2417bf92f
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-reports.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Generated Reports</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Generated Reports</h2><p>This document provides an overview of the various reports that are automatically generated by <a href="http://maven.apache.org">Maven</a> Each report is briefly described below.</p><div class="section"><h3>Overview</h3><table class="bodyTable"><tr class="a"><th>Document</th><th>Description</th></tr><tr class="b"><td><a href="plugin-info.html">Plugin documentation</a></td><td>This report provides goals and parameters documentation of a plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/project-summary.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-summary.html
new file mode 100644
index 0000000000..007cdbaeb5
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/project-summary.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Project Summary</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Project Summary</h2><div class="section"><h3>Project Information</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Tuscany War Plugin</td></tr><tr class="a"><td>Description</td><td>A plugin for Apache Maven that adds a Tuscany runtime to a war.</td></tr><tr class="b"><td>Homepage</td><td><a href="http://www.apache.org/parent/parent/tuscany-war-plugin">http://www.apache.org/parent/parent/tuscany-war-plugin</a></td></tr></table></div><div class="section"><h3>Project Organization</h3><table class="bodyTable"><tr class="a"><th>Field</th><th>Value</th></tr><tr class="b"><td>Name</td><td>Apache Software Foundation</td></tr><tr class="a"><td>URL</td><td><a href="http://www.apache.org/">http://www.apache.org/</a></td></tr></table></div><div class="section"><h3>Build Information</h3><table class="bodyTable"><tr class="b"><th>Field</th><th>Value</th></tr><tr class="a"><td>GroupId</td><td>org.apache.tuscany.sca</td></tr><tr class="b"><td>ArtifactId</td><td>tuscany-war-plugin</td></tr><tr class="a"><td>Version</td><td>1.0-incubator-SNAPSHOT</td></tr><tr class="b"><td>Type</td><td>maven-plugin</td></tr></table></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/source-repository.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/source-repository.html
new file mode 100644
index 0000000000..c4d6be6caa
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/source-repository.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Source Repository</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Overview</h2>This project uses <a href="http://subversion.tigris.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</div><div class="section"><h2>Web Access</h2><p>The following is a link to the online source repository.</p><div class="source"><pre><a href="http://svn.apache.org/viewvc/incubator/tuscany/java/parent/tuscany-war-plugin">http://svn.apache.org/viewvc/incubator/tuscany/java/parent/tuscany-war-plugin</a></pre></div></div><div class="section"><h2>Anonymous access</h2><p>The source can be checked out anonymously from SVN with this command:</p><div class="source"><pre>$ svn checkout http://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-war-plugin tuscany-war-plugin</pre></div></div><div class="section"><h2>Developer access</h2><p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p><div class="source"><pre>$ svn checkout https://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-war-plugin tuscany-war-plugin</pre></div><p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p><div class="source"><pre>$ svn commit --username your-username -m &quot;A message&quot;</pre></div></div><div class="section"><h2>Access from behind a firewall</h2><p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p><div class="source"><pre>$ svn checkout https://svn.apache.org/repos/asf/incubator/tuscany/java/parent/tuscany-war-plugin tuscany-war-plugin</pre></div></div><div class="section"><h2>Access through a proxy</h2><p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your &quot;servers&quot; configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory &quot;~/.subversion&quot;. On Windows it is in &quot;%APPDATA%\Subversion&quot;. (Try &quot;echo %APPDATA%&quot;, note this is a hidden directory.)</p><p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p><p>Example : Edit the 'servers' file and add something like :</p><div class="source"><pre>[global]
+http-proxy-host = your.proxy.name
+http-proxy-port = 3128
+</pre></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/team-list.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/team-list.html
new file mode 100644
index 0000000000..fb7e42647e
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/team-list.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - Team list</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>The Team</h2><p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p><p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p><div class="section"><h3>Members</h3><p>There are no developers working on this project.</p></div><div class="section"><h3>Contributors</h3><p>There are no contributors listed for this project. Please check back again later.</p></div></div><script type="text/javascript">
+function offsetDate(id, offset) {
+    var now = new Date();
+    var nowTime = now.getTime();
+    var localOffset = now.getTimezoneOffset();
+    var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );
+    var developerDate = new Date(developerTime);
+
+    document.getElementById(id).innerHTML = developerDate;
+}
+
+function init(){
+}
+
+window.onLoad = init();
+</script>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/tuscany-war-mojo.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/tuscany-war-mojo.html
new file mode 100644
index 0000000000..8b94f92ecd
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/tuscany-war-mojo.html
@@ -0,0 +1,253 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - 
+    tuscany-war-plugin - tuscany-war:tuscany-war</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <a href="usage.html">Usage</a>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        
+  
+  
+    <a name="tuscany-war:tuscany-war"></a><div class="section"><h2>tuscany-war:tuscany-war</h2>
+      <p>Build the tuscany war file by adding the tuscany dependencies.
+
+Performs the following tasks.
+
+<ul>
+<li>Adds the boot dependencies transitively to WEB-INF/tuscany/boot</li>
+<li>By default boot libraries are transitively resolved from webapp-host</li>
+<li>The version of boot libraries can be specified using configuration/runTimeVersion element</li>
+<li>Boot libraries can be overridden using the configuration/bootLibs element in the plugin</li>
+<li>Adds the extension artifacts specified using configuration/extensions to WEB-INF/tuscany/extensions</li>
+<li>If configuration/loadExtensionsDependency is set to true extension dependencies are transitivel loaded</li>
+<li>Extension dependencies are loaded into WEB-INF/tuscany/repository directory in a Maven repo format</li>
+<li>Extension dependency metadata is written to WEB-INF/tuscany/repository/dependency.metadata file</li>
+</ul></p>
+      <p><b>Mojo Attributes</b>:<ul>
+          <li>Requires a Maven 2.0 project to execute.</li>
+          <li>Automatically executes within the lifecycle phase: <code>package</code></li>
+          </ul>
+        </p>
+      <a name="required_parameters"></a><div class="section"><h3>Required Parameters</h3>
+        <table class="bodyTable">
+          <tr class="a">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#outputDirectory">outputDirectory</a></b></td>
+            <td><code>String</code></td>
+            <td>The directory for the generated WAR.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#warName">warName</a></b></td>
+            <td><code>String</code></td>
+            <td>The name of the generated WAR.</td>
+            </tr>
+          </table>
+        </div>
+      <a name="optional_parameters"></a><div class="section"><h3>Optional Parameters</h3>
+        <table class="bodyTable">
+          <tr class="b">
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#bootLibs">bootLibs</a></b></td>
+            <td><code>Dependency[]</code></td>
+            <td>The directory for the generated WAR.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#dependencies">dependencies</a></b></td>
+            <td><code>Dependency[]</code></td>
+            <td>The directory for the generated WAR.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#extensions">extensions</a></b></td>
+            <td><code>Dependency[]</code></td>
+            <td>The directory for the generated WAR.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#loadExtensionDependencies">loadExtensionDependencies</a></b></td>
+            <td><code>boolean</code></td>
+            <td>A flag to indicate whether extension dependencies should be resolved transitively.</td>
+            </tr>
+          <tr class="a">
+            <td><b><a href="#metadataSource">metadataSource</a></b></td>
+            <td><code>ArtifactMetadataSource</code></td>
+            <td>Artifact metadata source.</td>
+            </tr>
+          <tr class="b">
+            <td><b><a href="#runTimeVersion">runTimeVersion</a></b></td>
+            <td><code>String</code></td>
+            <td>The default version of boot dependany jar files</td>
+            </tr>
+          </table>
+        </div>
+      <a name="parameter_details"></a><div class="section"><h3>Parameter Details</h3>
+        <p><b><a name="bootlibs">bootLibs</a></b></p>
+        <p>The directory for the generated WAR.</p>
+        <ul>
+          <li><b>Type</b>: <code>org.apache.tuscany.plugin.war.Dependency[]</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="dependencies">dependencies</a></b></p>
+        <p>The directory for the generated WAR.</p>
+        <ul>
+          <li><b>Type</b>: <code>org.apache.tuscany.plugin.war.Dependency[]</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="extensions">extensions</a></b></p>
+        <p>The directory for the generated WAR.</p>
+        <ul>
+          <li><b>Type</b>: <code>org.apache.tuscany.plugin.war.Dependency[]</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="loadextensiondependencies">loadExtensionDependencies</a></b></p>
+        <p>A flag to indicate whether extension dependencies should be resolved transitively.</p>
+        <ul>
+          <li><b>Type</b>: <code>boolean</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="metadatasource">metadataSource</a></b></p>
+        <p>Artifact metadata source.</p>
+        <ul>
+          <li><b>Type</b>: <code>org.apache.maven.artifact.metadata.ArtifactMetadataSource</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="outputdirectory">outputDirectory</a></b></p>
+        <p>The directory for the generated WAR.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>${project.build.directory}</code></li>
+          </ul><hr></hr><p><b><a name="runtimeversion">runTimeVersion</a></b></p>
+        <p>The default version of boot dependany jar files</p>
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>No</code></li>
+          </ul><hr></hr><p><b><a name="warname">warName</a></b></p>
+        <p>The name of the generated WAR.</p>
+        <ul>
+          <li><b>Type</b>: <code>java.lang.String</code></li>
+          <li><b>Required</b>: <code>Yes</code></li>
+          <li><b>Expression</b>: <code>${project.build.finalName}</code></li>
+          </ul>
+        </div>
+      </div>
+    
+  
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/plugins/tuscany-war-plugin/usage.html b/site/trunk/site-publish/plugins/tuscany-war-plugin/usage.html
new file mode 100644
index 0000000000..07ec1683de
--- /dev/null
+++ b/site/trunk/site-publish/plugins/tuscany-war-plugin/usage.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+<html>
+  <head>
+    <title>Apache Tuscany War Plugin - </title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+      </head>
+  <body class="composite">
+    <div id="banner">
+                    <span id="bannerLeft">
+    
+            Apache Tuscany War Plugin
+    
+            </span>
+                    <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+          
+  
+
+  
+    
+  
+  
+    
+            <div class="xleft">
+        Last Published: 02/15/2007
+                      </div>
+            <div class="xright">      
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+           
+  
+
+  
+    
+  
+  
+    
+                   <h5>Overview</h5>
+        <ul>
+              
+    <li class="none">
+              <a href="index.html">Introduction</a>
+        </li>
+              
+    <li class="none">
+              <a href="plugin-info.html">Goals</a>
+        </li>
+              
+    <li class="none">
+              <strong>Usage</strong>
+        </li>
+          </ul>
+                                       <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
+          </a>
+                       
+  
+
+  
+    
+  
+  
+    
+        </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <div class="section"><h2>Usage</h2><p>The <tt>tuscany-war-plugin</tt> is associated with the <tt>package</tt> phase of the build lifecycle and is typically included in the build definition for your project:</p><div class="source"><pre>    &lt;build&gt;
+        &lt;plugins&gt;
+            &lt;plugin&gt;
+                &lt;groupId&gt;org.apache.tuscany.sca&lt;/groupId&gt;
+                &lt;artifactId&gt;tuscany-war-plugin&lt;/artifactId&gt;
+                &lt;executions&gt;
+                    &lt;execution&gt;
+                        &lt;id&gt;tuscany-war&lt;/id&gt;
+                        &lt;goals&gt;
+                            &lt;goal&gt;tuscany-war&lt;/goal&gt;
+                        &lt;/goals&gt;
+                    &lt;/execution&gt;
+                &lt;/executions&gt;
+            &lt;/plugin&gt;
+        &lt;/plugins&gt;
+    &lt;/build&gt;</pre></div><p>The plugin adds the jars needed by the webapp integration code into WEB-INF/lib so that they are included on the web application's classpath.</p><p>It also adds the jars needed by the webapp runtime into WEB-INF/tuscany/lib. These are loaded by the integration code and do not appear on the web application's classpath.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;  
+          2007
+    
+          Apache Software Foundation
+          
+  
+
+  
+    
+  
+  
+    
+  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/site/trunk/site-publish/portuguese-portal.html b/site/trunk/site-publish/portuguese-portal.html
new file mode 100644
index 0000000000..cc843b8297
--- /dev/null
+++ b/site/trunk/site-publish/portuguese-portal.html
@@ -0,0 +1,133 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Portuguese Portal</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=97097">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Portuguese Portal">Portuguese Portal</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="PortuguesePortal-ForumsobreApacheTuscanySCA"></A>Forum sobre Apache Tuscany SCA</H2>
+
+
+<TABLE border="0" style="background-color: #fff; padding: 5px;" cellspacing="0">
+  <TR><TD>
+  <IMG src="http://groups.google.com/groups/img/3nb/groups_bar.gif" height="26" width="132" alt="Google Groups">
+  </TD></TR>
+  <TR><TD style="padding-left: 5px">
+  <B>Forum sobre Apache Tuscany SCA em Portugues</B>
+  </TD></TR>
+  <FORM action="http://groups.google.com/group/tuscany-sca-portugues/boxsubscribe">
+  <TR><TD style="padding-left: 5px;">
+  Subscription(Email): <INPUT type="text" name="email">
+  <INPUT type="submit" name="sub" value="Subscribe">
+  </TD></TR>
+</FORM>
+<TR><TD align="right">
+  <A href="http://groups.google.com/group/tuscany-sca-portugues">Forum sobre Tuscany SCA</A><BR>
+<A href="http://translate.google.com/translate?u=http:%2F%2Fgroups.google.com%2Fgroup%2Ftuscany-sca-portugues&hl=en&ie=UTF8&sl=pt-BR&tl=en">English Translation of the Tuscany SCA Portuguese Forum</A>
+</TD></TR>
+</TABLE>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/pre-packaged-or-roll-your-own.html b/site/trunk/site-publish/pre-packaged-or-roll-your-own.html
new file mode 100644
index 0000000000..b191c6f5a5
--- /dev/null
+++ b/site/trunk/site-publish/pre-packaged-or-roll-your-own.html
@@ -0,0 +1,119 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Pre-packaged or roll your own?</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45030">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="obtaining-a-tuscany-java-sca-implementation.html" title="Obtaining a Tuscany Java SCA Implementation">Obtaining a Tuscany Java SCA Implementation</A>&nbsp;&gt;&nbsp;<A href="" title="Pre-packaged or roll your own?">Pre-packaged or roll your own?</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Choosing between a package runtime and building your own<BR>
+            + Downloading and installing a release<BR>
+            + (use the the approach I'm experimenting with @ <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg13707.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-dev%40ws.apache.org/msg13707.html</A>)<BR>
+            + Setting up a build environment<BR>
+            + Choosing a source / understanding the source tree<BR>
+            + Building - which bits to build<BR>
+                  + Debugging build issues<BR>
+                  + Build tips (eg. use of mvn -fn to continue building despite test case failures)</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/privacy-policy.html b/site/trunk/site-publish/privacy-policy.html
new file mode 100644
index 0000000000..b440e8dc41
--- /dev/null
+++ b/site/trunk/site-publish/privacy-policy.html
@@ -0,0 +1,164 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Privacy Policy</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106656">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Privacy Policy">Privacy Policy</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="PrivacyPolicy-PrivacyPolicy"></A>Privacy Policy</H3>
+
+<P>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</P>
+
+<UL>
+	<LI>The IP address from which you access the website;</LI>
+	<LI>The type of browser and operating system you use to access our site;</LI>
+	<LI>The date and time you access our site;</LI>
+	<LI>The pages you visit; and</LI>
+	<LI>The addresses of pages from where you followed a link to our site.</LI>
+</UL>
+
+
+<P>Part of this information is gathered using a tracking cookie set by the <A href="http://www.google.com/analytics/" class="external-link" rel="nofollow">Google Analytics</A> service and handled by Google as described in their <A href="http://www.google.com/privacy.html" class="external-link" rel="nofollow">privacy policy</A>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</P>
+
+<P>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</P>
+
+<P>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/projects-using-tuscany.html b/site/trunk/site-publish/projects-using-tuscany.html
new file mode 100644
index 0000000000..572714718c
--- /dev/null
+++ b/site/trunk/site-publish/projects-using-tuscany.html
@@ -0,0 +1,210 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Projects Using Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47610">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Projects Using Tuscany">Projects Using Tuscany</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="ProjectsUsingTuscany-UserFeedback"></A>User Feedback </H3>
+<P>This page contains feedback from users who would like to share their experience with others about Apache Tusany when used in production environment.</P>
+<UL>
+	<LI>If you would like to share information, please post your feedback on the mailing list and include the text [Feedback] in the heading.  Your post will be added to this page.</LI>
+</UL>
+
+
+<P><B>Thank you for sharing information.</B></P>
+
+<H3><A name="ProjectsUsingTuscany-IBMSoftwareGroup"></A><A href="http://www.ibm.com/websphere/was/sca" class="external-link" rel="nofollow">IBM Software Group </A></H3>
+<P><A href="http://www.mail-archive.com/dev@tuscany.apache.org/msg05326.html" class="external-link" rel="nofollow">Feedback email thread </A></P>
+
+<P>    IBM Software Group is using the Apache Tuscany project to deliver a Java implementation of SCA 1.0 to its WebSphere Application Server customers,&quot; said Erik P. Kristiansen, WebSphere Product Manager of IBM Software Group. &quot;Delivered as an optional product extension, the IBM WebSphere Application Server v7.0 Feature Pack for Service Component Architecture v1.0  is available at <A href="http://www.ibm.com/websphere/was/sca" class="external-link" rel="nofollow">http://www.ibm.com/websphere/was/sca</A> .</P>
+
+<P>Erik P. Kristiansen, <BR>
+WebSphere Product Manager of IBM Software Group</P>
+
+<H3><A name="ProjectsUsingTuscany-PrimetonTechnologiesLtd"></A><A href="http://www.primeton.com/" class="external-link" rel="nofollow">Primeton Technologies Ltd </A></H3>
+<P><A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg02775.html" class="external-link" rel="nofollow">Feedback email thread </A><BR>
+Using tuscany to help our leading banking customers to fullfil the SOA architecture and business component specification :  </P>
+
+<P>Primeton has done a consulting service for one of China Leading Financial Service Company, to help them to fulfil the SOA architecture, Business Component Specifications and the Container Implementation. Now the Enterprise architecture, business component specifications and container implementation have been approved to be used in all the Enterprise-wide applications in the future.</P>
+
+<P>Chris Cheng<BR>
+VP of Primeton Technologies Ltd.</P>
+
+<H3><A name="ProjectsUsingTuscany-Amdocs%2COSSdivision"></A><A href="http://amdocs.com/oss" class="external-link" rel="nofollow">Amdocs, OSS division </A></H3>
+
+<P><A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg02831.html" class="external-link" rel="nofollow">Feedback email thread </A><BR>
+Amdocs is the leading supplier of customer experience systems service<BR>
+providers worldwide. Within Amdocs, the OSS Division has adopted Tuscany<BR>
+as the SCA implementation at the heart of its solution for delivery of<BR>
+SOA services for Cramer6 OSS Suite.</P>
+
+<P>The current release of the Cramer6 OSS Suite provide both out-of-the-box<BR>
+SOA services as well as tools allowing the creation of new OSS-specific<BR>
+SOA services. These services are built on top of the Tuscany runtime and<BR>
+allow Amdocs customers to integrate their existing systems with Cramer6<BR>
+OSS Suite services using whatever technology is appropriate. Thus,<BR>
+customers may access the services through any appropriate transport<BR>
+mechanism and from any &quot;native&quot; or SCA based client. They can also<BR>
+publish new services that can be accessed over a variety of different<BR>
+transport mechanisms with minimal recoding.</P>
+
+<P>&quot;SCA has helped us to widen our support for SOA by giving us a mechanism<BR>
+to create SOA Services&quot; said DAVE ETTLE, Senior Vice President, Products<BR>
+&amp; Technology &quot;We believe Tuscany provides the most appropriate SCA<BR>
+runtime implementation for our needs&quot;.</P>
+
+<P>Amdocs intends to continue to use SCA/Tuscany for its OSS applications.</P>
+
+<P>Steve Chamberlain<BR>
+Principal Architect, Platform &amp; Architecture Group</P>
+
+<H3><A name="ProjectsUsingTuscany-DeloitteInc."></A><A href="http://deloitte.com/dtt/home/0,1044,sid%25253D2000,00.html" class="external-link" rel="nofollow">Deloitte Inc. </A>, Aug. 2007</H3>
+
+<P><A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01684.html" class="external-link" rel="nofollow">Feedback email thread</A></P>
+
+<P>Currently working for a consulting firm with a major financial services Institute in Canada to implement a mix of retail and commercial banking services. We plan to go into production by the end of this quarter, we have finished the majority of implementation, conducted functional and performance testing (with very good results) and plan to do a limited deployment with a small subset of users within a couple of months. We are currently deploying Tuscany on websphere 6.1, Solaris 10, and taking advantage of a combination of Web services bindings/SDO as well as local/spring bindings.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg b/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg
new file mode 100644
index 0000000000..4c1ea05f6d
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg.jpeg b/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg.jpeg
new file mode 100644
index 0000000000..50a49ce9c9
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/calc.jpg.jpeg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/calc.ppt b/site/trunk/site-publish/quick-guide-to-sca.data/calc.ppt
new file mode 100644
index 0000000000..bac69f7a6a
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/calc.ppt
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/component.png b/site/trunk/site-publish/quick-guide-to-sca.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/component.png
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/component.png.jpeg b/site/trunk/site-publish/quick-guide-to-sca.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/component.png.jpeg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg b/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg
new file mode 100644
index 0000000000..1d5cb16ba7
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg.jpeg b/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg.jpeg
new file mode 100644
index 0000000000..3354c2d651
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/delete-calc.jpg.jpeg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg b/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg
new file mode 100644
index 0000000000..587094badc
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg.jpeg b/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg.jpeg
new file mode 100644
index 0000000000..829bd77110
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.data/domain.jpg.jpeg
diff --git a/site/trunk/site-publish/quick-guide-to-sca.html b/site/trunk/site-publish/quick-guide-to-sca.html
new file mode 100644
index 0000000000..340e75f96a
--- /dev/null
+++ b/site/trunk/site-publish/quick-guide-to-sca.html
@@ -0,0 +1,220 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Quick Guide to SCA</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53196">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Quick Guide to SCA">Quick Guide to SCA</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>A quick guide to SCA</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P>Purpose of this guide is to help you understand the high level concepts in SCA as it relates to the specification.  For more details on SCA please refer to the various specifications available at www.osoa.org.</P>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE><TD class="confluenceTd" valign="top" width="50%"></TD>
+<UL>
+	<LI><A href="#QuickGuidetoSCA-whatisSCA">What is SCA?</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scacomponent">SCA Component</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scawire">SCA Wire</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scacomposite">SCA Composite</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scacontribution">SCA Contribution</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scadomain">SCA Domain</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scabinding">SCA Binding</A></LI>
+	<LI><A href="#QuickGuidetoSCA-scapolicy">SCA Policy</A>
+<BR class="atl-forced-newline">
+&nbsp;</LI>
+</UL>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-whatisSCA"></A><FONT color="#0099cc">What is SCA?</FONT></H2>
+<P>SCA is a standard programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Now let's talk about SCA building blocks and concepts.</P>
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scacomponent"></A><FONT color="#0099cc">SCA Component </FONT></H2>
+
+<P>The basic building block for SCA is a component. It is the abstraction of a given business function. A component is described with the following attributes:</P>
+
+<UL>
+	<LI><B>Service:</B> Describes the functions that this type of component provides. A component can offer one ore more services. A service is an interface.</LI>
+	<LI><B>Reference:</B> This describes the dependencies this type of component has in order to function. A reference is an interface.</LI>
+	<LI><B>Property:</B> This defines configuration parameters that can controls how the business function can behave. For example, what currency to use for an account component.</LI>
+	<LI><B>Intent policies:</B> This describes assumptions on how the component will behave. There are two types of policies.
+	<UL>
+		<LI>Implementation policy- Impact the behavior of an implementation. For example, transaction, monitor and logging</LI>
+		<LI>Interaction policy - defines how the components behave with one another. For example, security.</LI>
+	</UL>
+	</LI>
+	<LI><B>Implementation:</B>  Every component has some implementation associated with it. This can be a new business logic or an existing one that is now being used in the assembly.  A business logic can handle different operations and some of which are exposed externally as callable services.  Component implementation can be in any technology, for example for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.</LI>
+</UL>
+
+
+<P>This is demonstrated below.<BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="quick-guide-to-sca.data/component.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The implementation of a component can be in any language that is suitable for the user, for example BPEL for business processes or XSL-T for transformations or Ruby for scripting or pure Java. How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type.  </P>
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scawire"></A><FONT color="#0099cc">SCA Wire</FONT></H2>
+
+<P>As mentioned above, an SCA component may have zero or more references. Refrences in SCA define how SCA components invoke services. The relationship between a reference and a service is typically demonstrated through a line in a SCA diagrams and is referred to as a wire. </P>
+
+<P>The term wire can at the begining seem confusing because you may ask how a wire is realized. There is no physical definition for a wire, it is really derived from the relationship between a Service and its refrence(s) at runtime. This is realized through dependency injection in Tuscany. </P>
+
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scacomposite"></A><FONT color="#0099cc">SCA Composite</FONT></H2>
+
+<P>An SCA composite consists of components, services, references, and wires that connect them. A composite is the unit of deployment for SCA.<BR>
+A composite can be viewed as a component whose implementation is not code but an aggregation of one or more components co-operating to provide higher level services. Think of composite as a solution, for example a credit check composite may consist of multiple components that together perform the credit checking work. A composite can also be used within a larger solution, for example credit check can be part of a order processing composite. A composite has the same charactersitics as a component. It provides Services, has References to other dependencies, and can be configured using Properties and can have intent policies in just the same way as an individual components can. In thise case, attributes of some of the components that are embedded in the composite get 'promoted' and becom the attribute of the composite. In the example below, you see a calculator composite which consists of 5 components, a calculator service has references to four components:Add, Subtract, Multiply and Divide.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="quick-guide-to-sca.data/calc.jpg" style="border: 0px solid black"></SPAN><BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The assembly or wiring is defined in .composite file through Service Component Definition Language (SCDL) that is in XML. For example, calculator.composite would define that calculator component references the other four components.</P>
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scacontribution"></A><FONT color="#0099cc">SCA Contribution</FONT></H2>
+
+<P>The artifacts that make up a solution get packaged into what is called a contribution. A contribution can take a number of different forms.  For example, it could be a jar file, or it could be a directory tree on the file system. A contribution can contain composites, java classes, BPEL processes, XSD files, wsdl files, etc. An SCA application can be divided into multiple contributions with dependencies between them. In general, some services depend closely on other services and it makes sense to package them together.  If services are more independent it is best to package them separately so that they can be reused in different contexts. A contribution is a deployable unit. A solution may require multiple contributions that share artifacts and artifacts can be shared between (imported) between contributions.</P>
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scadomain"></A><FONT color="#0099cc">SCA Domain</FONT></H2>
+
+<P>Contribution packages get contributed to what is called SCA domain which is the scope of adminstration at runtime. An SCA Domain represents a complete runtime configuration, potentially distributed over a series of interconnected runtime nodes and is a logical view of the running applications or a coherent grouping of components that are working together. An SCA Domain typically represents an area of business functionality controlled by a single organization. For example, an SCA Domain may be the whole of a business, or it may be a department within a business.</P>
+
+<P>Therefore, an SCA domain consists of the definitions of composites, components, their implementations, <B>and the nodes</B> on which they run. Components deployed into a domain can directly wire to other components within the same domain. Communication with services outside of a domain is done through bindings. </P>
+
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services. However, during development one is not concerned with all this. The code is packaged and made available for deployment. Tuscany SCA Java supports contributions in the form of JAR or filesystem. </P>
+
+<P>Below is an example of domain with two contributions.<BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="quick-guide-to-sca.data/domain.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scabinding"></A><FONT color="#0099cc">SCA Binding</FONT></H2>
+<P>A binding is used as a means of communication between services and handles the protocols. It defines with what communication method a service can be accessed with or with what communication method it can will access other services.  There can be different types of bindings depending on technologies used to develop a solution. For example JMS binding, Webservices binding, Atom binding for web20 interaction, etc. </P>
+
+<P>Services can be configured with different bindings and there can be multiple bindings for a service.  Bindings for the services and references get defined declaratively in the .composite file. There is a default binding called binding.sca which when used leaves the choice of binding to the underlying infrastructure by default.</P>
+
+<P>The declarative bindings and the abstraction of protocols from business logic brings agility to SCA applications. This allows SCA applications to be purely focused on business logic and not be contaminated with protocol handling information. It also enables the SCA compositions to grow or change without code modification while also working with applications that are not enabled with SCA.</P>
+
+
+<H2><A name="QuickGuidetoSCA-"></A><A name="QuickGuidetoSCA-scapolciy"></A><FONT color="#0099cc">SCA Policy </FONT></H2>
+<P>An enterprise application requires control beyond the business functional capability which can include how security is handled in the enterprise or what transactional capability should be applied to services that are offered. SCA policies define the constraints or capabilities that get applied to services and their interaction. Two types of policies are defined in SCA.</P>
+<UL>
+	<LI>Interaction Policies - Define the policies that influence interaction of services for example whether authentication is required or not.</LI>
+	<LI>Implementation Policies - Define how the components behave at runtime for example whether it is transactional or not.</LI>
+</UL>
+
+
+<P>SCA mechanisms for defining policies such as intents and policySets can only be used in the context of a single domain. The fact that policies can be defined declaratively make applications adaptive to the environment that they get deployed into or to changes in the business requirements. <BR>
+For more information about policy check out the <A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf" class="external-link" rel="nofollow">sca policy framework specification</A>version=1]</P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg b/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg
new file mode 100644
index 0000000000..8ae45037f9
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg
diff --git a/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg.jpeg b/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg.jpeg
new file mode 100644
index 0000000000..74d0972fa5
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-architecture-guide.data/ClassDiag.jpg.jpeg
diff --git a/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif b/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif
new file mode 100644
index 0000000000..7c96e84552
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif
diff --git a/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif.jpeg b/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif.jpeg
new file mode 100644
index 0000000000..abb57b0ada
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-architecture-guide.data/rdbDAS.gif.jpeg
diff --git a/site/trunk/site-publish/rdb-das-architecture-guide.html b/site/trunk/site-publish/rdb-das-architecture-guide.html
new file mode 100644
index 0000000000..cbe579affa
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-architecture-guide.html
@@ -0,0 +1,704 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS architecture guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56921">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="das-rdb-menu.html" title="DAS RDB Menu">DAS RDB Menu</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS architecture guide">RDB DAS architecture guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ffffff;border-color: #ECF4D1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #ECF4D1;background-color: #ECF4D1;"><B>Apache Tuscany RDB DAS Java Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<UL>
+	<LI><A href="#RDBDASarchitectureguide-Overview">Overview</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-FunctionDescription">Function Description</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-Architecture">Architecture</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-UserInterface">User Interface</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-ClassDiagram">Class Diagram</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-DesignDetails">Design Details</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema(config.xsd)</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-ScalabilityAspects">Scalability Aspects</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-Future">Future</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-Samples">Samples</A></LI>
+	<LI><A href="#RDBDASarchitectureguide-TerminologyandUsefulLinks">Terminology and Useful Links</A></LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="RDBDASarchitectureguide-Overview"></A><A name="RDBDASarchitectureguide-Overview"></A>Overview</H3>
+
+<P>Service Data Object (SDO) and Service Component Architecture (SCA) are the basic building blocks in Service Oriented Architecture (SOA). SDO is the way of representing data in SCA. As the applications using SOA have back-end data representation in different formats like Database, File System, XML Based Data, etc., there is a need to provide a mapping between these data representations and SDO. Java RDB DAS (Data Access Service for Relational Database) is the effort to suffice this mapping requirement for Relational Database. There is a C+&#43; implementation coming up too.</P>
+
+<H3><A name="RDBDASarchitectureguide-FunctionDescription"></A><A name="RDBDASarchitectureguide-FunctionDescription"></A> Function Description</H3>
+
+<P>RDB DAS provides 2 major capabilities:&#45;<BR>
+1) Execute SQL Queries and return result as a graph of Data Objects.<BR>
+2) Reflect changes made to a graph of Data Objects back to the database.<BR>
+It also supports explicit CUD SQL statements execution against database.<BR>
+<SPAN class="image-wrap" style=""><IMG src="rdb-das-architecture-guide.data/rdbDAS.gif" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="RDBDASarchitectureguide-Architecture"></A><A name="RDBDASarchitectureguide-Architecture"></A> Architecture</H3>
+
+<P>This section describes the overall architecture of Java RDB DAS. The details are elaborated in <A href="#RDBDASarchitectureguide-DesignDetails">Design Details</A>. Also, for details of different DAS Configuration settings, refer to <A href="#RDBDASarchitectureguide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema(config.xsd)</A>.</P>
+
+<P>DAS functions based on external Configuration. This configuration can be specified using file or can be programmatically build by the caller, using <B>ConfigHelper</B> interface.</P>
+
+<P>Design follows a factory pattern to create DAS instance. DAS instance contains <B>Connection</B>, <B>Config</B> and <B>Commands</B>.</P>
+
+<P>The <B>Connection</B> can either be passed from caller or can be created using the Configuration information. It is used for all the database operations done in that DAS instance and also for controlling transactions. Configuration parameter <B>managedtx</B> decides whether the transaction will be controlled by DAS or by caller.</P>
+
+<P><B>Commands</B> hold all the commands from Configuration file and also the ones that are created programmatically on the fly. The Command is implemented using different inherited classes like <B>Read/Insert/Update/Delete/StoredProcedure/OptimisticWrite</B> with root parent class <B>CommandImpl</B>. More details on different classes will be in <A href="#RDBDASarchitectureguide-DesignDetails">Design Details</A>.</P>
+
+<P><B>Config</B> holds the reference for Configuration associated with the DAS instance and contains all details as mentioned in <A href="#RDBDASarchitectureguide-ConfigurationSchema%2528config.xsd%2529">Configuration Schema (config.xsd)</A>.</P>
+
+<P>Caller has 2 (and some other) main APIs available in DAS instance to use the Commands <B>getCommand(name)</B> and <B>applyChanges(Data Object)</B></P>
+<OL>
+	<LI><B>getCommand(name)</B> is typically used to retrieve the Command (SQL String) available from Config. SQL String, Connection and Parameters required for the SQL are contained in the Command instance. User also needs to call setParameter() on Command as required by the underlying SQL. User finally calls execute() /executeQuery() on this Command and based on whether it is CUD/Read operation. executeQuery() returns DataObject.</LI>
+	<LI><B>applyChanges(Data Object)</B> is the way to process a SDO DataObject and SDO ChangeSummary to create SQL UPDATE statement to be executed against database. More details on SDO integration are in <A href="#RDBDASarchitectureguide-DesignDetails">Design Details</A>.</LI>
+</OL>
+
+
+<H3><A name="RDBDASarchitectureguide-UserInterface"></A><A name="RDBDASarchitectureguide-UserInterface"></A> User Interface</H3>
+
+<P>DAS exposes a set of interfaces to end user. Javadoc is available for all public APIs in binary distribution from <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Downloads" class="external-link" rel="nofollow">Downloads</A>.</P>
+<UL>
+	<LI><B>DASFactory</B> Different options to produce DAS instance using Factory pattern.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> DAS </TD>
+<TD class="confluenceTd"> createDAS(java.sql.Connection connection) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provided connection </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DAS </TD>
+<TD class="confluenceTd"> createDAS(java.io.InputStream configStream) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provided config file stream </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DAS </TD>
+<TD class="confluenceTd"> createDAS(java.io.InputStream configStream, java.sql.Connection connection) </TD>
+<TD class="confluenceTd"> Creates a DAS based on the provide config file stream and connection </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>DAS Interface</B> to call APIs for DAS instance.<BR>
+<B>Field Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> static DASFactory </TD>
+<TD class="confluenceTd"> FACTORY </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> applyChanges(DataObject root) </TD>
+<TD class="confluenceTd"> The change history is scanned and modifications to the graph of data objects are flushed to the database. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> createCommand(java.lang.String sql) </TD>
+<TD class="confluenceTd"> Creates a Command based on the provided SQL statement </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> getCommand(java.lang.String name) </TD>
+<TD class="confluenceTd"> Gets the named command from this factory's inventory </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> releaseResources() </TD>
+<TD class="confluenceTd"> If the CommandGroup is managing connections then this method must be called when the client is done with the instance. </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Command</B> Used to execute read / write (CRUD) on database.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> execute() </TD>
+<TD class="confluenceTd"> Performs the function defined by the command </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> executeQuery() </TD>
+<TD class="confluenceTd"> Performs the function defined by the command and return the results in the root DataObject </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> int </TD>
+<TD class="confluenceTd"> getGeneratedKey() </TD>
+<TD class="confluenceTd"> Returns the value of the database-generated key. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java.lang.Object </TD>
+<TD class="confluenceTd"> getParameter(int index) </TD>
+<TD class="confluenceTd"> Returns the value of the associated Parameter </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> setParameter(int index, java.lang.Object value) </TD>
+<TD class="confluenceTd"> Sets the value of the associated Parameter </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>ConfigHelper</B> It is used as an aid in programmatic construction of Config instances. This is an<BR>
+alternative to providing needed configuration information in an XML file.<BR>
+<B>Constructor Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> ConfigHelper() </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> ConfigHelper(Config config) </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> Column </TD>
+<TD class="confluenceTd"> addColumn(Table table, java.lang.String columnName, java.lang.String propertyName) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addConnectionInfo(java.lang.String dataSourceName) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addConnectionInfo(java.lang.String dataSourceName, boolean managedtx) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addConnectionInfo(java.lang.String driverClass, java.lang.String databaseURL, java.lang.String user, java.lang.String password, int loginTimeout) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addCreateStatement(Table table, java.lang.String statement, java.lang.String parameters) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addDeleteCommand(java.lang.String name, java.lang.String sql) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addDeleteStatement(Table table, java.lang.String statement, java.lang.String parameters) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addInsertCommand(java.lang.String name, java.lang.String sql) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addPrimaryKey(java.lang.String columnName) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Relationship </TD>
+<TD class="confluenceTd"> addRelationship(java.lang.String parentName, java.lang.String childName) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Relationship </TD>
+<TD class="confluenceTd"> addRelationship(java.util.Vector parentNames, java.util.Vector childNames) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addSelectCommand(java.lang.String name, java.lang.String sql) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Table </TD>
+<TD class="confluenceTd"> addTable(java.lang.String name, java.lang.String typeName) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Command </TD>
+<TD class="confluenceTd"> addUpdateCommand(java.lang.String name, java.lang.String sql) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addUpdateStatement(Table table, java.lang.String statement, java.lang.String parameters) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Config </TD>
+<TD class="confluenceTd"> getConfig() </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> setDataObjectModel(java.lang.String dataObjectModel) </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Converter</B> A lightweight Table-column &lt;--&gt; DataObject-property converter framework. Converters allow a user to insert a transformation between a column's value and its destination DataObject property's value. For example, by default, a VARCHAR column will be represented as a String in its corresponding DataObject property. A user could insert a converter that transforms the VARCHAR value to an Integer. If this is done then although the column returns character data, the DataObject property will be an Integer<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> java.lang.Object </TD>
+<TD class="confluenceTd"> getColumnValue(java.lang.Object propertyData) </TD>
+<TD class="confluenceTd"> Transform the columnData object to a new value and possibly new type </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java.lang.Object </TD>
+<TD class="confluenceTd"> getPropertyValue(java.lang.Object columnData) </TD>
+<TD class="confluenceTd"> Transform the columnData object to a new value and possibly new type. </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Pager</B> An iterator-like interface to conveniently move through chunks of data. The idea is that a Pager works with a read Command. The read command returns a large amount of data and the client wants to work with chunks of it at a time. So the Pager is created on the command and each call to next returns the next chunk of data.<BR>
+<B>Method Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> getPage(int page) </TD>
+<TD class="confluenceTd"> Return a specific identified page </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> next() </TD>
+<TD class="confluenceTd"> Get the next page of data </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> previous() </TD>
+<TD class="confluenceTd"> Get the page prior to the last page returned </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<UL>
+	<LI><B>GraphMerger</B> is utility class implementation (no interface), to provide functions for flexibly managing DataObjects.<BR>
+<B>Constructor Summary</B>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> GraphMerger() </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><B>Method Summary</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> void </TD>
+<TD class="confluenceTd"> addPrimaryKey(java.lang.String key) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> emptyGraph(Config config) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> merge(DataObject primary, DataObject secondary) </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> DataObject </TD>
+<TD class="confluenceTd"> merge(java.util.List graphs) </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</LI>
+</UL>
+
+
+<H3><A name="RDBDASarchitectureguide-ClassDiagram"></A><A name="RDBDASarchitectureguide-ClassDiagram"></A> Class Diagram</H3>
+
+<P><A href="rdb-das-class-diagram.html" title="RDB DAS class diagram">Class Diagram</A></P>
+
+<H3><A name="RDBDASarchitectureguide-DesignDetails"></A><A name="RDBDASarchitectureguide-DesignDetails"></A>Design Details</H3>
+
+<P>Major classes are described here at high level to show how these fit in the complete picture. For <BR>
+methods/members details please refer to javadoc from binary distribution at <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Downloads" class="external-link" rel="nofollow">Downloads</A>.</P>
+
+<P><B>DASFactoryImpl</B> Expose methods to create DAS instance from Config or Connection or both.</P>
+
+<P><B>DASImpl</B> The sole instance of DAS existing for one DAS runtime. It contains MappingWrapper, JDBC Connection and a Map of all DAS Commands. To create appropriate instances of CommandImpl, DASImpl, scan's each Config Command for attribute kind, and based on that required instance of CommandImpl is added to the map. Connection from DataSource or Database Driver Manager both are supported. releaseResources() method allows external caller to close JDBC Connection when it is supplied by the caller.Provides methods to get/create DAS Commands and applyChanges(changed DataObject) to reflect DataObject changes to Database.</P>
+
+<P><B>MappingWrapper</B> Wrapper over DAS Config. Provides various get/set methods for all different elements in DAS Config.</P>
+
+<P><B>ConnectionImpl</B> Contains JDBC Connection, and whether it is managed by DAS/caller and also whether Database platform support auto-generated key column values.</P>
+
+<P><B>BaseCommandImpl</B> Parent class for all other CommandImpl classes. Contains MappingWrapper. setConnection() method to associate ConnectionImpl with each DAS Command.</P>
+
+<P><B>ApplyChangesCommandImpl</B> Extends BaseCommandImpl. Contains ChangeSummarizer. It is used to load DataObject's ChangeSummary and for each change, Generator classes (UpdateGenerator, DeleteGenerator) are called to form appropriate SQL Statement with parameters, which is executed against the Database.</P>
+
+<P><B>CommandImpl</B> Extends BaseCommandImpl and implements DAS Config's &lt;Command&gt;. So, in effect it is parent class for all explicit CRUD Commands. It contains Statement, Parameters and ResultSetShape.</P>
+
+<P><B>WriteCommandImpl</B> Extends CommandImpl. Parent for CUD. If SELECT(Read) is attempted, exception is thrown.</P>
+
+<P><B>DeleteCommandImpl</B> Extends WriteCommandImpl.</P>
+
+<P><B>InsertCommandImpl</B> Extends WriteCommandImpl. Supports Database generated keys.</P>
+
+<P><B>UpdateCommandImpl</B> Extends WriteCommandImpl.</P>
+
+<P><B>OptimisticWriteCommandImpl</B> Extends UpdateCommandImpl. Supports OCC feature. Here by design when a CollisionParameter's value is attempted to change more than once, the CollisionParameter does not allow its value change (as during first setValue(), flag indicating that value is changed is set). So, the attempt results in no database rows getting changes. On this condition exception is thrown as Update Collision is occurred.</P>
+
+<P><B>ReadCommandImpl</B> Extends CommandImpl. Used for explicit SELECT. Support's DAS feature, ResultDescriptor. If CUD is attempted, exception is thrown. Supports paging. When Query is executed (executeQuery()), the JDBC ResultSet is converted into DataObject Graph and returned to caller.</P>
+
+<P><B>SPCommandImpl</B> Extends ReadCommandImpl for StoredProcedure call. Method executeQuery() is used when the stored procedure returns ResultSet and method execute() is used when the stored procedure does not have any return ResultSet.<BR>
+Parameters hold both IN and OUT parameters.</P>
+
+<P><B>PagerImpl</B> Holds ReadCommandImpl, page size and current page index. Implements next(), previous(), getPage(index) methods. In each based on current page index and page size, the ReadCommandImpl is executed with start and end boundaries set.</P>
+
+<P><B>ChangeFactory</B> This class is used during DAS.applyChanges(). With changed DataObject and ChangeSummary, required type of ChangeOperation instance is created (like DeleteOperation, UpdateOperation). This instance of ChangeOperation holds appropriate CommandImpl, which in itself holds the Parameters. Thus for a given DAS Config and Connection, ChangeFactory is used to propagate DataObject changes to Database via CommandImpl.</P>
+
+<P><B>ChangeSummarizer</B> Main function of this class is load Changes based on root DataObject of applyChanges() Command MappingWrapper is used to sort the ChangeOperations in Changes.</P>
+
+<P><B>Changes</B> Contains DeleteList, InsertList, Update List pertaining to one applyChanges() command.</P>
+
+<P><B>DeleteList</B> Maintains ordered/unordered list of DeleteOperations. If DAS Config defines any Relationships, MappingWrapper aids in forming Delete Order for all the Tables undergoing DeleteOperation, based on Parent-Child relationships. If Delete Order is available, DeleteList forms a List following appropriate Referential Integrity. Otherwise no order is maintained.</P>
+
+<P><B>InsertList</B> Maintains ordered/unordered list of CreateOperations. If DAS Config defines any Relationships, MappingWrapper aids in forming Insert Order for all the Tables undergoing InsertOperation, based on Parent-Child relationships. If Insert Order is available, InsertList forms a List following appropriate Referential Integrity. Otherwise no order is maintained.</P>
+
+<P><B>UpdateList</B> As UpdateOperation happens on single Table, there is no reason for sorting based on any Referntial Relationships. So, this class is just a wrapper on ArrayList.</P>
+
+<P><B>BaseGenerator</B> Parent class for Delete/Update/InsertGenerator. If in DAS Config, any Table Column specifies a ColumnConverter class, BaseGenerator, returns a new instance of this class.</P>
+
+<P><B>DeleteGenerator</B> Extends BaseGenerator. Based on Table and DAS Config, DELETE statement is generated with Primary Keys in WHERE clause. Using this, DeleteCommandImpl is instantiated. For Parameters in DeleteCommandImpl ColumnConverter is considered if present.</P>
+
+<P><B>InsertGenerator</B> Same as DeleteGenerator. Here Database Key value generation is also considered.</P>
+
+<P><B>UpdateGenerator</B> Extends BaseGenerator. In UPDATE statement WHERE clause Primary Keys are considered as well as Default OCC policy is considered. Also check is implemented for any violation for Foreign Key relationships. Parameters in UpdateCommandImpl consider ColumnConvert as appropriate. OCC attributes in DAS Config for &lt;Column&gt;, viz. managed and collision are considered in SET and WHERE clause formation respectively.</P>
+
+<P><B>ChangeOperation</B> Abstract parent class for Create/Delete/UpdateOperation. It contains WriteCommand, DatabaseObject and any generated ID.</P>
+
+<P><B>DeleteOperation</B> Extends ChangeOperation. Uses SDO's ChangeSummary based OldValues as in the DataGraph , deleted objects have lost their <B>settings</B>.</P>
+
+<P><B>CreateOperation</B> Extends ChangeOperation, makes use of Generated ID.</P>
+
+<P><B>UpdateOperation</B> Extends ChangeOperation and makes use of generated ID.</P>
+
+<P><B>DatabaseObject</B> Wraps DataObject. If a field is FK, it will return value from parent. It also sets the Database generated value in primary key property of DataObject.</P>
+
+<P><B>RowObjects</B> Holds a Map of TableName-&gt;DataObject. It uses relationship information to associate these DataObjects to form DataGraph .</P>
+
+<P><B>GraphBuilderMetadata</B> Class that form Metadata for forming DataObjects based on MetaData available in JDBC ResultSet. It uses DAS Config, ResultSet and ResultSetShape to form a Collection of ResultMetaData. It is used in ResultSetProcessor and thus further in RowObjects.</P>
+
+<P><B>ResultSetProcessor</B> This class is used to transform data in ResultSet into set of inter-related DataObjects. It contains TableRegistry, GraphBuilderMetadata and DataObjectMaker. Using GrapbBuilderMetadata and the JDBC ResultSet, it forms<BR>
+ResultSetRow , then form RowObjects and connects related DataObjects using Relationship information from RowObjects to form the completed DataGraph.</P>
+
+<P><B>DataObjectMaker</B> Forms DataObject based on TableData. It is used in ResultSetProcessor for this.</P>
+
+<P><B>TableRegistry</B> Base Interface for Single/MultiTableRegistry.</P>
+
+<P><B>SingleTableRegistry</B> No functionality.</P>
+
+<P><B>MultiTableRegistry</B> Implements TableRegistry. Used when converting JDBC ResultSet of SQL SELECT into DataObjects.</P>
+
+<P><B>DefaultConverter</B> Implements Converter. In case of Blob database column type, returns byte[] for the column value when mapping from database data to property value.</P>
+
+<P><B>ResultMetaData</B> Holds complete ResultSet related metadata of the Query result&#45; ResultSet, ColumnConverters, MappingWrapper, SDO Type Names, SDO Property Names, ResultSetShape for the ResultSet, Map containing Table Type <DEL>&gt; Column Property (equivalent to Database Table</DEL>&gt;Column). It provides various get methods on these members.</P>
+
+<P><B>ResultSetRow</B> A ResultSetRow is used to transform a single row of ResultSet into a set of DataObjects. It uses TableData as a intermediate place to keep Database Data for a Row , which is later used to form DataObject. It holds a List of all Table Data for the current row. This class is used in ResultSetProcessor.</P>
+
+<P><B>TableData</B> Holds single JDBC row for a Table and its Columns - tableName, list of PKs, Map of ColumnName-&gt;Data, if table has PK. Is used by DataObjectMaker to form DataObject based on Table Row.</P>
+
+<P><B>ResultSetTypeMap</B> Provides mapping from sql.Types to SDO Type. Used in ResultSetShape to populate SDO Type[] for all columns present in ResultSet.</P>
+
+<P><B>FactoryRegistry</B> Maintains registry of ChangeFactory. There is one FactoryRegistry for on DAS Config and Connection. It maintains a Map with entries of each SDO Type against ChangeFactory for current DAS Config+Connection.</P>
+
+<P><B>ParameterImpl</B> Holds values required for representing SQL statement/StoredProcedure parameter like name, index, value, SDO Type and columnConverter. Can have direction IN/OUT/IN-OUT. IN is default. OUT/IN-OUT is only in case of Stored Procedure.</P>
+
+<P><B>ManagedParameterImpl</B> Extends ParameterImpl. Expected to be integer or BigDecimal type, else exception is thrown. setValue() returns oldValue+1.</P>
+
+<P><B>CollisionParameter</B> Extends ParameterImpl. Design restricts setting value in CollisionParameter only once.</P>
+
+<P><B>Parameters</B> Maintains lists of parameters (used in SQL statements), IN/OUT parameters (used in stored procedures).</P>
+
+<P><B>ResultSetShape</B> This is an alternative to use ResultSetMetaData of the Query result. It can be used when some platforms like Oracle do not fully support MetaData. For a given SQL Query, this holds schemaName, tableName, columnName, SDO Column Type for each column in ResultSet. It has 2 constructors, one uses JDBC's ResultSetMetaData to form ResultSetShape and another uses DAS Config supplied ResultDescriptor to form ResultSetShape.</P>
+
+<P><B>Statement</B> Holds SQL String, JDBC connection, JDBC PreparedStatement and also state information whether the current statement is used by Pager.</P>
+
+<P><B>SDODataTypeHelper</B> Provides mapping between SDO's Type and JDBC's sql.Types.</P>
+
+<P><B>SDODataTypes</B> Uses SDO's TypeHelper to get SDO Type for given string.</P>
+
+<P><B>QualifiedColumn</B> Maintains schemaName, tableName and columnName for a Table's Column.</P>
+
+<P><B>RelationshipWrapper</B> Wrapper for DAS Config's &lt;Relationship&gt;. Only one method to return Collection of all FKColumns in a Relationship.</P>
+
+<P><B>TableWrapper</B> Wrapper on DAS Config's &lt;Table&gt;. Provides various get methods to get values of different elements and attributes within &lt;Table&gt;.</P>
+
+<P><B>ConfigUtil</B> Uses SDO's XMLHelper to load DAS Config Data Model in memory.</P>
+
+<P><B>DataObjectUtil</B> Provides utility methods for SDO DataObject like copying one DataObject into another, restoring Old Values of a DataObject using its SDO's ChangeSummary.</P>
+
+<H3><A name="RDBDASarchitectureguide-ConfigurationSchema%28config.xsd%29"></A><A name="RDBDASarchitectureguide-ConfigurationSchema%28config.xsd%29"></A> Configuration Schema(config.xsd)</H3>
+
+<P>Complete DAS Configuration follows.<BR>
+Convention <INS>Element</INS> &lt;attribute&gt; <EM>Child Element</EM></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <INS>Config</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;uri&gt; Not used <BR class="atl-forced-newline">
+&lt;dataObjectModel&gt; Needs a valid value when creating static DataObjects. <BR class="atl-forced-newline">
+&lt;databaseSchemaNameSupported&gt; when true, multiple database schema under same database are supported <BR class="atl-forced-newline">
+<EM>Command</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Table</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Relationship</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>ConnectionInfo</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>ConnectionInfo</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;dataSource&gt;complete URL of data source <BR class="atl-forced-newline">
+&lt;managedtx&gt;if true, DAS manages database transaction <BR class="atl-forced-newline">
+<EM>ConnectionProperties</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>ConnectionProperties</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;driverClass&gt;complete qualified class name <BR class="atl-forced-newline">
+&lt;databaseURL&gt;database URL <BR class="atl-forced-newline">
+&lt;username&gt; authentic database user <BR class="atl-forced-newline">
+&lt;password&gt; password for the user <BR class="atl-forced-newline">
+&lt;loginTimeout&gt;in milliseconds <BR class="atl-forced-newline">
+<INS>Command</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;name&gt; <BR class="atl-forced-newline">
+&lt;SQL kind&gt;Select/Update/Delete/Insert/procedure <BR class="atl-forced-newline">
+<EM>Parameter</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>ResultDescriptor</EM>&#45;0..n <BR class="atl-forced-newline">
+<INS>Parameter</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name (no meaning when Command kind is procedure) <BR class="atl-forced-newline">
+&lt;direction&gt;IN/OUT (OUT makes sense when Command kind is &quot;procedure&quot;) <BR class="atl-forced-newline">
+&lt;index&gt;used in set/getParameter() on Command based on direction (used when Command kind is procedure). <BR class="atl-forced-newline">
+<INS>ResultDescriptor</INS>&#45;&gt; Used as alternative to database result set metadata. <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name <BR class="atl-forced-newline">
+&lt;tableName&gt; database table name <BR class="atl-forced-newline">
+&lt;schemaName&gt; used when databaseSchemaNameSupported=true <BR class="atl-forced-newline">
+&lt;columnType&gt;SDO mapped data type <BR class="atl-forced-newline">
+<INS>Relationship</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;name&gt; <BR class="atl-forced-newline">
+&lt;primaryKeyTable&gt; <BR class="atl-forced-newline">
+&lt;foreignKeyTable&gt; <BR class="atl-forced-newline">
+&lt;many&gt; =true allows for 1:n relationship. If it is false, it's 1:1 relationship. <BR class="atl-forced-newline">
+&lt;keyRestricted&gt; In case of 1:1 relationship, if keyRestricted is not specified, the <BR class="atl-forced-newline">
+link (relationship) between the parent and child rows can be broken, by setting the <BR class="atl-forced-newline">
+parentKeyTable's row to null/deleting the row. Also, a different parent row can <BR class="atl-forced-newline">
+be associated to the child row, which has one pre-existing parent row association. <BR class="atl-forced-newline">
+If keyRestricted=true, this kind on change in existing relationship is not allowed, <BR class="atl-forced-newline">
+user will get exception 'Can not modify a one to one relationship that is key <BR class="atl-forced-newline">
+restricted'. <BR class="atl-forced-newline">
+<EM>KeyPair</EM>&#45;0..n <BR class="atl-forced-newline">
+<INS>KeyPair</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;PrimaryKeyColumn&gt;database table column name <BR class="atl-forced-newline">
+&lt;ForeignKeyColumn&gt;database table column name <BR class="atl-forced-newline">
+<INS>Table</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;tableName&gt;Database table name <BR class="atl-forced-newline">
+&lt;typeName&gt;Data Object type name <BR class="atl-forced-newline">
+&lt;schemaName&gt; used when databaseSchemaNameSupported=true <BR class="atl-forced-newline">
+<EM>Column</EM>&#45;0..n <BR class="atl-forced-newline">
+<EM>Create</EM>&#45;0..1 <BR class="atl-forced-newline">
+<EM>Update</EM>&#45;0..1 <BR class="atl-forced-newline">
+<EM>Delete</EM>&#45;0..1 <BR class="atl-forced-newline">
+<INS>Create</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; INSERT statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt;space separated column names used in explicit INSERT <BR class="atl-forced-newline">
+<INS>Update</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; UPDATE statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt; space separated column names used in explicit UPDATE <BR class="atl-forced-newline">
+<INS>Delete</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;sql&gt; DELETE statement in PreparedStement format <BR class="atl-forced-newline">
+&lt;parameters&gt; space separated column names used in explicit DELETE <BR class="atl-forced-newline">
+<INS>Column</INS>&#45;&gt; <BR class="atl-forced-newline">
+&lt;columnName&gt; database table column name <BR class="atl-forced-newline">
+&lt;propertyName&gt; SDO data object's property name <BR class="atl-forced-newline">
+&lt;converterClassName&gt; if converter is used, this needs a valid class name <BR class="atl-forced-newline">
+&lt;primaryKey&gt;true if column is PK <BR class="atl-forced-newline">
+&lt;generated&gt; true if column value is database generated <BR class="atl-forced-newline">
+&lt;collision&gt; when true, during UPDATE statement generation, that column is <BR class="atl-forced-newline">
+included in the WHERE clause.(OCC feature) <BR class="atl-forced-newline">
+&lt;managed&gt; when true, during UPDATE statement generation, that column (needs <BR class="atl-forced-newline">
+to be BigDecimal) value is incremented by 1 and used in the SET clause in <BR class="atl-forced-newline">
+UPDATE. <BR class="atl-forced-newline">
+managed=true, is effective only when collision=true, else managed attribute value <BR class="atl-forced-newline">
+is ignored. </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="RDBDASarchitectureguide-ScalabilityAspects"></A><A name="RDBDASarchitectureguide-ScalabilityAspects"></A> Scalability Aspects</H3>
+
+<P>Java RDB DAS has exposed <A href="#RDBDASarchitectureguide-UserInterface">User Interface</A>for end user. Other than that, from design perspective, many major DAS classes do not have associated interfaces and by design are tightly coupled with SDO and Database. It needs further enhancement on this line, especially when more DAS flavors are coming up as mentioned in <A href="#RDBDASarchitectureguide-Future">Future</A>. As DAS is a bridge between SOA based applications and backend Data Sources, the interfaces with SOA and Data Source need to be flexible. E.g. SDO/Some Other mechanism should be pluggable when using DAS as well as different technologies based Data Sources can be supported like XML files, LDAP based file system and so forth. Work is in-progress on this front.</P>
+
+<H3><A name="RDBDASarchitectureguide-Future"></A><A name="RDBDASarchitectureguide-Future"></A> Future</H3>
+
+<P>DAS is implemented in Java and C+&#43; and both are integrated with SDO and support Relational Database based Data Source. There are other flavors of DAS coming up like LDAP DAS, XQuery DAS etc. These implementations will provide different ways to interface with the backend data source as their names suggest.</P>
+
+<H3><A name="RDBDASarchitectureguide-Samples"></A><A name="RDBDASarchitectureguide-Samples"></A> Samples</H3>
+
+<P>There are a couple of samples distributed to demonstrate working examples of using different DAS features. See User Guide/Samples for more details.</P>
+
+<H3><A name="RDBDASarchitectureguide-TerminologyandUsefulLinks"></A><A name="RDBDASarchitectureguide-TerminologyandUsefulLinks"></A> Terminology and Useful Links</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> User Guide </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/RDB%20DAS%20-%20User%20Guide" class="external-link" rel="nofollow">Readme</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> Getting Started </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Starting%20with%20DAS" class="external-link" rel="nofollow">Readme</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3 </TD>
+<TD class="confluenceTd"> All Useful Links </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Java" class="external-link" rel="nofollow">Links</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg b/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg
new file mode 100644
index 0000000000..9aefc7f42d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg
diff --git a/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg.jpeg b/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg.jpeg
new file mode 100644
index 0000000000..9a1189ebfb
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-architecture.data/DAS_lite_diagram.jpg.jpeg
diff --git a/site/trunk/site-publish/rdb-das-c-architecture.html b/site/trunk/site-publish/rdb-das-c-architecture.html
new file mode 100644
index 0000000000..76634fb4d5
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-architecture.html
@@ -0,0 +1,103 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ Architecture : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51204">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-c-architecture-guide.html" title="DAS C++ Architecture Guide">DAS C++ Architecture Guide</A>&nbsp;&gt;&nbsp;<A href="das-lite-c.html" title="DAS Lite C++">DAS Lite C++</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ Architecture">RDB DAS C++ Architecture</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20-%20FAQ&linkCreation=true&fromPageId=55080" title="Create Page: RDB DAS - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das-java.html" title="What's New in DAS JAVA">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="rdb-das-c-user-guide.html" title="RDB DAS C++ User Guide">User Guide</A><BR>
+<A href="" title="RDB DAS C++ Architecture">Architecture Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20Project&linkCreation=true&fromPageId=55080" title="Create Page: DAS C++ Project" class="createlink">Get Involved<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="RDBDASC%2B%2BArchitecture-ClassDiagram"></A>Class Diagram</H1>
+
+<P>&nbsp;&nbsp;&nbsp; This class diagram represents the structure of DAS Lite C+. These classes were extracted from DAS Java and should be implemented in C+. The Connection class should be replaced for HDBC structure, from ODBC framework.<BR>
+!DAS_lite_diagram.</P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-changesummaryprocessing.html b/site/trunk/site-publish/rdb-das-c-changesummaryprocessing.html
new file mode 100644
index 0000000000..ff2b60a39c
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-changesummaryprocessing.html
@@ -0,0 +1,133 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS C++ - ChangeSummaryProcessing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69445">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - ChangeSummaryProcessing">RDB DAS C++ - ChangeSummaryProcessing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASC%2B%2B-ChangeSummaryProcessing-ChangeSummaryProcessing"></A>ChangeSummaryProcessing</H1>
+
+<P>SDO provides an important feature called the ChangeSummary. Using this feature, a graph of related DataObjects can track changes made to iteself. These changes include additions to the graph, deletions, DataObject property (attribute) changes and even changes to object relationships.</P>
+
+<P>The RDB DAS leverages the SDO ChangeSummary to drive graph chages to a database.  Here is a simple example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr select = das-&gt;createCommand(&quot;Select * from CUSTOMER where ID = 1&quot;);<BR>
+ DataObjectPtr root = select-&gt;executeQuery();</P>
+
+<P> DataObjectPtr customer = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das-&gt;applyChanges(root);</P>
+</DIV></DIV>
+<P>The first half of this example creates a new read command and executes it. The result is a graph of DataObjects (in this case just one) represented by the containing &quot;root&quot;.</P>
+
+<P>The second half of the example makes modification to a single object in the graph and then calls the applyChanges() method. As part of the applyChanges processing, the das will scan the SDO ChangeSummary and notice the modified DataObject. It will then generate the UPDATE statement required to reflect the change to the database:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = 'Pavick' WHERE ID = 1
+</PRE>
+</DIV></DIV>
+<P>Notice that only a single column is updated rahther than all columns. This is because the SDO ChangeSummary has enough fidelity to track changes on a property-by-property bases and the das has the ability to generate partial updates.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-c-conventionoverconfiguration.html b/site/trunk/site-publish/rdb-das-c-conventionoverconfiguration.html
new file mode 100644
index 0000000000..025a465e0b
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-conventionoverconfiguration.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ - ConventionOverConfiguration : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69443">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - ConventionOverConfiguration">RDB DAS C++ - ConventionOverConfiguration</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2B-ConventionOverConfiguration-ConventionOverConfiguration"></A>ConventionOverConfiguration</H1>
+
+<P>This concept reflects the notion that configuration (defining a bunch of stuff in a side file) can be avoided by following convention (adhering to prescribed patterns) and that this is generally a good thing. The RDB DAS has several reasonable conventions in place and using these can significantly reduce a developer's work-load.</P>
+
+<P>As an example, the RDB DAS provides a straight-forward, one-to-one mapping of database tables to DataObject Types and from table columns to DataObject properties. If a user provides no mapping information to the contrary, a graph of DataObjects returned by the DAS will directly map Types/Properties to the Tables/Columns queried.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">TABLE CUSTOMER
+     ID         INTEGER
+     LASTNAME   VARCHAR(20)
+     ADDRESS    VARCHAR(30)</PRE>
+</DIV></DIV>
+<P>If an application uses the DAS to query this table with the following SQL statement:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>SELECT * FROM CUSTOMER
+</PRE>
+</DIV></DIV>
+<P>The DAS will return a graph of DataObjects each of Type CUSTOMER and each instance in will have three properties: (ID, LASTNAME, ADDRESS). Here is the example code. Note that no configuration data is provided at all.</P>
+<DIV class="panel"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER&quot;);<BR>
+ DataObjectPtr root = readCustomers-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>Another piece of convention followed by the RDB DAS has to do with database table keys. When asked to &quot;apply changes&quot;, the RDB DAS scans the SDO ChangeSummery and generates the set of INSERT/UPDATE and DELETE statements needed to flush the graph changes to the database. To generate the correct statements the RDB DAS needs to know how a DataObject's properties map to a database table key. In typical Object/Relational mappings frameworks, this information is provided in a config file with something like this:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>&lt;Table tableName=&quot;COMPANY&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      .
+      .
+      .
+   &lt;/Table&gt;
+</PRE>
+</DIV></DIV>
+<P>However, the RDB DAS understands is that, in the absence of user provided cofiguration data, a DataObject property named &quot;ID&quot; maps to a key column named &quot;ID&quot; in the database. If a developer follows this convention (naming key columns &quot;ID&quot;) then this key-mapping information need not be specified in a configuration file. Convention Over Configuration strings are not case sensitives, so &quot;ID&quot;, &quot;Id&quot;, &quot;iD&quot; or&quot;id&quot; will be mapped as a primary key.</P>
+
+
+<P>The RDB DAS also has convention in place for mapping DataObject relationships. If a database table (yyy) has a column named xxx_ID then the DAS will assume, in the absence of config data to the contrary, that there is a one-to-many relationship from table xxx to table yyy and that the key column for table xxx is named &quot;ID&quot;.</P>
+
+<P>There is more &quot;convention over configuration&quot; coming. We are currently looking into support for optimistic concurrency control conventions and other areas. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-foreignkeyrepresentationandmanagement.html b/site/trunk/site-publish/rdb-das-c-foreignkeyrepresentationandmanagement.html
new file mode 100644
index 0000000000..fa8f302283
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-foreignkeyrepresentationandmanagement.html
@@ -0,0 +1,86 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ ForeignKeyRepresentationAndManagement : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69456">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ ForeignKeyRepresentationAndManagement">RDB DAS C++ ForeignKeyRepresentationAndManagement</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2BForeignKeyRepresentationAndManagement-ForeignKeyRepresentationAndManagement"></A>ForeignKeyRepresentationAndManagement</H1>
+
+<P>Database table foreign keys map to DataObjects as relationships to other DataObjects. Consider two tables: DEPARTMENT and EMPLOYEE and assume the EMPLOYEE table has a FK column DEPT_ID that references a row in the DEPARTEMENT table.</P>
+
+<P>If you use the DAS to read a particular department and all of its related employees then you will end up with a DEPARTMENT DataObject that has a property named &quot;EMPLOYEE&quot; that is a reference to a list of related EMPLOYEE DataObjects. You can navigate directly to the employees via this property like this: department-&gt;getList(&quot;EMPLOYEE&quot;).</P>
+
+<P>As DEPARTMENT PK is stored on the DataObject, a reference to a EMPLOYEE DataObject&nbsp; does not need to store the DEPARTMENT FK, because the DEPARTMENT FK and DEPARTMENT PK should be the same according to <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Referential_integrity" title="Visit page outside Confluence" rel="nofollow">Referential Integrity (RI)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. So, if a EMPLOYEE is removed from a DEPARTMENT to another, when DAS apply the changes back to the database, it needs only to get the PK value from the new DEPARTENT that references the EMPLOYEE and set it on its DEPARTMENT FK.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-optimisticconcurrencycontrol.html b/site/trunk/site-publish/rdb-das-c-optimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..8d926c8beb
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-optimisticconcurrencycontrol.html
@@ -0,0 +1,96 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ - OptimisticConcurrencyControl : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69452">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - OptimisticConcurrencyControl">RDB DAS C++ - OptimisticConcurrencyControl</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2B-OptimisticConcurrencyControl-OptimisticConcurrencyControl"></A>OptimisticConcurrencyControl</H1>
+
+<P>The RDB DAS is intended for use in disconnected scenarios. When the DAS returns a graph of SDO DataObjects as the result of a query, there are no locks held on the underlying database and the data is no longer associated with any database connection or transaction. However, although locks are not held, the DAS does employ a mechanism called <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Optimistic_locking" title="Visit page outside Confluence" rel="nofollow">Optimistic Concurrency Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> (OCC) to manage concurrency.</P>
+
+<P>Basically, when OCC is being utilized, the DAS checks whether the state of the database has changed since the original data was read before applying any writes to the same location. For example, suppose that a DAS client reads a set of Customers, modifies one Customer and then attempts to write the change back to the database:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> CommandPtr select = das-&gt;createCommand(&quot;Select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObjectPtr root = select-&gt;executeQuery();</P>
+
+<P> DataObjectPtr customer = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);</P>
+
+<P> //Some period of time passes in which &quot;CUSTOMER[1]&quot; could be modified by another process or application</P>
+
+<P> das-&gt;applyChanges(root);</P>
+</DIV></DIV>
+<P>If OCC is enabled then as part of &quot;applyChanges&quot; processing the DAS will ensure that the table row representing &quot;CUSTOMER[1]&quot; has not been changed since it was read. This is possible because a feature of the original SDO graph is to &quot;remember&quot; its original state along with any changes that have been made. The DAS has access to this original state and uses it to create an &quot;overqualified&quot; update statement. When the DAS executes this update statement against the database, it will fail if the underlying data has been modified (a collision has occurred) and, if so, an exception will be thrown and the transaction rolled back. If there is no collision then the update statement execution succeeds and the change is applied. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-partialupdate.html b/site/trunk/site-publish/rdb-das-c-partialupdate.html
new file mode 100644
index 0000000000..26e87d10cc
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-partialupdate.html
@@ -0,0 +1,92 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ PartialUpdate : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69449">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ PartialUpdate">RDB DAS C++ PartialUpdate</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2BPartialUpdate-PartialUpdate"></A>PartialUpdate</H1>
+
+<P>The RDB DAS uses the SDO Change Summary to generate a set of database write operations. Rather than generated a statement to update all columns in a table that maps to a SDO DataObject Type, the DAS generates statements that update ony those columns that map to a modified DataObject property. For example, consider a Customer DataObject that has had the LastName property changed. The <B>partial update</B> statement generated by the DAS will look something like this:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = 'Tuscany' WHERE ID = '1'
+</PRE>
+</DIV></DIV>
+<P>Rather than a statement that updates all columns like this:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>UPDATE CUSTOMER SET FIRSTNAME = 'APACHE', SET LASTNAME = 'TUSCANY', SET ADDRESS = 'USA', SET PHONE = '555-5555', SET AGE = '7', SET SHOESIZE = '15' WHERE ID = '1'
+</PRE>
+</DIV></DIV>
+<P>There are a couple of very good reasons for using a partial update approach. For one, a performance boost can be realized by applications writing to wide tables. For example, tables with over 100 columns are not unheard of. It can be a huge waste of resource to update 100 columns when only one was modified. Another reason for partial update is that some databases employ <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Database_trigger" title="Visit page outside Confluence" rel="nofollow">triggers<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>on specific columns in a table. Partial updates are necessary when column triggers are employed to avoid tripping the trigger on every row update rather than only on updates to the specific column. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-resultsetdrivendataobjecttypes.html b/site/trunk/site-publish/rdb-das-c-resultsetdrivendataobjecttypes.html
new file mode 100644
index 0000000000..fd6e26d6a0
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-resultsetdrivendataobjecttypes.html
@@ -0,0 +1,98 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ ResultSetDrivenDataObjectTypes : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69450">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ ResultSetDrivenDataObjectTypes">RDB DAS C++ ResultSetDrivenDataObjectTypes</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2BResultSetDrivenDataObjectTypes-ResultSetDrivenDataObjectTypes%26nbsp%3B"></A>ResultSetDrivenDataObjectTypes&nbsp;</H1>
+
+<P>RDB DAS uses the database metadata retrieved by ODBC driver to create the set of SDO Types used to construct the data graph returned as a result of a query. ODBC returns the data resulting from a query as a set of rows of column values. The metadata associated with this result set provides information about these values. Table name, column name, column type, etc. are all provided for each returned value.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>TABLE CUSTOMER
+      ID         INTEGER
+      LASTNAME   VARCHAR(20)
+      ADDRESS    VARCHAR(30)
+</PRE>
+</DIV></DIV>
+<P>The user might query the database like this:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObjectPtr root = readCustomers0-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>The DAS returns a graph of DataObjects each of Type CUSTOMER and each instance will have three properties: (ID, LASTNAME, ADDRESS). Since this example does not pass the DAS a set of SDO Types to use, the DAS creates the Types dynamically based on the metadata.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-user-guide.html b/site/trunk/site-publish/rdb-das-c-user-guide.html
new file mode 100644
index 0000000000..1933f9d1e4
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-user-guide.html
@@ -0,0 +1,168 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS C++ - User Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69441">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-c-get-involved.html" title="DAS C++ Get Involved">Get Involved</A><BR>
+<A href="das-c-found-a-bug.html" title="DAS C++ Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-c.html" title="DAS C++">DAS C+&#43; Home</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=DAS%20C%2B%2B%20FAQ&linkCreation=true&fromPageId=56223" class="createlink">FAQ</A><BR>
+<A href="das-c-releases.html" title="DAS C++ Releases">Downloads</A><BR>
+<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/das" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="RDBDASC%2B%2B-UserGuide-Tuscany%2FTuscanyC%5C%2FDASC%5COverview%2FRDBDASC%5CUserGuide"></A>Tuscany/TuscanyC+&#43; /DAS C+&#43; Overview/RDBDAS C+&#43; User Guide</H1>
+
+
+<H2><A name="RDBDASC%2B%2B-UserGuide-Introduction"></A>Introduction</H2>
+
+<P>&nbsp;&nbsp;&nbsp; This Guide provides user-level information describing the capabilities of the RDB DAS.</P>
+
+<H2><A name="RDBDASC%2B%2B-UserGuide-Concepts"></A>Concepts</H2>
+
+<P>&nbsp;&nbsp;&nbsp; This section provides an overview of several main concepts that are key to understanding and working with the RDB DAS.</P>
+<UL>
+	<LI><A href="rdb-das-cpp-conventionoverconfiguration.html" title="RDB DAS CPP - ConventionOverConfiguration">ConventionOverConfiguration</A></LI>
+	<LI><A href="rdb-das-cpp-changesummaryprocessing.html" title="RDB DAS CPP - ChangeSummaryProcessing">ChangeSummaryProcessing</A></LI>
+	<LI><A href="rdb-das-cpp-writeoperationordering.html" title="RDB DAS CPP - WriteOperationOrdering">WriteOperationOrdering</A></LI>
+	<LI><A href="rdb-das-cpp-partialupdate.html" title="RDB DAS CPP - PartialUpdate">PartialUpdate</A></LI>
+	<LI><A href="rdb-das-cpp-resultsetdrivendataobjecttypes.html" title="RDB DAS CPP - ResultSetDrivenDataObjectTypes">ResultSetDrivenDataObjectTypes</A></LI>
+	<LI><A href="rdb-das-cpp-optimisticconcurrencycontrol.html" title="RDB DAS CPP - OptimisticConcurrencyControl">OptimisticConcurrencyControl</A></LI>
+	<LI><A href="rdb-das-cpp-foreignkeyrepresentationandmanagement.html" title="RDB DAS CPP - ForeignKeyRepresentationAndManagement">ForeignKeyRepresentationAndManagement</A></LI>
+</UL>
+
+
+<H2><A name="RDBDASC%2B%2B-UserGuide-Capabilities%28Howto%29"></A>Capabilities (How to)</H2>
+
+<UL>
+	<LI><A href="rdb-das-cpp-workingwithbasiccrud.html" title="RDB DAS CPP - WorkingWithBasicCrud">WorkingWithBasicCrud</A>&#45; Reading and writing to the database</LI>
+	<LI><A href="rdb-das-cpp-workingwithoptimisticconcurrencycontrol.html" title="RDB DAS CPP - WorkingWithOptimisticConcurrencyControl">WorkingWithOptimisticConcurrencyControl</A></LI>
+	<LI><A href="rdb-das-cpp-workingwithrelationships.html" title="RDB DAS CPP - WorkingWithRelationships">WorkingWithRelationships</A></LI>
+	<LI><A href="rdb-das-cpp-workingwithconventions.html" title="RDB DAS CPP - WorkingWithConventions">WorkingWithConventions</A></LI>
+	<LI><A href="rdb-das-cpp-workingwithcompoundkeys.html" title="RDB DAS CPP - WorkingWithCompoundKeys">WorkingWithCompoundKeys</A></LI>
+	<LI><A href="rdb-das-cpp-workingwithnamemapping.html" title="RDB DAS CPP - WorkingWithNameMapping">WorkingWithNameMapping</A></LI>
+</UL>
+
+
+<H2><A name="RDBDASC%2B%2B-UserGuide-Samples%28SeeCapabilitiesInUse%29"></A>Samples (See Capabilities In Use)</H2>
+
+<P>User can try the samples below to understand the above mentioned concepts and capabilities.</P>
+<UL>
+	<LI><A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/samples/CompanySample/Readme.html" class="external-link" rel="nofollow">Company Sample</A> (Demonstrates basic CRUD)</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-c-workingwithbasiccrud.html b/site/trunk/site-publish/rdb-das-c-workingwithbasiccrud.html
new file mode 100644
index 0000000000..c71c124c83
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-workingwithbasiccrud.html
@@ -0,0 +1,123 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ - WorkingWithBasicCrud : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69479">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - WorkingWithBasicCrud">RDB DAS C++ - WorkingWithBasicCrud</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2B-WorkingWithBasicCrud-WorkingWithBasicCrud"></A>WorkingWithBasicCrud</H1>
+
+<P>The RDB DAS provides a simple, command-oriented approach for reading and writing to the database.</P>
+
+<H3><A name="RDBDASC%2B%2B-WorkingWithBasicCrud-Asimpleread"></A>A simple read</H3>
+
+<P>The following illustrates the simplest possible read:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER where ID = 22590&quot;);<BR>
+ DataObjectPtr root = readCustomers-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>The first line creates an instance of the DAS that is primed with a given ODBC Connection object. The Connection can be procured in a number of different ways. This example is from the RDB DAS test suite and the implentation of getConnection() create a Connection object using a DSN string.</P>
+
+
+<P>The second line uses the das instance as a factory to create a Command instance from the provided SQL SELECT string. The third line executes the command which returns a &quot;root&quot; SDO DataObject. This root DataObject is sometimes referred to as a &quot;dummy&quot; root and acts as a container for the graph of data returned from the query. The RDB DAS always returns a dummy root from executing a query.</P>
+
+<P>Once we have a handle to the root we can pull information from the returned customer object using the dynamic SDO apis like this:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> DataObjectPtr cust = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ wstring name = cust-&gt;getCString(&quot;LASTNAME&quot;);</P>
+</DIV></DIV>
+<P>The first line retreives the first Customer from the root's list of returned Customers (since we queried by ID, thereis only one). The second line pulls the LASTNAME value from the customer.</P>
+
+<H3><A name="RDBDASC%2B%2B-WorkingWithBasicCrud-Asimplewrite"></A>A simple write</H3>
+
+<P>The DAS leverages the SDO Change Summary to provide a very simple mechanism to flush data changes back to the database. We can illustrate this by continuing the previous example:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das-&gt;applyChanges(root);</P>
+</DIV></DIV>
+<P>The first line uses the SDO dynamic APIs to change the LASTNAME property of the Customer instance and the second line directs the das to flush graph changes back to the database. At this point, the das scans the SDO ChangeSummary and generates the required UPDATE statement necessary to synchronize this change with the database.</P>
+
+<P>Although this simple example demonstrates a single property change to a single object, the das will process any numbers of changes made to any number of objects in a graph. Even if we read 1000 customers from the database and made several changes to each, flushing those changes back to the database is still just one call to das-&gt;applyChanges().</P>
+
+<H3><A name="RDBDASC%2B%2B-WorkingWithBasicCrud-Awritecommmand"></A>A write commmand</H3>
+
+<P>Writes to the database can also be done without using the change summary. To do this, we simply use the das instance as a factory to create a command initialized with a CREATE/UPDATE or DELETE statement.</P>
+<DIV class="panel"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr insert = das-&gt;createCommand(&quot;insert into CUSTOMER values (10, 'Williams', '5555 Maine Ave.')&quot;);<BR>
+ insert-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>Although allowing the das to generate write statements from the change summary is recommended, this low level ability to execute aribtrary SQL is another option. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-workingwithoptimisticconcurrencycontrol.html b/site/trunk/site-publish/rdb-das-c-workingwithoptimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..96e836ce5a
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-workingwithoptimisticconcurrencycontrol.html
@@ -0,0 +1,103 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ WorkingWithOptimisticConcurrencyControl : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69484">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ WorkingWithOptimisticConcurrencyControl">RDB DAS C++ WorkingWithOptimisticConcurrencyControl</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2BWorkingWithOptimisticConcurrencyControl-WorkingWithOptimisticConcurrencyControl"></A>WorkingWithOptimisticConcurrencyControl</H1>
+
+<P>The RDB DAS provides a straightforward mechanism for support of <SPAN class="error">&#91;OptimisticConcurrencyControl\|RDB DAS C+\+ - OptimisticConcurrencyControl|RDB DAS C++ - OptimisticConcurrencyControl&#93;</SPAN>. To enable OCC a client must designate an integer version column in the configuration (usually via a config xml file). The following example is an example of a cofig file that identifies a version column:&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;</P>
+
+<P>     &lt;Command name=&quot;select book 1&quot; SQL=&quot;select * from BOOK where BOOK_ID = 1&quot; kind=&quot;Select&quot;/&gt;</P>
+
+<P>     &lt;Table tableName=&quot;BOOK&quot;&gt;<BR>
+        &lt;Column columnName=&quot;BOOK_ID&quot; primaryKey=&quot;true&quot;/&gt;<BR>
+        &lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;<BR>
+     &lt;/Table&gt;</P>
+
+<P>   &lt;/Config&gt;</P>
+
+<P>This line in the config file &#95;&lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;_designates the column named &quot;OCC&quot; as the version column and also sets &quot;managed&quot; to true. The &quot;managed&quot; attribute has to do with how the version column is changed. In order for OCC to work, some agent must change the value of the version column each time the row is modified. A new value in the version column is what tells the DAS that the row has been modified. If a version column is &quot;managed&quot; then the DAS is responsible for incrementing the value of the column each time some column in the row is changed. The other option is &quot;managed= false&quot; and in this case, the DAS will assume some other agent is responsible for updating the version column. This other agent is likely to be the client application itself or the database via a trigger or some other mechanism.</P>
+
+<P>When applying changes made to a graph (see <SPAN class="error">&#91;ChangeSummaryProcessing\|RDB DAS C+\+ - ChangeSummaryProcessing|RDB DAS C++ - ChangeSummaryProcessing&#93;</SPAN>), the DAS will throw an exception if any table row has been modified since the row was read. For example, if a DAS client reads a row representing a specific Customer and then tries to update that Customer, the DAS will throw an exception if the Customer has already been modified by some other agent. The following example illustrates applying changes and checking for a collision failure:DAS* das = DASImpl::getFactory().createDAS(Config(&quot;ManagedBooksConfig.xml&quot;), getConnection());<BR>
+   // Read a book instance<BR>
+   CommandPtr select = das-&gt;getCommand(&quot;select book 1&quot;);<BR>
+   DataObjectPtr root = select-&gt;executeQuery();<BR>
+   DataObjectPtr book = root-&gt;getDataObject(&quot;BOOK<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=69484" title="Create Page: 1" class="createlink">1<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>&quot;);<BR>
+   book-&gt;setInt(&quot;QUANTITY&quot;, 2);</P>
+
+<P>   // Try to apply changes and catch potential update collision<BR>
+   try <DIV class="error"><SPAN class="error">Unknown macro: {      das.applyChanges(root);   }</SPAN> </DIV> catch (DASOptimisticConcurrencyControlException&amp;) <DIV class="error"><SPAN class="error">Unknown macro: {          recover();   }</SPAN> </DIV></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-workingwithrelationships.html b/site/trunk/site-publish/rdb-das-c-workingwithrelationships.html
new file mode 100644
index 0000000000..47f1f184b4
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-workingwithrelationships.html
@@ -0,0 +1,117 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ - WorkingWithRelationships : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69485">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ - WorkingWithRelationships">RDB DAS C++ - WorkingWithRelationships</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2B-WorkingWithRelationships-WorkingWithRelationships"></A>WorkingWithRelationships</H1>
+
+<P>As mentioned elsewhere in this guide, the RDB DAS provides a simple, implicit mapping from SDO Types/Properties to Relational Tables/Columns. So, in the absence of configuration to the otherwise, reading a table named CUSTOMER with columns NAME and ADDRESS will result in a data graph containing SDO DataObjects of Type CUSTOMER with properties NAME and ADDRESS.</P>
+
+<P>This is great for reading entities from a single table but clients often need to read data from related tables for example Customers and their related Orders. The RDB DAS can work with related database tables and reads that span tables produce graphs of related data objects. Continuing with our Customer-&gt;Order example, a client can read a set of Customers and related Orders by using a SELECT statement that includes a join as in the following example:</P>
+<DIV class="panel"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(Config(&quot;CustomerOrderConfig.xml&quot;), getConnection());<BR>
+ // Read some customers and related orders<BR>
+CommandPtr select = das-&gt;createCommand(&quot;SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1&quot;);</P>
+
+<P> DataObjectPtr root = select-&gt;executeQuery();<BR>
+ DataObjectPtr customer = root-&gt;getDataObject(&quot;customer[1]&quot;);<BR>
+ DataObjectList&amp; orders = customer-&gt;getList(&quot;orders&quot;);</P>
+</DIV></DIV>
+<P>You can see that the client can work with the data graph as a set of related objects. Once the application has a handle to a customer, it can reference that customers related orders by accessing the customers &quot;orders&quot; property.</P>
+
+<P>Notice that the example provides a config file as part of creating the DAS. This file contains mapping information that defines to the DAS how the queried tables are related. Here are the contents of the config file:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+
+     &lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Table tableName=&quot;ANORDER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Relationship name=&quot;orders&quot; primaryKeyTable=&quot;CUSTOMER&quot; foreignKeyTable=&quot;ANORDER&quot; many=&quot;true&quot;&gt;
+        &lt;KeyPair primaryKeyColumn=&quot;ID&quot; foreignKeyColumn=&quot;CUSTOMER_ID&quot;/&gt;
+     &lt;/Relationship&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This config file specifies the primary keys of the related tables and then the relationship between them. It also provides a convenient name for the relationship. In short, this config specifies that the CUSTOMER table and ANORDER table are related via ANORDERs column named &quot;CUSTOMER_ID&quot; which references CUSTOMERS column named &quot;ID&quot;. The name of the relationship is &quot;orders&quot;</P>
+
+<P>As a side note, the config in this example is not required since the table definitions follow a &quot;convention&quot; recognized by the DAS. See <SPAN class="error">&#91;WorkingWithConventions\|RDB DAS C+\+ - WorkingWithConventions|RDB DAS C++ - WorkingWithConventions&#93;</SPAN>. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-c-writeoperationordering.html b/site/trunk/site-publish/rdb-das-c-writeoperationordering.html
new file mode 100644
index 0000000000..d24b227a28
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-c-writeoperationordering.html
@@ -0,0 +1,89 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>RDB DAS C++ WriteOperationOrdering : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=69446">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS C++ WriteOperationOrdering">RDB DAS C++ WriteOperationOrdering</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="RDBDASC%2B%2BWriteOperationOrdering-%26nbsp%3BWriteOperationOrdering"></A>&nbsp;WriteOperationOrdering</H1>
+
+<P>Relational databases often use <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Referential_integrity" title="Visit page outside Confluence" rel="nofollow">Referential Integrity (RI)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>constraints to maintain database consistency. When RI is enabled, database operations must be performed in a specific order that prevents invalid references. If this order is not adhered to then the database will throw an exception rather than let the write succeed.</P>
+
+<P>When an application makes modifications to a data graph and then asks the RDB DAS to &quot;apply changes&quot;, the DAS will create a &quot;batch&quot; of database writes that must be sorted and then executed in the correct order to avoid RI Constraint exceptions. A simple example will help here. Assume a database with two tables CUSTOMER and ORDER. Also assume that the ORDER table has a <SPAN class="nobr"><A href="http://en.wikipedia.org/wiki/Foreign_key" title="Visit page outside Confluence" rel="nofollow">foreign key<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>reference to the CUSTOMER table. Now assume that the application has made modifications to a data graph that was retrieved by the DAS using a SELECT statement like the following:</P>
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>SELECT * FROM CUSTOMER LEFT JOIN ORDER ON CUSTOMER.ID = ORDER.CUSTOMER_ID WHERE CUSTOMER.NAME = 'Tuscany'
+</PRE>
+</DIV></DIV>
+<P>The resulting data graph will contain all matching customers as well as their related orders. Now assume the application uses the SDO API's to delete some customer from the graph and then also deletes the related orders. Although the application deleted the customer first, the DAS must delete the orders first from the database since deleting the customer, with existing referencing orders, would violate the RI constraints and result in an exception. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg b/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg
new file mode 100644
index 0000000000..8ae45037f9
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg
diff --git a/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg.jpeg b/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg.jpeg
new file mode 100644
index 0000000000..74d0972fa5
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-class-diagram.data/ClassDiag.jpg.jpeg
diff --git a/site/trunk/site-publish/rdb-das-class-diagram.html b/site/trunk/site-publish/rdb-das-class-diagram.html
new file mode 100644
index 0000000000..8f9314f4d2
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-class-diagram.html
@@ -0,0 +1,130 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS class diagram</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=57112">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="das-general-menu.html" title="DAS General Menu">DAS General Menu</A>&nbsp;&gt;&nbsp;<A href="das-rdb-menu.html" title="DAS RDB Menu">DAS RDB Menu</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS class diagram">RDB DAS class diagram</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P><SPAN class="image-wrap" style=""><IMG src="rdb-das-class-diagram.data/ClassDiag.jpg" style="border: 0px solid black"></SPAN></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-changesummaryprocessing.html b/site/trunk/site-publish/rdb-das-cpp-changesummaryprocessing.html
new file mode 100644
index 0000000000..975972b91a
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-changesummaryprocessing.html
@@ -0,0 +1,135 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - ChangeSummaryProcessing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69566">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - ChangeSummaryProcessing">RDB DAS CPP - ChangeSummaryProcessing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-ChangeSummaryProcessing-ChangeSummaryProcessing"></A>ChangeSummaryProcessing</H1>
+
+<P>SDO provides an important feature called the ChangeSummary. Using this feature, a graph of related DataObjects can track changes made to iteself. These changes include additions to the graph, deletions, DataObject property (attribute) changes and even changes to object relationships.</P>
+
+<P>The RDB DAS leverages the SDO ChangeSummary to drive graph chages to a database.  Here is a simple example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DASImpl&#42; das = DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr select = das-&gt;createCommand(&quot;select * from CUSTOMER where ID = 1&quot;);<BR>
+ DataObjectPtr root = select-&gt;executeQuery();</P>
+
+<P> DataObjectPtr customer = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das-&gt;applyChanges(root);</P>
+
+<P>&nbsp;delete das;</P>
+</DIV></DIV>
+<P>The first half of this example creates a new read command and executes it. The result is a graph of DataObjects (in this case just one) represented by the containing &quot;root&quot;.</P>
+
+<P>The second half of the example makes modification to a single object in the graph and then calls the applyChanges() method. As part of the applyChanges processing, the das will scan the SDO ChangeSummary and notice the modified DataObject. It will then generate the UPDATE statement required to reflect the change to the database:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = 'Pavick' WHERE ID = 1
+</PRE>
+</DIV></DIV>
+<P>Notice that only a single column is updated rather than all columns. This is because the SDO ChangeSummary has enough fidelity to track changes on a property-by-property bases and the das has the ability to generate partial updates.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-conventionoverconfiguration.html b/site/trunk/site-publish/rdb-das-cpp-conventionoverconfiguration.html
new file mode 100644
index 0000000000..c6d68bcc8b
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-conventionoverconfiguration.html
@@ -0,0 +1,153 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - ConventionOverConfiguration</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69443">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - ConventionOverConfiguration">RDB DAS CPP - ConventionOverConfiguration</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-ConventionOverConfiguration-ConventionOverConfiguration"></A>ConventionOverConfiguration</H1>
+
+<P>This concept reflects the notion that configuration (defining a bunch of stuff in a side file) can be avoided by following convention (adhering to prescribed patterns) and that this is generally a good thing. The RDB DAS has several reasonable conventions in place and using these can significantly reduce a developer's work-load.</P>
+
+<P>As an example, the RDB DAS provides a straight-forward, one-to-one mapping of database tables to DataObject Types and from table columns to DataObject properties. If a user provides no mapping information to the contrary, a graph of DataObjects returned by the DAS will directly map Types/Properties to the Tables/Columns queried.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">TABLE CUSTOMER
+     ID         INTEGER
+     LASTNAME   VARCHAR(20)
+     ADDRESS    VARCHAR(30)
+</PRE>
+</DIV></DIV>
+<P>If an application uses the DAS to query this table with the following SQL statement:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>SELECT * FROM CUSTOMER
+</PRE>
+</DIV></DIV>
+<P>The DAS will return a graph of DataObjects each of Type CUSTOMER and each instance in will have three properties: (ID, LASTNAME, ADDRESS). Here is the example code. Note that no configuration data is provided at all.</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER&quot;);<BR>
+ DataObjectPtr root = readCustomers-&gt;executeQuery();</P>
+
+<P>&nbsp;delete das;</P>
+</DIV></DIV>
+<P>Another piece of convention followed by the RDB DAS has to do with database table keys. When asked to &quot;apply changes&quot;, the RDB DAS scans the SDO ChangeSummery and generates the set of INSERT/UPDATE and DELETE statements needed to flush the graph changes to the database. To generate the correct statements the RDB DAS needs to know how a DataObject's properties map to a database table key. In typical Object/Relational mappings frameworks, this information is provided in a config file with something like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Table tableName=&quot;COMPANY&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      .
+      .
+      .
+   &lt;/Table&gt;
+</PRE>
+</DIV></DIV>
+<P>However, the RDB DAS understands is that, in the absence of user provided cofiguration data, a DataObject property named &quot;ID&quot; maps to a key column named &quot;ID&quot; in the database. If a developer follows this convention (naming key columns &quot;ID&quot;) then this key-mapping information need not be specified in a configuration file. Convention Over Configuration strings are not case sensitives, so &quot;ID&quot;, &quot;Id&quot;, &quot;iD&quot; or&quot;id&quot; will be mapped as a primary key.</P>
+
+<P>The RDB DAS also has convention in place for mapping DataObject relationships. If a database table (yyy) has a column named xxx_ID then the DAS will assume, in the absence of config data to the contrary, that there is a one-to-many relationship from table xxx to table yyy and that the key column for table xxx is named &quot;ID&quot;.</P>
+
+<P>There is more &quot;convention over configuration&quot; coming. We are currently looking into support for optimistic concurrency control conventions and other areas. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-foreignkeyrepresentationandmanagement.html b/site/trunk/site-publish/rdb-das-cpp-foreignkeyrepresentationandmanagement.html
new file mode 100644
index 0000000000..dad32628f2
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-foreignkeyrepresentationandmanagement.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - ForeignKeyRepresentationAndManagement</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69456">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - ForeignKeyRepresentationAndManagement">RDB DAS CPP - ForeignKeyRepresentationAndManagement</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-ForeignKeyRepresentationAndManagement-ForeignKeyRepresentationAndManagement"></A>ForeignKeyRepresentationAndManagement</H1>
+
+<P>Database table foreign keys map to DataObjects as relationships to other DataObjects. Consider two tables: DEPARTMENT and EMPLOYEE and assume the EMPLOYEE table has a FK column DEPT_ID that references a row in the DEPARTEMENT table.</P>
+
+<P>If you use the DAS to read a particular department and all of its related employees then you will end up with a DEPARTMENT DataObject that has a property named &quot;EMPLOYEE&quot; that is a reference to a list of related EMPLOYEE DataObjects. You can navigate directly to the employees via this property like this: department-&gt;getList(&quot;EMPLOYEE&quot;).</P>
+
+<P>As DEPARTMENT PK is stored on the DataObject, a reference to a EMPLOYEE DataObject&nbsp; does not need to store the DEPARTMENT FK, because the DEPARTMENT FK and DEPARTMENT PK should be the same according to <A href="http://en.wikipedia.org/wiki/Referential_integrity" class="external-link" rel="nofollow">Referential Integrity (RI)</A>. So, if a EMPLOYEE is removed from a DEPARTMENT to another, when DAS apply the changes back to the database, it needs only to get the PK value from the new DEPARTENT that references the EMPLOYEE and set it on its DEPARTMENT FK.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-optimisticconcurrencycontrol.html b/site/trunk/site-publish/rdb-das-cpp-optimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..f530979f31
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-optimisticconcurrencycontrol.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - OptimisticConcurrencyControl</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69452">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - OptimisticConcurrencyControl">RDB DAS CPP - OptimisticConcurrencyControl</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-OptimisticConcurrencyControl-OptimisticConcurrencyControl"></A>OptimisticConcurrencyControl</H1>
+
+<P>The RDB DAS is intended for use in disconnected scenarios. When the DAS returns a graph of SDO DataObjects as the result of a query, there are no locks held on the underlying database and the data is no longer associated with any database connection or transaction. However, although locks are not held, the DAS does employ a mechanism called <A href="http://en.wikipedia.org/wiki/Optimistic_locking" class="external-link" rel="nofollow">Optimistic Concurrency Control</A> (OCC) to manage concurrency.</P>
+
+<P>Basically, when OCC is being utilized, the DAS checks whether the state of the database has changed since the original data was read before applying any writes to the same location. For example, suppose that a DAS client reads a set of Customers, modifies one Customer and then attempts to write the change back to the database:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> CommandPtr select = das-&gt;createCommand(&quot;Select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObjectPtr root = select-&gt;executeQuery();</P>
+
+<P> DataObjectPtr customer = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);</P>
+
+<P> //Some period of time passes in which &quot;CUSTOMER[1]&quot; could be modified by another process or application</P>
+
+<P> das-&gt;applyChanges(root);</P>
+</DIV></DIV>
+<P>If OCC is enabled then as part of &quot;applyChanges&quot; processing the DAS will ensure that the table row representing &quot;CUSTOMER[1]&quot; has not been changed since it was read. This is possible because a feature of the original SDO graph is to &quot;remember&quot; its original state along with any changes that have been made. The DAS has access to this original state and uses it to create an &quot;overqualified&quot; update statement. When the DAS executes this update statement against the database, it will fail if the underlying data has been modified (a collision has occurred) and, if so, an exception will be thrown and the transaction rolled back. If there is no collision then the update statement execution succeeds and the change is applied. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-partialupdate.html b/site/trunk/site-publish/rdb-das-cpp-partialupdate.html
new file mode 100644
index 0000000000..5a9d6d9b49
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-partialupdate.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - PartialUpdate</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69449">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - PartialUpdate">RDB DAS CPP - PartialUpdate</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-PartialUpdate-PartialUpdate"></A>PartialUpdate</H1>
+
+<P>The RDB DAS uses the SDO Change Summary to generate a set of database write operations. Rather than generated a statement to update all columns in a table that maps to a SDO DataObject Type, the DAS generates statements that update ony those columns that map to a modified DataObject property. For example, consider a Customer DataObject that has had the LastName property changed. The <B>partial update</B> statement generated by the DAS will look something like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET LASTNAME = 'Tuscany' WHERE ID = '1'
+</PRE>
+</DIV></DIV>
+<P>Rather than a statement that updates all columns like this:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>UPDATE CUSTOMER SET FIRSTNAME = 'APACHE', SET LASTNAME = 'TUSCANY', SET ADDRESS = 'USA', SET PHONE = '555-5555', SET AGE = '7', SET SHOESIZE = '15' WHERE ID = '1'
+</PRE>
+</DIV></DIV>
+<P>There are a couple of very good reasons for using a partial update approach. For one, a performance boost can be realized by applications writing to wide tables. For example, tables with over 100 columns are not unheard of. It can be a huge waste of resource to update 100 columns when only one was modified. Another reason for partial update is that some databases employ <A href="http://en.wikipedia.org/wiki/Database_trigger" class="external-link" rel="nofollow">triggers</A>on specific columns in a table. Partial updates are necessary when column triggers are employed to avoid tripping the trigger on every row update rather than only on updates to the specific column. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-resultsetdrivendataobjecttypes.html b/site/trunk/site-publish/rdb-das-cpp-resultsetdrivendataobjecttypes.html
new file mode 100644
index 0000000000..9e0692aade
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-resultsetdrivendataobjecttypes.html
@@ -0,0 +1,130 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - ResultSetDrivenDataObjectTypes</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69450">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - ResultSetDrivenDataObjectTypes">RDB DAS CPP - ResultSetDrivenDataObjectTypes</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-ResultSetDrivenDataObjectTypes-ResultSetDrivenDataObjectTypes%26nbsp%3B"></A>ResultSetDrivenDataObjectTypes&nbsp;</H1>
+
+<P>RDB DAS uses the database metadata retrieved by ODBC driver to create the set of SDO Types used to construct the data graph returned as a result of a query. ODBC returns the data resulting from a query as a set of rows of column values. The metadata associated with this result set provides information about these values. Table name, column name, column type, etc. are all provided for each returned value.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>TABLE CUSTOMER
+      ID         INTEGER
+      LASTNAME   VARCHAR(20)
+      ADDRESS    VARCHAR(30)
+</PRE>
+</DIV></DIV>
+<P>The user might query the database like this:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObjectPtr root = readCustomers0-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>The DAS returns a graph of DataObjects each of Type CUSTOMER and each instance will have three properties: (ID, LASTNAME, ADDRESS). Since this example does not pass the DAS a set of SDO Types to use, the DAS creates the Types dynamically based on the metadata.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithbasiccrud.html b/site/trunk/site-publish/rdb-das-cpp-workingwithbasiccrud.html
new file mode 100644
index 0000000000..30703144df
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithbasiccrud.html
@@ -0,0 +1,154 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithBasicCrud</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69479">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithBasicCrud">RDB DAS CPP - WorkingWithBasicCrud</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithBasicCrud-WorkingWithBasicCrud"></A>WorkingWithBasicCrud</H1>
+
+<P>The RDB DAS provides a simple, command-oriented approach for reading and writing to the database.</P>
+
+<H3><A name="RDBDASCPP-WorkingWithBasicCrud-Asimpleread"></A>A simple read</H3>
+
+<P>The following illustrates the simplest possible read:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr readCustomers = das-&gt;createCommand(&quot;select * from CUSTOMER where ID = 22590&quot;);<BR>
+ DataObjectPtr root = readCustomers-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>The first line creates an instance of the DAS that is primed with a given ODBC Connection object. The Connection can be procured in a number of different ways. This example is from the RDB DAS test suite and the implentation of getConnection() create a Connection object using a DSN string.</P>
+
+<P>The second line uses the das instance as a factory to create a Command instance from the provided SQL SELECT string. The third line executes the command which returns a &quot;root&quot; SDO DataObject. This root DataObject is sometimes referred to as a &quot;dummy&quot; root and acts as a container for the graph of data returned from the query. The RDB DAS always returns a dummy root from executing a query.</P>
+
+<P>Once we have a handle to the root we can pull information from the returned customer object using the dynamic SDO apis like this:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DataObjectPtr cust = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ wstring name = cust-&gt;getCString(&quot;LASTNAME&quot;);</P>
+</DIV></DIV>
+<P>The first line retreives the first Customer from the root's list of returned Customers (since we queried by ID, thereis only one). The second line pulls the LASTNAME value from the customer.</P>
+
+<H3><A name="RDBDASCPP-WorkingWithBasicCrud-Asimplewrite"></A>A simple write</H3>
+
+<P>The DAS leverages the SDO Change Summary to provide a very simple mechanism to flush data changes back to the database. We can illustrate this by continuing the previous example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> customer-&gt;setCString(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das-&gt;applyChanges(root);</P>
+</DIV></DIV>
+<P>The first line uses the SDO dynamic APIs to change the LASTNAME property of the Customer instance and the second line directs the das to flush graph changes back to the database. At this point, the das scans the SDO ChangeSummary and generates the required UPDATE statement necessary to synchronize this change with the database.</P>
+
+<P>Although this simple example demonstrates a single property change to a single object, the das will process any numbers of changes made to any number of objects in a graph. Even if we read 1000 customers from the database and made several changes to each, flushing those changes back to the database is still just one call to das-&gt;applyChanges().</P>
+
+<H3><A name="RDBDASCPP-WorkingWithBasicCrud-Awritecommmand"></A>A write commmand</H3>
+
+<P>Writes to the database can also be done without using the change summary. To do this, we simply use the das instance as a factory to create a command initialized with a CREATE/UPDATE or DELETE statement.</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(getConnection());<BR>
+ CommandPtr insert = das-&gt;createCommand(&quot;insert into CUSTOMER values (10, 'Williams', '5555 Maine Ave.')&quot;);<BR>
+ insert-&gt;executeQuery();</P>
+</DIV></DIV>
+<P>Although allowing the das to generate write statements from the change summary is recommended, this low level ability to execute aribtrary SQL is another option. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithcompoundkeys.html b/site/trunk/site-publish/rdb-das-cpp-workingwithcompoundkeys.html
new file mode 100644
index 0000000000..41545fe964
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithcompoundkeys.html
@@ -0,0 +1,146 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithCompoundKeys</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69549">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithCompoundKeys">RDB DAS CPP - WorkingWithCompoundKeys</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithCompoundKeys-WorkingWithCompoundKeys"></A>WorkingWithCompoundKeys</H1>
+
+<P>The RDB DAS provides the ability to work with single-column keys as well as keys composed of multiple columns (<A href="http://en.wikipedia.org/wiki/Compound_key" class="external-link" rel="nofollow">compound keys</A>). RDB DAS clients can specify the primary key for a table as well as foreign keys that reference other tables. The primary key for a table can be identified to the DAS via configuration (typically via a configuration xml file). The following is an example config file that defines a compound primary key:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILS&quot;&gt;
+         &lt;Column columnName=&quot;ORDERID&quot; primaryKey=&quot;true&quot;/&gt;
+         &lt;Column columnName=&quot;PRODUCTID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>Relationships between tables are in terms of primary keys and foreign keys and so foreign keys can also be compound. The following example illustrates a relationship using a compound foreign key:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILS&quot;&gt;
+         &lt;Column columnName=&quot;ORDERID&quot; primaryKey=&quot;true&quot;/&gt;
+         &lt;Column columnName=&quot;PRODUCTID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILSDESC&quot;&gt;
+         &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+      &lt;Relationship name=&quot;orderDetailsDesc&quot; primaryKeyTable=&quot;ORDERDETAILS&quot;
+                     foriegnKeyTable=&quot;ORDERDETAILSDESC&quot; many=&quot;true&quot;&gt;
+         &lt;KeyPair primaryKeyColumn=&quot;ORDERID&quot; foriegnKeyColumn=&quot;ORDERID&quot;  /&gt;
+         &lt;KeyPair primaryKeyColumn=&quot;PRODUCTID&quot; foreignKeyColumn=&quot;PRODUCTID&quot; /&gt;
+      &lt;/Relationship&gt;
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithconventions.html b/site/trunk/site-publish/rdb-das-cpp-workingwithconventions.html
new file mode 100644
index 0000000000..40b3df3f65
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithconventions.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithConventions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69545">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithConventions">RDB DAS CPP - WorkingWithConventions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithConventions-WorkingWithRelationships"></A>WorkingWithRelationships</H1>
+
+<P>As mentioned elsewhere in this guide, the RDB DAS provides a simple, implicit mapping from SDO Types/Properties to Relational Tables/Columns. So, in the absence of configuration to the otherwise, reading a table named CUSTOMER with columns NAME and ADDRESS will result in a data graph containing SDO DataObjects of Type CUSTOMER with properties NAME and ADDRESS.</P>
+
+<P>This is great for reading entities from a single table but clients often need to read data from related tables for example Customers and their related Orders. The RDB DAS can work with related database tables and reads that span tables produce graphs of related data objects. Continuing with our Customer-&gt;Order example, a client can read a set of Customers and related Orders by using a SELECT statement that includes a join as in the following example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(Config(&quot;CustomerOrderConfig.xml&quot;), getConnection());<BR>
+ // Read some customers and related orders<BR>
+CommandPtr select = das-&gt;createCommand(&quot;SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1&quot;);</P>
+
+<P> DataObjectPtr root = select-&gt;executeQuery();<BR>
+ DataObjectPtr customer = root-&gt;getDataObject(&quot;customer[1]&quot;);<BR>
+ DataObjectList&amp; orders = customer-&gt;getList(&quot;orders&quot;);</P>
+
+<P>delete das;&nbsp;</P>
+</DIV></DIV>
+<P>You can see that the client can work with the data graph as a set of related objects. Once the application has a handle to a customer, it can reference that customers related orders by accessing the customers &quot;orders&quot; property.</P>
+
+<P>Notice that the example provides a config file as part of creating the DAS. This file contains mapping information that defines to the DAS how the queried tables are related. Here are the contents of the config file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+     &lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Table tableName=&quot;ANORDER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Relationship name=&quot;orders&quot; primaryKeyTable=&quot;CUSTOMER&quot; foreignKeyTable=&quot;ANORDER&quot; many=&quot;true&quot;&gt;
+        &lt;KeyPair primaryKeyColumn=&quot;ID&quot; foreignKeyColumn=&quot;CUSTOMER_ID&quot;/&gt;
+     &lt;/Relationship&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This config file specifies the primary keys of the related tables and then the relationship between them. It also provides a convenient name for the relationship. In short, this config specifies that the CUSTOMER table and ANORDER table are related via ANORDERs column named &quot;CUSTOMER_ID&quot; which references CUSTOMERS column named &quot;ID&quot;. The name of the relationship is &quot;orders&quot;</P>
+
+<P>As a side note, the config in this example is not required since the table definitions follow a &quot;convention&quot; recognized by the DAS. See []<A href="" title="RDB DAS CPP - WorkingWithConventions">WorkingWithConventions</A>. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithnamemapping.html b/site/trunk/site-publish/rdb-das-cpp-workingwithnamemapping.html
new file mode 100644
index 0000000000..f9565dfdbc
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithnamemapping.html
@@ -0,0 +1,145 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithNameMapping</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69551">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithNameMapping">RDB DAS CPP - WorkingWithNameMapping</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithNameMapping-WorkingWithNameMapping"></A>WorkingWithNameMapping</H1>
+
+<P>The default behavior for the RDB DAS is to map database names to SDO names. So, if a CUTSOMER table is read from the database then each row will be represented as a CUSTOMER DataObject. Likewise, if the CUSTOMER tabel has columns (ID, LASTNAME, ADDRESS) then CUSTOMER DataObject instances will have properties (ID, LASTNAME, ADDRESS). Database Table names map to DataObject Type names and database column names map to DataObject property names.</P>
+
+<P>This implicit mapping of database and SDO names woks well but some developers will want explicit name mapping that allows the database and SDO names to vary. One typical example is that the database table and column names will be automatically converted to uppercase when DAS generates the SDO Types, but a developer might want to work with SDO Types and properties that are camelcased. So, database names CUSTOMER and LASTNAME might map to SDO names Customer and lastName.</P>
+
+<P>The RDB DAS allows this type of explicit mapping via configuration (usually in the form of a XML config file). The following example illstrates the use of this feature:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">DAS* das = DASImpl::getFactory().createDAS(Config(<SPAN class="code-quote">&quot;BooksConfigWithAlias.xml&quot;</SPAN>), getConnection());
+
+   CommandPtr select = das-&gt;getCommand(<SPAN class="code-quote">&quot;get book by ID equal 1&quot;</SPAN>);
+
+   DataObjectPtr root = select-&gt;executeQuery();
+   wstring author = root-&gt;getCString(<SPAN class="code-quote">&quot;Book[1]/Writer&quot;</SPAN>));&nbsp;   delete das;&nbsp;
+</PRE>
+</DIV></DIV>
+<P>Here is the associated configuration file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+
+       &lt;Command name=&quot;get all books&quot; SQL=&quot;SELECT * FROM BOOK&quot;/&gt;
+
+       &lt;Command name=&quot;get Cat in the Hat&quot; SQL=&quot;SELECT * FROM BOOK WHERE NAME = 'Cat in the Hat'&quot;/&gt;
+
+       &lt;Command name=&quot;get book by ID equal 1&quot; SQL=&quot;SELECT * FROM BOOK WHERE BOOK.BOOK_ID = 1&quot;/&gt;
+
+       &lt;Table tableName=&quot;BOOK&quot; typeName=&quot;Book&quot;&gt;
+           &lt;Column columnName=&quot;BOOK_ID&quot; primaryKey=&quot;true&quot;/&gt;
+           &lt;Column columnName=&quot;AUTHOR&quot; propertyName=&quot;Writer&quot;/&gt;
+           &lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot;/&gt;
+       &lt;/Table
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithoptimisticconcurrencycontrol.html b/site/trunk/site-publish/rdb-das-cpp-workingwithoptimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..eda3f5a0c2
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithoptimisticconcurrencycontrol.html
@@ -0,0 +1,139 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithOptimisticConcurrencyControl</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69484">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithOptimisticConcurrencyControl">RDB DAS CPP - WorkingWithOptimisticConcurrencyControl</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithOptimisticConcurrencyControl-WorkingWithOptimisticConcurrencyControl"></A>WorkingWithOptimisticConcurrencyControl</H1>
+
+<P>The RDB DAS provides a straightforward mechanism for support of <A href="rdb-das-cpp-optimisticconcurrencycontrol.html" title="RDB DAS CPP - OptimisticConcurrencyControl">OptimisticConcurrencyControl</A>. To enable OCC a client must designate an integer version column in the configuration (usually via a config xml file). The following example is an example of a cofig file that identifies a version column:&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;</P>
+
+<P> &lt;Command name=&quot;select book 1&quot; SQL=&quot;select * from BOOK where BOOK_ID = 1&quot; kind=&quot;Select&quot;/&gt;</P>
+
+<P> &lt;Table tableName=&quot;BOOK&quot;&gt;<BR>
+ &lt;Column columnName=&quot;BOOK_ID&quot; primaryKey=&quot;true&quot;/&gt;<BR>
+ &lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;<BR>
+ &lt;/Table&gt;</P>
+
+<P> &lt;/Config&gt;</P>
+
+<P>This line in the config file &#95;&lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;_designates the column named &quot;OCC&quot; as the version column and also sets &quot;managed&quot; to true. The &quot;managed&quot; attribute has to do with how the version column is changed. In order for OCC to work, some agent must change the value of the version column each time the row is modified. A new value in the version column is what tells the DAS that the row has been modified. If a version column is &quot;managed&quot; then the DAS is responsible for incrementing the value of the column each time some column in the row is changed. The other option is &quot;managed= false&quot; and in this case, the DAS will assume some other agent is responsible for updating the version column. This other agent is likely to be the client application itself or the database via a trigger or some other mechanism.</P>
+
+<P>When applying changes made to a graph (see <A href="rdb-das-cpp-changesummaryprocessing.html" title="RDB DAS CPP - ChangeSummaryProcessing">ChangeSummaryProcessing</A>), the DAS will throw an exception if any table row has been modified since the row was read. For example, if a DAS client reads a row representing a specific Customer and then tries to update that Customer, the DAS will throw an exception if the Customer has already been modified by some other agent. The following example illustrates applying changes and checking for a collision failure:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">DAS* das = DASImpl::getFactory().createDAS(Config(<SPAN class="code-quote">&quot;ManagedBooksConfig.xml&quot;</SPAN>), getConnection());
+
+ <SPAN class="code-comment">// Read a book instance
+</SPAN> CommandPtr select = das-&gt;getCommand(<SPAN class="code-quote">&quot;select book 1&quot;</SPAN>);
+ DataObjectPtr root = select-&gt;executeQuery();
+ DataObjectPtr book = root-&gt;getDataObject(<SPAN class="code-quote">&quot;BOOK1&quot;</SPAN>);
+ book-&gt;setInt(<SPAN class="code-quote">&quot;QUANTITY&quot;</SPAN>, 2); <SPAN class="code-comment">// Try to apply changes and <SPAN class="code-keyword">catch</SPAN> potential update collision
+</SPAN>&nbsp;
+ <SPAN class="code-keyword">try</SPAN> {&nbsp;&nbsp;&nbsp; das.applyChanges(root);    } <SPAN class="code-keyword">catch</SPAN> (DASOptimisticConcurrencyControlException&amp;) { recover(); }
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-workingwithrelationships.html b/site/trunk/site-publish/rdb-das-cpp-workingwithrelationships.html
new file mode 100644
index 0000000000..36f8bbe02c
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-workingwithrelationships.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WorkingWithRelationships</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69485">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WorkingWithRelationships">RDB DAS CPP - WorkingWithRelationships</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WorkingWithRelationships-WorkingWithRelationships"></A>WorkingWithRelationships</H1>
+
+<P>As mentioned elsewhere in this guide, the RDB DAS provides a simple, implicit mapping from SDO Types/Properties to Relational Tables/Columns. So, in the absence of configuration to the otherwise, reading a table named CUSTOMER with columns NAME and ADDRESS will result in a data graph containing SDO DataObjects of Type CUSTOMER with properties NAME and ADDRESS.</P>
+
+<P>This is great for reading entities from a single table but clients often need to read data from related tables for example Customers and their related Orders. The RDB DAS can work with related database tables and reads that span tables produce graphs of related data objects. Continuing with our Customer-&gt;Order example, a client can read a set of Customers and related Orders by using a SELECT statement that includes a join as in the following example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DASImpl&#42; das = (DASImpl*) DASImpl::getFactory().createDAS(Config(&quot;CustomerOrderConfig.xml&quot;), getConnection());<BR>
+ // Read some customers and related orders<BR>
+CommandPtr select = das-&gt;createCommand(&quot;SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1&quot;);</P>
+
+<P> DataObjectPtr root = select-&gt;executeQuery();<BR>
+ DataObjectPtr customer = root-&gt;getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ DataObjectList&amp; orders = customer-&gt;getList(&quot;ORDERS&quot;);</P>
+
+<P>delete das;&nbsp;</P>
+</DIV></DIV>
+<P>You can see that the client can work with the data graph as a set of related objects. Once the application has a handle to a customer, it can reference that customers related orders by accessing the customers &quot;orders&quot; property.</P>
+
+<P>Notice that the example provides a config file as part of creating the DAS. This file contains mapping information that defines to the DAS how the queried tables are related. Here are the contents of the config file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;&gt;
+
+     &lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Table tableName=&quot;ANORDER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Relationship name=&quot;orders&quot; primaryKeyTable=&quot;CUSTOMER&quot; foreignKeyTable=&quot;ANORDER&quot; many=&quot;true&quot;&gt;
+        &lt;KeyPair primaryKeyColumn=&quot;ID&quot; foreignKeyColumn=&quot;CUSTOMER_ID&quot;/&gt;
+     &lt;/Relationship&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This config file specifies the primary keys of the related tables and then the relationship between them. It also provides a convenient name for the relationship. In short, this config specifies that the CUSTOMER table and ANORDER table are related via ANORDERs column named &quot;CUSTOMER_ID&quot; which references CUSTOMERS column named &quot;ID&quot;. The name of the relationship is &quot;orders&quot;</P>
+
+<P>As a side note, the config in this example is not required since the table definitions follow a &quot;convention&quot; recognized by the DAS. See <A href="rdb-das-cpp-workingwithconventions.html" title="RDB DAS CPP - WorkingWithConventions">WorkingWithConventions</A>. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-cpp-writeoperationordering.html b/site/trunk/site-publish/rdb-das-cpp-writeoperationordering.html
new file mode 100644
index 0000000000..a9db00817d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-cpp-writeoperationordering.html
@@ -0,0 +1,121 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS CPP - WriteOperationOrdering</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69446">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-c.html" title="DAS C++">DAS C++</A>&nbsp;&gt;&nbsp;<A href="das-c-documentation-menu.html" title="DAS C++ Documentation Menu">DAS C++ Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="rdb-das-c-user-guide.html" title="RDB DAS C++ - User Guide">RDB DAS C++ - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS CPP - WriteOperationOrdering">RDB DAS CPP - WriteOperationOrdering</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RDBDASCPP-WriteOperationOrdering-%26nbsp%3BWriteOperationOrdering"></A>&nbsp;WriteOperationOrdering</H1>
+
+<P>Relational databases often use <A href="http://en.wikipedia.org/wiki/Referential_integrity" class="external-link" rel="nofollow">Referential Integrity (RI)</A>constraints to maintain database consistency. When RI is enabled, database operations must be performed in a specific order that prevents invalid references. If this order is not adhered to then the database will throw an exception rather than let the write succeed.</P>
+
+<P>When an application makes modifications to a data graph and then asks the RDB DAS to &quot;apply changes&quot;, the DAS will create a &quot;batch&quot; of database writes that must be sorted and then executed in the correct order to avoid RI Constraint exceptions. A simple example will help here. Assume a database with two tables CUSTOMER and ORDER. Also assume that the ORDER table has a <A href="http://en.wikipedia.org/wiki/Foreign_key" class="external-link" rel="nofollow">foreign key</A>reference to the CUSTOMER table. Now assume that the application has made modifications to a data graph that was retrieved by the DAS using a SELECT statement like the following:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>SELECT * FROM CUSTOMER LEFT JOIN ORDER ON CUSTOMER.ID = ORDER.CUSTOMER_ID WHERE CUSTOMER.NAME = 'Tuscany'
+</PRE>
+</DIV></DIV>
+<P>The resulting data graph will contain all matching customers as well as their related orders. Now assume the application uses the SDO API's to delete some customer from the graph and then also deletes the related orders. Although the application deleted the customer first, the DAS must delete the orders first from the database since deleting the customer, with existing referencing orders, would violate the RI constraints and result in an exception. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-faq.html b/site/trunk/site-publish/rdb-das-faq.html
new file mode 100644
index 0000000000..4dd198d214
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-faq.html
@@ -0,0 +1,121 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>RDB DAS - FAQ</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - FAQ">RDB DAS - FAQ</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">RDB DAS - FAQ</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50994">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50994">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=50994">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=50994">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=50994">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=50994">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 06, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>This page will contain frequently asked questions about RDB DAS. Please use the following template to further enhance this page.</P>
+
+<H4><A name="RDBDAS-FAQ-questiontext"></A>question text</H4>
+<P>answer</P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-ideas-wish-lists-todos-etc.html b/site/trunk/site-publish/rdb-das-ideas-wish-lists-todos-etc.html
new file mode 100644
index 0000000000..a1d1083ecc
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-ideas-wish-lists-todos-etc.html
@@ -0,0 +1,209 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS - Ideas, Wish Lists, Todos, etc</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51242">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - Ideas, Wish Lists, Todos, etc">RDB DAS - Ideas, Wish Lists, Todos, etc</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=55092" class="createlink">FAQ</A><BR>
+<A href="rdb-das-releases.html" title="RDB DAS Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS&linkCreation=true&fromPageId=55092" class="createlink">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<A href="rdb-das-architecture-guide.html" title="RDB DAS architecture guide">Architecture Guide</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/das-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="RDBDAS-Ideas%2CWishLists%2CTodos%2Cetc-Overview"></A>Overview</H2>
+
+<P>This is a place to store ideas, wish list and todos and anything that we might review while working for the future of DAS.</P>
+
+<H2><A name="RDBDAS-Ideas%2CWishLists%2CTodos%2Cetc-WhishList%3AJIRAS"></A>Whish List: JIRAS</H2>
+
+<UL>
+	<LI><A href="http://issues.apache.org/jira/browse/TUSCANY-800" class="external-link" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-800</A></LI>
+	<LI><A href="http://issues.apache.org/jira/browse/TUSCANY-863" class="external-link" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-863</A></LI>
+	<LI><A href="http://issues.apache.org/jira/browse/TUSCANY-864" class="external-link" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-864</A></LI>
+</UL>
+
+
+<H2><A name="RDBDAS-Ideas%2CWishLists%2CTodos%2Cetc-Functionality"></A>Functionality</H2>
+
+<UL>
+	<LI>Core functions
+	<UL>
+		<LI>Optimisc concurrency control
+		<UL>
+			<LI>managed collision column (DLINK &quot;version&quot; column)</LI>
+		</UL>
+		</LI>
+		<LI>Static dataObjects - Relationships
+		<UL>
+			<LI>1..1
+			<UL>
+				<LI>&quot;unique&quot; attribute (similar to DLINQ)</LI>
+			</UL>
+			</LI>
+		</UL>
+		</LI>
+		<LI>Explicit resultSetShape definition</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Miscellaneous
+	<UL>
+		<LI>Samples
+		<UL>
+			<LI>Better BigBank integration</LI>
+			<LI>Other samples to exercise DAS festures</LI>
+		</UL>
+		</LI>
+		<LI>GraphHelper
+		<UL>
+			<LI>emptyGraph()</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Future releases
+	<UL>
+		<LI>C++ DAS implementation</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="RDBDAS-Ideas%2CWishLists%2CTodos%2Cetc-PossibleDASsubprojects"></A>Possible DAS sub-projects</H2>
+
+<UL>
+	<LI><A href="http://wiki.apache.org/ws/Tuscany/TuscanyJava/DAS_Java_Overview/DAS_Subprojects" class="external-link" rel="nofollow">http://wiki.apache.org/ws/Tuscany/TuscanyJava/DAS_Java_Overview/DAS_Subprojects</A>
+	<UL>
+		<LI>This is a response to the following wiki post <A href="http://wiki.apache.org/ws/Tuscany/CommunityBuilding" class="external-link" rel="nofollow">http://wiki.apache.org/ws/Tuscany/CommunityBuilding</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-java-beta1-incubating.html b/site/trunk/site-publish/rdb-das-java-beta1-incubating.html
new file mode 100644
index 0000000000..3dbccc4e1d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java-beta1-incubating.html
@@ -0,0 +1,200 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS Java beta1-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56768">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-releases.html" title="RDB DAS Releases">RDB DAS Releases</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS Java beta1-incubating">RDB DAS Java beta1-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="RDBDASJavabeta1-incubating-RDBDASJavabeta1incubating"></A>RDB DAS Java beta1-incubating</H3>
+
+<P>RDB DAS Java beta1-incubating was released in June 2007.</P>
+
+<P>This release represents a significant milestone on the road to Apache Tuscany DAS 1.0 release. </P>
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>Optimisc concurrency control</LI>
+		<LI>Default OCC policy (all OCC-capable fileds used in overquaified &quot;where&quot;) (TUSCANY-866)</LI>
+		<LI>DAS Configuration supports ConnectionInfo for J2SE environment (TUSCANY-948)</LI>
+		<LI>DAS supports queries that reference tables in multiple schema (TUSCANY-952)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Creation and initialization of database for DAS samples (TUSCANY-863)</LI>
+		<LI>Sample with Advanced DAS features Demo (TUSCANY-800)</LI>
+		<LI>Sample with J2SE application using DAS (samples/customer)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Documentation
+	<UL>
+		<LI>More sections added to DAS User's Guide</LI>
+		<LI>Javadoc available</LI>
+		<LI>Added FAQs</LI>
+		<LI>Added &quot;Starting with DAS&quot; Guide to help user get started with using different DAS features</LI>
+		<LI>Added DAS Architecture Guide</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>For full detail about the release see the <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="RDBDASJavabeta1-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="RDBDASJavabeta1-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-da-beta1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-java-das-beta1-release.html b/site/trunk/site-publish/rdb-das-java-das-beta1-release.html
new file mode 100644
index 0000000000..112ce90a1c
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java-das-beta1-release.html
@@ -0,0 +1,822 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS - Java DAS Beta1 Release</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51909">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - Java DAS Beta1 Release">RDB DAS - Java DAS Beta1 Release</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=55092" class="createlink">FAQ</A><BR>
+<A href="rdb-das-releases.html" title="RDB DAS Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS&linkCreation=true&fromPageId=55092" class="createlink">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<A href="rdb-das-architecture-guide.html" title="RDB DAS architecture guide">Architecture Guide</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/das-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+
+
+<H3><A name="RDBDAS-JavaDASBeta1Release-Ongoingworkitems."></A>Ongoing work items.</H3>
+
+<P><B>Remaining Items</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Item</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-863" class="external-link" rel="nofollow">JIRA-863</A> </TD>
+<TD class="confluenceTd"> Canned DB creation </TD>
+<TD class="confluenceTd"> Done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-800" class="external-link" rel="nofollow">JIRA-800</A> </TD>
+<TD class="confluenceTd"> DAS Features Demo </TD>
+<TD class="confluenceTd"> Done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-952" class="external-link" rel="nofollow">JIRA-952</A> </TD>
+<TD class="confluenceTd"> Multiple-schema support </TD>
+<TD class="confluenceTd"> Done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-1295" class="external-link" rel="nofollow">JIRA-1295</A> </TD>
+<TD class="confluenceTd"> Memory leak in DAS and test framework </TD>
+<TD class="confluenceTd"> defered </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-1300" class="external-link" rel="nofollow">JIRA-1300</A> </TD>
+<TD class="confluenceTd"> Integrate Companyweb sample with DBConfig </TD>
+<TD class="confluenceTd"> Done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://issues.apache.org/jira/browse/TUSCANY-1304" class="external-link" rel="nofollow">JIRA-1304</A> </TD>
+<TD class="confluenceTd"> OCC Error when multiple updates </TD>
+<TD class="confluenceTd"> Done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="https://issues.apache.org/jira/browse/TUSCANY-1323" class="external-link" rel="nofollow">JIRA-1323</A></TD>
+<TD class="confluenceTd"> dbConfig testcase failure after SDO commits </TD>
+<TD class="confluenceTd"> Done</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<P><B>Documentation</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Num</B> </TD>
+<TD class="confluenceTd"> <B>Title</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> user guide update </TD>
+<TD class="confluenceTd"> some pages are added/update, some work is still pending </TD>
+<TD class="confluenceTd"> in-progress </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> architecture guide </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> To be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3 </TD>
+<TD class="confluenceTd"> deveoper guide </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> in-progress </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 4 </TD>
+<TD class="confluenceTd"> starting with DAS </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> under review </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 5 </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/RDB%20DAS-javadoc" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS-javadoc</A> </TD>
+<TD class="confluenceTd"> give link </TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 6 </TD>
+<TD class="confluenceTd"> What's new? </TD>
+<TD class="confluenceTd"> list new features in this release </TD>
+<TD class="confluenceTd"> under review </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 7 </TD>
+<TD class="confluenceTd"> Downloads </TD>
+<TD class="confluenceTd"> add links after 1st RC </TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 8 </TD>
+<TD class="confluenceTd"> New-Useful Links </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 9 </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/RDB%20DAS%20-%20Releases" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS+-+Releases</A> </TD>
+<TD class="confluenceTd"> Make this page in sync with what is going out in M3 </TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 10 </TD>
+<TD class="confluenceTd"> <A href="http://cwiki.apache.org/confluence/display/TUSCANY/RDB%20DAS%20Java%20-%20FAQ" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS+Java+-+FAQ</A> </TD>
+<TD class="confluenceTd"> add details </TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 11 </TD>
+<TD class="confluenceTd"> Capabilities(How To)<BR class="atl-forced-newline">
+ &#45;DAS support for J2SE environment<BR class="atl-forced-newline">
+ &#45;content for Explicit Create/Update/Delete<BR class="atl-forced-newline">
+ &#45;content for Explicit Result Set Shape definition<BR class="atl-forced-newline">
+ &#45;Graph Merger </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> under review </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 12 </TD>
+<TD class="confluenceTd"> Samples (See Capabilities In Use) </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> under review </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><B>Other</B></P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Num</B> </TD>
+<TD class="confluenceTd"> <B>Title</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 1 </TD>
+<TD class="confluenceTd"> Distribution Layout </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> In-progress </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2 </TD>
+<TD class="confluenceTd"> RAT </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> to be done </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="RDBDAS-JavaDASBeta1Release-UnresolvedJavaDASJIRAs"></A>Unresolved Java DAS JIRAs</H1>
+
+<P>The table below contains the listed JIRAs for Java DAS that are actually(04/18/2007) unresolved. It must be decided which JIRA should be resolved before M3 release and which should be postponed for next.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1027 </TD>
+<TD class="confluenceTd"> DAS should throw a meaningful exception if applyChanges process encounters a DO with no defined PK </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 04/Jan/07 </TD>
+<TD class="confluenceTd"> 10/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-864 </TD>
+<TD class="confluenceTd"> Better integration between SCA and DAS </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 09/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-961 </TD>
+<TD class="confluenceTd"> DAS: Using deprected SDO method causes Type lookup failure </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 30/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1010 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit CUD testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1009 </TD>
+<TD class="confluenceTd"> Adding/Enhancing name mapping testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1014 </TD>
+<TD class="confluenceTd"> Add/Enhance convention over configuration testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1012 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit resultSetShape testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1011 </TD>
+<TD class="confluenceTd"> Add/Enhance external transactions test cases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1015 </TD>
+<TD class="confluenceTd"> Add/Enhance graphhelper testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-986 </TD>
+<TD class="confluenceTd"> DAS integration with SDO 2.1 APIs </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 11/Dec/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-915 </TD>
+<TD class="confluenceTd"> User level documentation </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-916 </TD>
+<TD class="confluenceTd"> OCC recovery framework </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-953 </TD>
+<TD class="confluenceTd"> Invalid data graph results in NPE on applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-542 </TD>
+<TD class="confluenceTd"> Pager API needs some work </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 13/Jul/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-233 </TD>
+<TD class="confluenceTd"> Case sensitivity   DAS config file </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Rick Rineholt </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 26/Apr/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sub-task </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-904 </TD>
+<TD class="confluenceTd"> TUSCANY-864 <BR class="atl-forced-newline">
+ Expose DAS as SCA container </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Amita Vadhavkar </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 07/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Feb/07 </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="RDBDAS-JavaDASBeta1Release-InProgressJavaDASJIRAs"></A>In-Progress Java DAS JIRAs</H1>
+
+<P>The table below contains the list of JIRAs for DAS that are in-progess(04/20/2007) and will be resolved in next couple of days. Removed the same ones from Unresolved Java DAS JIRAs.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H1><A name="RDBDAS-JavaDASBeta1Release-ResolvedJavaDASJIRAs"></A>Resolved Java DAS JIRAs</H1>
+
+<P>The table below contains the listed JIRAs for DAS Java that were resolved/closed since last release: Java DAS M2 released on November 20th, 2006. It will be included as the fixed bugs and new features in Java DAS M3 release documentation.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-866 </TD>
+<TD class="confluenceTd"> <A href="das.html" title="DAS">DAS</A> Use overqualified update by default </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Oct/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-954 </TD>
+<TD class="confluenceTd"> Need to throw an exception when users try to set a relationship and FK property </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-968 </TD>
+<TD class="confluenceTd"> Invalid FK columns causes NPE </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1087 </TD>
+<TD class="confluenceTd"> DAS should not commit individual commands as part of applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Closed </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-841 </TD>
+<TD class="confluenceTd"> Need a test for relationships formed by compound keys </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 14/Oct/06 </TD>
+<TD class="confluenceTd"> 24/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-898 </TD>
+<TD class="confluenceTd"> Expose DAS as a SCA service </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Nov/06 </TD>
+<TD class="confluenceTd"> 03/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-971 </TD>
+<TD class="confluenceTd"> DAS may not now depend on CPL if EMF has completed migration to EPL </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-937 </TD>
+<TD class="confluenceTd"> Multiple test failures while connecting with MySQL </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 16/Nov/06 </TD>
+<TD class="confluenceTd"> 21/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-948 </TD>
+<TD class="confluenceTd"> Consider DAS config connection info for J2SE environment </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 22/Nov/06 </TD>
+<TD class="confluenceTd"> 10/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1008 </TD>
+<TD class="confluenceTd"> Adding/Enhancing PartialUpdates testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1041 </TD>
+<TD class="confluenceTd"> DAS Needs a JavaDoc distribution </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-886 </TD>
+<TD class="confluenceTd"> DAS distributions should unpack into it's own directory based on the version </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Oct/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-441 </TD>
+<TD class="confluenceTd"> Remove DAS use of Class variable to trigger logging. </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Jun/06 </TD>
+<TD class="confluenceTd"> 07/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-957 </TD>
+<TD class="confluenceTd"> DAS generates invalid INSERT statement when no properties are set on the new DO </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 29/Nov/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-1013 </TD>
+<TD class="confluenceTd"> Add/Enhance configHelper testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 09/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> TUSCANY-939 </TD>
+<TD class="confluenceTd"> DAS Should throw an exception when ResultSetMetadata is invalid </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-863 </TD>
+<TD class="confluenceTd"> CompanyWeb DAS Sample should create and initialize the canned database when app is loaded by first time and db is not available </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 29/May/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-952 </TD>
+<TD class="confluenceTd"> DAS must support queries that reference tables in different &quot;schemas&quot; </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 29/May/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-800 </TD>
+<TD class="confluenceTd"> Introduce new DAS Sample APP to demonstrate DAS advanced features </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> FIXED </TD>
+<TD class="confluenceTd"> 05/Oct/06 </TD>
+<TD class="confluenceTd"> 08/June/07 </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-java-das-m3-release.html b/site/trunk/site-publish/rdb-das-java-das-m3-release.html
new file mode 100644
index 0000000000..f6480df3a5
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java-das-m3-release.html
@@ -0,0 +1,770 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>RDB DAS - Java DAS M3 Release : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51909">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - Java DAS M3 Release">RDB DAS - Java DAS M3 Release</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="rdb-das-java-faq.html" title="RDB DAS Java - FAQ">FAQ</A><BR>
+<A href="rdb-das-releases.html" title="RDB DAS - Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das.html" title="What's New in DAS">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<A href="architecture-guide.html" title="Architecture Guide">Architecture Guide</A><BR>
+<A href="das-java-project.html" title="DAS Java Project">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" title="Create Page: Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="RDBDAS-JavaDASM3Release-UnresolvedJavaDASJIRAs"></A>Unresolved Java DAS JIRAs</H1>
+
+<P>The table below contains the listed JIRAs for Java DAS that are actually(04/18/2007) unresolved. It must be decided which JIRA should be resolved before M3 release and which should be postponed for next.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug <BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1027 </TD>
+<TD class="confluenceTd"> DAS should throw a meaningful exception if applyChanges process encounters a DO with no defined PK </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 04/Jan/07 </TD>
+<TD class="confluenceTd"> 10/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-864 </TD>
+<TD class="confluenceTd"> Better integration between SCA and DAS </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 09/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-961 </TD>
+<TD class="confluenceTd"> DAS: Using deprected SDO method causes Type lookup failure </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 30/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1010 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit CUD testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1009 </TD>
+<TD class="confluenceTd"> Adding/Enhancing name mapping testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1014 </TD>
+<TD class="confluenceTd"> Add/Enhance convention over configuration testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1012 </TD>
+<TD class="confluenceTd"> Add/Enhance explicit resultSetShape testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1011 </TD>
+<TD class="confluenceTd"> Add/Enhance external transactions test cases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1015 </TD>
+<TD class="confluenceTd"> Add/Enhance graphhelper testcases </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 16/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-986 </TD>
+<TD class="confluenceTd"> DAS integration with SDO 2.1 APIs </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 11/Dec/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-915 </TD>
+<TD class="confluenceTd"> User level documentation </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature<BR clear="all"> </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-916 </TD>
+<TD class="confluenceTd"> OCC recovery framework </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 10/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-953 </TD>
+<TD class="confluenceTd"> Invalid data graph results in NPE on applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-542 </TD>
+<TD class="confluenceTd"> Pager API needs some work </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 13/Jul/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-233 </TD>
+<TD class="confluenceTd"> Case sensitivity   DAS config file </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Rick Rineholt </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 26/Apr/06 </TD>
+<TD class="confluenceTd"> 17/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Sub-task </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-904 </TD>
+<TD class="confluenceTd"> TUSCANY-864 <BR clear="all">
+ Expose DAS as SCA container </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Amita Vadhavkar </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 07/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Feb/07 </TD>
+</TR>
+</TBODY></TABLE>
+
+<H1><A name="RDBDAS-JavaDASM3Release-InProgressJavaDASJIRAs"></A>In-Progress Java DAS JIRAs</H1>
+
+<P>The table below contains the list of JIRAs for DAS that are in-progess(04/20/2007) and will be resolved in next couple of days. Removed the same ones from Unresolved Java DAS JIRAs.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">  New Feature </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-800 </TD>
+<TD class="confluenceTd"> Introduce new DAS Sample APP to demonstrate DAS advanced features </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 05/Oct/06 </TD>
+<TD class="confluenceTd"> 10/Apr/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-863 </TD>
+<TD class="confluenceTd"> CompanyWeb DAS Sample should create and initialize the canned database when app is loaded by first time and db is not available </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 16/Oct/06 </TD>
+<TD class="confluenceTd"> 17/Apr/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-952 </TD>
+<TD class="confluenceTd"> DAS must support queries that reference tables in different &quot;schemas&quot; </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Open </TD>
+<TD class="confluenceTd"> UNRESOLVED </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 01/Mar/07 </TD>
+</TR>
+</TBODY></TABLE>
+
+<H1><A name="RDBDAS-JavaDASM3Release-ResolvedJavaDASJIRAs"></A>Resolved Java DAS JIRAs</H1>
+
+<P>The table below contains the listed JIRAs for DAS Java that were resolved/closed since last release: Java DAS M2 released on November 20th, 2006. It will be included as the fixed bugs and new features in Java DAS M3 release documentation.</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>T</B> </TD>
+<TD class="confluenceTd"> <B>Patch Info</B> </TD>
+<TD class="confluenceTd"> <B>Key</B> </TD>
+<TD class="confluenceTd"> <B>Summary</B> </TD>
+<TD class="confluenceTd"> <B>Assignee</B> </TD>
+<TD class="confluenceTd"> <B>Reporter</B> </TD>
+<TD class="confluenceTd"> <B>Pr</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+<TD class="confluenceTd"> <B>Res</B> </TD>
+<TD class="confluenceTd"> <B>Created</B> </TD>
+<TD class="confluenceTd"> <B>Updated</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-866 </TD>
+<TD class="confluenceTd"> <A href="das.html" title="DAS">DAS</A> Use overqualified update by default </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Oct/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-954 </TD>
+<TD class="confluenceTd"> Need to throw an exception when users try to set a relationship and FK property </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Nov/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-968 </TD>
+<TD class="confluenceTd"> Invalid FK columns causes NPE </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1087 </TD>
+<TD class="confluenceTd"> DAS should not commit individual commands as part of applyChanges </TD>
+<TD class="confluenceTd"> Unassigned </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Closed </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+<TD class="confluenceTd"> 01/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> Patch Available </TD>
+<TD class="confluenceTd"> TUSCANY-841 </TD>
+<TD class="confluenceTd"> Need a test for relationships formed by compound keys </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 14/Oct/06 </TD>
+<TD class="confluenceTd"> 24/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-898 </TD>
+<TD class="confluenceTd"> Expose DAS as a SCA service </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Nov/06 </TD>
+<TD class="confluenceTd"> 03/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-971 </TD>
+<TD class="confluenceTd"> DAS may not now depend on CPL if EMF has completed migration to EPL </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-937 </TD>
+<TD class="confluenceTd"> Multiple test failures while connecting with MySQL </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 16/Nov/06 </TD>
+<TD class="confluenceTd"> 21/Nov/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-948 </TD>
+<TD class="confluenceTd"> Consider DAS config connection info for J2SE environment </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 22/Nov/06 </TD>
+<TD class="confluenceTd"> 10/Feb/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1008 </TD>
+<TD class="confluenceTd"> Adding/Enhancing PartialUpdates testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> New Feature </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1041 </TD>
+<TD class="confluenceTd"> DAS Needs a JavaDoc distribution </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+<TD class="confluenceTd"> 09/Jan/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-886 </TD>
+<TD class="confluenceTd"> DAS distributions should unpack into it's own directory based on the version </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 28/Oct/06 </TD>
+<TD class="confluenceTd"> 04/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-441 </TD>
+<TD class="confluenceTd"> Remove DAS use of Class variable to trigger logging. </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 05/Jun/06 </TD>
+<TD class="confluenceTd"> 07/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Bug </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-957 </TD>
+<TD class="confluenceTd"> DAS generates invalid INSERT statement when no properties are set on the new DO </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 29/Nov/06 </TD>
+<TD class="confluenceTd"> 05/Dec/06 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Test </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-1013 </TD>
+<TD class="confluenceTd"> Add/Enhance configHelper testcases </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd"> Luciano Resende </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 21/Dec/06 </TD>
+<TD class="confluenceTd"> 09/Mar/07 </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Improvement </TD>
+<TD class="confluenceTd"> <BR clear="all"> </TD>
+<TD class="confluenceTd"> TUSCANY-939 </TD>
+<TD class="confluenceTd"> DAS Should throw an exception when ResultSetMetadata is invalid </TD>
+<TD class="confluenceTd"> Brent Daniel </TD>
+<TD class="confluenceTd"> Kevin Williams </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd"> Resolved </TD>
+<TD class="confluenceTd"> Fixed </TD>
+<TD class="confluenceTd"> 17/Nov/06 </TD>
+<TD class="confluenceTd"> 27/Nov/06 </TD>
+</TR>
+</TBODY></TABLE>
+
+<P>The above tables will be updated when JIRA status changes in ASF-JIRA</P>
+
+<H3><A name="RDBDAS-JavaDASM3Release-Ongoingworkitems."></A>Ongoing work items.</H3>
+
+<P><B>Code</B></P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Num</B> </TD>
+<TD class="confluenceTd"> <B>Title</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">1</TD>
+<TD class="confluenceTd">JIRA-863</TD>
+<TD class="confluenceTd">Canned DB creation</TD>
+<TD class="confluenceTd"> committed, status needs to reflect this in ASF-JIRA site</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">2</TD>
+<TD class="confluenceTd">JIRA-800</TD>
+<TD class="confluenceTd">DAS Features Demo</TD>
+<TD class="confluenceTd"> final review in-progress, no pending issues</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">3</TD>
+<TD class="confluenceTd">JIRA-952</TD>
+<TD class="confluenceTd">Multiple-schema support</TD>
+<TD class="confluenceTd"> depends on JIRA-1295, code changes for JIRA-952 are reviewed</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">4</TD>
+<TD class="confluenceTd">JIRA-1295</TD>
+<TD class="confluenceTd">Memory leak in DAS and test framework</TD>
+<TD class="confluenceTd"> in-progress</TD>
+</TR>
+</TBODY></TABLE>
+
+<P><B>Documentation</B></P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Num</B> </TD>
+<TD class="confluenceTd"> <B>Title</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">1</TD>
+<TD class="confluenceTd">user guide update </TD>
+<TD class="confluenceTd">some pages are added/update, some work is still pending</TD>
+<TD class="confluenceTd">in-progress</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">2</TD>
+<TD class="confluenceTd">architecture guide</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">To be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">3</TD>
+<TD class="confluenceTd">deveoper guide</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">in-progress</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">4</TD>
+<TD class="confluenceTd">starting with DAS</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">under review</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">5</TD>
+<TD class="confluenceTd">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS-javadoc</TD>
+<TD class="confluenceTd">give link</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">6</TD>
+<TD class="confluenceTd">What's new?</TD>
+<TD class="confluenceTd">list new features in this release</TD>
+<TD class="confluenceTd">under review</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">7</TD>
+<TD class="confluenceTd">Downloads</TD>
+<TD class="confluenceTd">add links after 1st RC</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">8</TD>
+<TD class="confluenceTd">New-Useful Links</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">9</TD>
+<TD class="confluenceTd">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS+-+Releases</TD>
+<TD class="confluenceTd">Make this page in sync with what is going out in M3</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">10</TD>
+<TD class="confluenceTd">http://cwiki.apache.org/confluence/display/TUSCANY/RDB+DAS+Java+-+FAQ</TD>
+<TD class="confluenceTd">add details</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">11</TD>
+<TD class="confluenceTd">Capabilities(How To)<BR>
+-DAS support for J2SE environment<BR>
+-content for Explicit Create/Update/Delete<BR>
+-content for Explicit Result Set Shape definition<BR>
+-Graph Merger</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">under review</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">12</TD>
+<TD class="confluenceTd">Samples (See Capabilities In Use)</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">under review</TD>
+</TR>
+</TBODY></TABLE>
+
+<P><B>Note</B> In FAQs can add below and more...<BR>
+Can add below list:-<BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg04822.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg04822.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16300.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16300.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16711.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16711.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg01162.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg01162.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16520.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg16520.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg00589.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg00589.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg06635.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg06635.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   How to create non containment association ?<BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg12091.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg12091.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg17136.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg17136.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg05860.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg05860.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg17146.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg17146.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg04672.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg04672.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg09827.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg09827.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+   <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg09571.html" title="Visit page outside Confluence" rel="nofollow">http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg09571.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P><B>Other</B></P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> <B>Num</B> </TD>
+<TD class="confluenceTd"> <B>Title</B> </TD>
+<TD class="confluenceTd"> <B>Details</B> </TD>
+<TD class="confluenceTd"> <B>Status</B> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">1</TD>
+<TD class="confluenceTd">Distribution Layout</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">In-progress</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">2</TD>
+<TD class="confluenceTd">RAT</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">to be done</TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-java-faq.html b/site/trunk/site-publish/rdb-das-java-faq.html
new file mode 100644
index 0000000000..9c8bf1c080
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java-faq.html
@@ -0,0 +1,202 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>RDB DAS Java - FAQ : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50994">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS Java - FAQ">RDB DAS Java - FAQ</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="" title="RDB DAS Java - FAQ">FAQ</A><BR>
+<A href="rdb-das-releases.html" title="RDB DAS - Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="whats-new-in-das.html" title="What's New in DAS">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20architecture%20guide&linkCreation=true&fromPageId=55092" title="Create Page: RDB DAS architecture guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-project.html" title="DAS Java Project">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" title="Create Page: Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>This page will contain frequently asked questions about RDB DAS. Please use the following template to further enhance this page.</P>
+
+<H4><A name="RDBDASJava-FAQ-HowdoesDASimplementinternal%2Fexternaltransactionmanagement%3F"></A>How does DAS implement internal/external transaction management?</H4>
+
+<P>In DAS Config, element ConnectionInfo has a boolean attribute managedtx (default true). <BR>
+If it is true, DAS runtime manages transaction otherwise the caller is supposed to manage<BR>
+transaction.<BR>
+In cases, when the connection is externally passed (config file does not specify ConnectionInfo),<BR>
+the managedtx attribute default value ( true) is assumed.</P>
+
+
+<H4><A name="RDBDASJava-FAQ-Iftwotableshaveaparentchildrelationshipbutthequeryresultsetcontainsonlycolumnsfromonetable%2CdoesRDBDASresultDataGraphcontaindatafrombothparentandchildtable%3F"></A>If two tables have a parent-child relationship but the query result set contains only columns from one table, does RDB DAS result DataGraph contain data from both parent and child table?</H4>
+
+<P>The RDB DAS will only populate a graph with data returned from the used query. If you want a <BR>
+graph that contains data from related tables then the query provided must return that data <BR>
+(typically a join). The relationship tests in the test suite demonstrate this.</P>
+
+<H4><A name="RDBDASJava-FAQ-Iftwotableshaveaparentchildrelationshipandthequeryresultsetcontainscolumnsfrombothtables%2CistherelationshipanalyzedbyDASwhen%2C"></A>If two tables have a parent-child relationship and the query result set contains columns from both tables, is the relationship analyzed by DAS when, </H4>
+<OL>
+	<LI>DAS Config explicitly defines relationship</LI>
+	<LI>DAS Config does not explicitly define relationship?</LI>
+</OL>
+
+
+<P>DAS supports some Convention over Configuration when it comes to supporting implied relationships.<BR>
+<SPAN class="nobr"><A href="conventionoverconfiguration.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="foreignkeyrepresentationandmanagement.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ForeignKeyRepresentationAndManagement<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="workingwithrelationships.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithRelationships<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+Also, see test: ImpliedRelationshipTests.testAddNewOrder() </P>
+
+<P>So, in summary, if the query has a where clause specifying the relationship, there is no need to <BR>
+have any relationship definition in config file as long as the column names (PK, FK) follow the<BR>
+naming conventions. </P>
+
+<P>In the absence of naming conventions, the relationship needs to be explicitly defined in the config,<BR>
+so that the query result is mapped against it and the necessary result DataGraph is represented <BR>
+reflecting the relationship.</P>
+
+<H4><A name="RDBDASJava-FAQ-AsDAS%28andSDO%29supportdisconnectedprocessingofdata%2ChowdoesDASachievemappingbetweenDataGraphpropertiesandDatabaseMetadataliketablename%2Ccolumnnameetc.%3F"></A>As DAS (and SDO) support disconnected processing of data, how does DAS achieve mapping between DataGraph properties and Database Metadata like table name, column name etc.?</H4>
+
+<P>DAS supports this mapping using DAS Config and in the absence of that using Convention over Configuration.<BR>
+<SPAN class="nobr"><A href="conventionoverconfiguration.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/ConventionOverConfiguration<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. DataObject graph<BR>
+change summary contains old as well as modified values. Using this change summary and config/conventions DAS can support the necessary mapping. </P>
+
+<H4><A name="RDBDASJava-FAQ-DoesDASsupportworkingwithtablesthathavenoPKdefined%3F"></A>Does DAS support working with tables that have no PK defined?</H4>
+
+<P>DAS mandates PK for any table, either specified in DAS Config or by following convention. In absence <BR>
+of both of these, DAS throws an error.</P>
+
+<H4><A name="RDBDASJava-FAQ-HowdoesDASsupportdatabasegeneratedkeys%3F"></A>How does DAS support database generated keys?</H4>
+
+<P>This is supported for INSERT operation - either explicit insert (SQL INSERT statement as DAS command) or generated insert. <BR>
+In case of generated insert, the DAS config needs to have Column element having attribute &quot;generated&quot; set to &quot;true&quot;. This attribute is not needed in case of explicit insert.<BR>
+In case of generated insert, &quot;generated&quot; attribute from Column element in Config is checked to form the appropriate insert statement. The jdbc supported PreparedStatement.getGeneratedKeys() is used to fetch the values being generated by the database. In case of generated insert, the value thus returned is set in DataGraph.</P>
+
+<P>This feature is not supported on all versions of Oracle drivers, so DAS does not use this functionality if database is Oracle.</P>
+
+<H4><A name="RDBDASJava-FAQ-WhatmanipulationsdoesDASprovideforDataObjects%3F"></A>What manipulations does DAS provide for DataObjects?</H4>
+
+<P>DAS can get DataObject using Dynamic approach or Static approach. In Dynamic approach the query result set is used to form the DataObject. In static approach, DAS Config's DataObjectModel attribute needs a valid value, using which the DataObjects are created.<BR>
+For more details see <SPAN class="nobr"><A href="graph-merge.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/Graph+Merge<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H4><A name="RDBDASJava-FAQ-Whenthereis1%3Anrelationshipbetween2tables%2CsayDepartment%3AEmployee%2CandthereisaDataGraphwiththisrelationshippresent%2CcanoneEmployeeDataObjectfromthisgraphbeassociatedwith2differentDepartmentDataObjects%2C..."></A>When there is 1:n relationship between 2 tables, say Department:Employee, and there is a DataGraph with this relationship present, can one Employee DataObject from this graph be associated with 2 different Department DataObjects, using DAS Java Client? i.e. can 1:n relationship be changed to n:n using SDO?</H4>
+
+<P>No, when this is attempted, SDO maintains referential integrity. e.g.<BR>
+If you have a dept1 with emp1 and then execute:<BR>
+   dep2.getEmployees.add(emp1)<BR>
+the graph will automatically remove emp1 from dep1's list of employees and<BR>
+you are left with valid 1:m relationship.</P>
+
+<H4><A name="RDBDASJava-FAQ-WhatisOptimisticConcurrencyControl%3F"></A>What is Optimistic Concurrency Control?</H4>
+<P>See details on <SPAN class="nobr"><A href="optimisticconcurrencycontrol.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/OptimisticConcurrencyControl<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>By default OCC is ON. With this, in generated UPDATE statement, any column undergoing change also gets included in the WHERE clause.</P>
+
+<P>Other than that, in DAS Config, in &lt;Table&gt; element , the &lt;Column&gt; element can have two boolean attributes:- managed(default true), collision</P>
+
+<P>When collision=true for a column, during UPDATE statement generation, that column is included<BR>
+in the WHERE clause.</P>
+
+<P>When managed=true for a column, during UPDATE statement generation, that column (needs to be BigDecimal) value is incremented by 1 and used in the SET clause in UPDATE.</P>
+
+<P>managed=true, is effective only when collision=true, else managed attribute value is ignored.</P>
+
+<H4><A name="RDBDASJava-FAQ-WhatisthepurposeofmanyandkeyRestrictedattributesinRelationship%3F"></A>What is the purpose of many and keyRestricted attributes in Relationship?</H4>
+
+<P>many=true allows for 1:n relationship. If it is false, it's 1:1 relationship. In case of 1:1 relationship, if keyRestricted is not specified, the link (relationship) between the parent and child rows can be broken, by setting the parentKeyTable's row to null/deleting the row. Also, a different parent row can be associated to the child row, which has one pre-existing parent row association. If keyRestricted=true, this kind on change in existing relationship is not allowed, user will get exception 'Can not modify a one to one relationship that is key restricted'.</P>
+
+<H4><A name="RDBDASJava-FAQ-Incaseofparentchildrelationship%2Chowtotraversebackandforth%3F"></A>In case of parent-child relationship, how to traverse back and forth?</H4>
+
+<P>If by Convention over Configuration/from DAS Config there is a name to a relationship, the opposite relationship is named with _opposite appended to it.</P>
+
+<P>e.g. Consider two tables (CUSTOMER, ORDER) each with a PK named &quot;ID&quot;. Also, ORDER has a FK named CUSTOMER_ID. The DAS recognizes this convention and assumes a one:many relationship between CUSTOMER and ORDER. In the fully dynamic case, a read of CUSTOMER and ORDER tables using a join will result in a graph of CUSTOMER DataObjects along with their related ORDERS.(name of relationship is ORDERS now.) </P>
+
+<P>The property for the CUSTOMER Types list of ORDERs is named &quot;ORDER&quot; so:<BR>
+  DataObject order = cust.getDataObject(&quot;ORDER<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=50994" title="Create Page: 1" class="createlink">1<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>&quot;);<BR>
+The name of the property in the ORDER Type that references the parent CUSTOMER, is <BR>
+  DataObject cust = order.getDataObject(&quot;CUSTOMER_opposite&quot;)</P>
+
+<H4><A name="RDBDASJava-FAQ-whatispagingcapability%3F"></A>what is paging capability?</H4>
+
+<P>What is currently available in DAS is detailed on <SPAN class="nobr"><A href="workingwithpaging.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY/WorkingWithPaging<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+Other than sequential page access(pager.next(), pager.previous()), random access is also<BR>
+allowed using pager.getPage(number).</P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das-java-previous-releases.html b/site/trunk/site-publish/rdb-das-java-previous-releases.html
new file mode 100644
index 0000000000..424b354e9a
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java-previous-releases.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS Java Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56754">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-releases.html" title="RDB DAS Releases">RDB DAS Releases</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS Java Previous Releases">RDB DAS Java Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-incubator-m2.html" title="DAS Java Incubator-M2"><B>DAS Java Incubator-M2</B> <EM>(November, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-incubating-m1.html" title="DAS Java Incubating-M1"><B>DAS Java Incubating-M1</B> <EM>(June, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG b/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG
new file mode 100644
index 0000000000..4ac629f9e3
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG
diff --git a/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG.jpeg b/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG.jpeg
new file mode 100644
index 0000000000..0ee10a255d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java.data/RDB DAS.PNG.jpeg
diff --git a/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif b/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif
new file mode 100644
index 0000000000..7c96e84552
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif
diff --git a/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif.jpeg b/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif.jpeg
new file mode 100644
index 0000000000..abb57b0ada
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java.data/rdbDAS.gif.jpeg
diff --git a/site/trunk/site-publish/rdb-das-java.html b/site/trunk/site-publish/rdb-das-java.html
new file mode 100644
index 0000000000..c5b2266ee4
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-java.html
@@ -0,0 +1,139 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50948">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS Java">RDB DAS Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H4><A name="RDBDASJava-WhatisRDBDataAccessService%3F"></A>What is RDB Data Access Service?</H4>
+
+<P>RDB DAS provides provides transformation capability between SDO data graphs and relational databases and vise versa.</P>
+
+<P>By using RDB DAS, applications developers avoid the details and complications of working directly with a relational database and also the complex transformation between relational rows/columns and SDO Data Object types/properties.</P>
+
+<P>RDB DAS processes the SDO change summary and produces efficient update statements that only write to columns that have actually been modified.</P>
+
+<P>The following diagram illustrates a DAS client. The client starts by reading a graph of data specified by some query. The client then makes modifications to the graph, possibly by adding elements, and then requests the DAS to push the changes back to the database.</P>
+
+
+<P><SPAN class="image-wrap" style=""><IMG src="rdb-das-java.data/rdbDAS.gif" style="border: 0px solid black"></SPAN></P></TD></TR></TBODY></TABLE>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-releases.html b/site/trunk/site-publish/rdb-das-releases.html
new file mode 100644
index 0000000000..87fc7fad61
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-releases.html
@@ -0,0 +1,386 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51241">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS Releases">RDB DAS Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=55092" class="createlink">FAQ</A><BR>
+<A href="" title="RDB DAS Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS&linkCreation=true&fromPageId=55092" class="createlink">What's new?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<A href="rdb-das-architecture-guide.html" title="RDB DAS architecture guide">Architecture Guide</A><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/das-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="RDBDASReleases-LatestRelease"></A>Latest Release</H2>
+<H3><A name="RDBDASReleases-RDBDASJavabeta1incubating"></A>RDB DAS Java beta1-incubating</H3>
+
+<P>RDB DAS Java beta1-incubating was released in June 2007.</P>
+
+<P>This release represents a significant milestone on the road to Apache Tuscany DAS 1.0 release. </P>
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>Optimisc concurrency control</LI>
+		<LI>Default OCC policy (all OCC-capable fileds used in overquaified &quot;where&quot;) (TUSCANY-866)</LI>
+		<LI>DAS Configuration supports ConnectionInfo for J2SE environment (TUSCANY-948)</LI>
+		<LI>DAS supports queries that reference tables in multiple schema (TUSCANY-952)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Creation and initialization of database for DAS samples (TUSCANY-863)</LI>
+		<LI>Sample with Advanced DAS features Demo (TUSCANY-800)</LI>
+		<LI>Sample with J2SE application using DAS (samples/customer)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Documentation
+	<UL>
+		<LI>More sections added to DAS User's Guide</LI>
+		<LI>Javadoc available</LI>
+		<LI>Added FAQs</LI>
+		<LI>Added &quot;Starting with DAS&quot; Guide to help user get started with using different DAS features</LI>
+		<LI>Added DAS Architecture Guide</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>For full detail about the release see the <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="RDBDASReleases-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="RDBDASReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-da-beta1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-das-beta1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://people.apache.org/dist/incubator/tuscany/java/das/beta1-incubating/apache-tuscany-das-beta1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="RDBDASReleases-PreviousReleases"></A>Previous Releases</H2>
+<P>Here is a complete list of all Apache Tuscany RDB DAS downloads:</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-incubator-m2.html" title="DAS Java Incubator-M2"><B>DAS Java Incubator-M2</B> <EM>(November, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="das-java-incubating-m1.html" title="DAS Java Incubating-M1"><B>DAS Java Incubating-M1</B> <EM>(June, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+
+<H1><A name="RDBDASReleases-oldcontent"></A>old content</H1>
+<H1><A name="RDBDASReleases-LatestRelease"></A>Latest Release</H1>
+<H2><A name="RDBDASReleases-RDBDASJavabeta1incubating"></A>RDB DAS Java beta1 incubating</H2>
+<P>RDB DAS Java beta1 was release in June 2007.<BR>
+This release represents a significant milestone on the road to Apache Tuscany DAS 1.0 release. <BR>
+For full detail about the release see the <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RELEASE_NOTES&linkCreation=true&fromPageId=51241" class="createlink">RELEASE&#95;NOTES</A> and <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=CHANGES&linkCreation=true&fromPageId=51241" class="createlink">CHANGES</A> files.</P>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>Optimisc concurrency control</LI>
+		<LI>Default OCC policy (all OCC-capable fileds used in overquaified &quot;where&quot;) (TUSCANY-866)</LI>
+		<LI>DAS Configuration supports ConnectionInfo for J2SE environment (TUSCANY-948)</LI>
+		<LI>DAS supports queries that reference tables in multiple schema (TUSCANY-952)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Creation and initialization of database for DAS samples (TUSCANY-863)</LI>
+		<LI>Sample with Advanced DAS features Demo (TUSCANY-800)</LI>
+		<LI>Sample with J2SE application using DAS (samples/customer)</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Documentation
+	<UL>
+		<LI>More sections added to DAS User's Guide</LI>
+		<LI>Javadoc available</LI>
+		<LI>Added FAQs</LI>
+		<LI>Added &quot;Starting with DAS&quot; Guide to help user get started with using different DAS features</LI>
+		<LI>Added DAS Architecture Guide</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H1><A name="RDBDASReleases-PreviousReleases"></A>Previous Releases</H1>
+<P>Here is a complete list of all Apache Tuscany RDB DAS features for old releases.</P>
+
+<H2><A name="RDBDASReleases-JavaM2ReleaseDASKeyFeatures"></A>Java M2 Release - DAS Key Features</H2>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>MySQL support</LI>
+		<LI>Static Data Objects</LI>
+		<LI>Dynamic root for static graphs</LI>
+		<LI>&quot;Unique&quot; attribute on relationships</LI>
+		<LI>Explicit ResultSet shape definition</LI>
+		<LI>Improved logging</LI>
+		<LI>Programmatic Configuration</LI>
+		<LI>Helper for empty SDO Graph
+		<UL>
+			<LI>Column named &quot;ID&quot; is the PK</LI>
+			<LI>Column named &quot;xxx_ID&quot; is the FK to table &quot;xxx&quot;</LI>
+		</UL>
+		</LI>
+		<LI>Convention over configuration</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Tomcat integration and automated DAS samples testing (htmlUnit)</LI>
+		<LI>DAS Samples now have all dependencies and source code inside the sample war</LI>
+		<LI><A href="http://wiki.apache.org/ws-data/attachments/Tuscany(2f)TuscanyJava(2f)DAS_Java_Overview/attachments/m2_jiras.html" class="external-link" rel="nofollow">M2 JIRAS</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="RDBDASReleases-JavaM1ReleaseDASKeyFeatures"></A>Java M1 Release - DAS Key Features</H2>
+
+<UL>
+	<LI>RDB CRUD operations in terms of SDO DataObjects</LI>
+	<LI>Optimistic concurrency control</LI>
+	<LI>Generated database IDs</LI>
+	<LI>Stored procedures</LI>
+	<LI>Paging API</LI>
+	<LI>1..1 and 1..n relationships</LI>
+	<LI>Partial row updates</LI>
+</UL>
+
+
+<H2><A name="RDBDASReleases-JavaM3ReleaseDASKeyFeatures%28OldProposedPlanningNEEDREVIEW%29"></A>Java M3 Release - DAS Key Features (<B>Old Proposed Planning - NEED REVIEW</B>)</H2>
+
+<UL>
+	<LI>DAS Core features
+	<UL>
+		<LI>Optimisc concurrency control
+		<UL>
+			<LI>Support for OCC recovery (TUSCANY-916) - Default OCC policy (all OCC-capable fileds used in overquaified &quot;where&quot;)</LI>
+		</UL>
+		</LI>
+		<LI>More performant pager (TUSCANY-542) - Review MySQL Support (TUSCANY-937)</LI>
+		<LI>SCA Intgration
+		<UL>
+			<LI>Expose DAS as a Pojo SCA Service (impl.java) (TUSCANY-898) - Container-based DAS (impl.das) (TUSCANY-904)</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>DAS Samples
+	<UL>
+		<LI>Sample consuming DAS as a Pojo SCA service - Sample consuming container-based DAS</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Documentation
+	<UL>
+		<LI>Continue to work on DAS User's guide - HOW-TO describing how to build a DAS Application</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>Infrastructure
+	<UL>
+		<LI>Automate release distribution process</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-transaction-control.html b/site/trunk/site-publish/rdb-das-transaction-control.html
new file mode 100644
index 0000000000..26c0a65abd
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-transaction-control.html
@@ -0,0 +1,268 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS - Transaction Control</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66405">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - Transaction Control">RDB DAS - Transaction Control</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ffffff;border-color: #ECF4D1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #ECF4D1;background-color: #ECF4D1;"><B>Transaction Management in RDB-Data Access Service (RDB DAS)</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<UL>
+	<LI><A href="#RDBDAS-TransactionControl-Overview">Overview</A></LI>
+	<LI><A href="#RDBDAS-TransactionControl-DASmanagedtransactions">DAS managed transactions</A></LI>
+	<LI><A href="#RDBDAS-TransactionControl-Externallymanagedtransactions">Externally managed transactions</A></LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="RDBDAS-TransactionControl-Overview"></A><A name="RDBDAS-TransactionControl-Overview"></A>Overview</H3>
+
+<P>A typical enterprise application accesses and stores information in one or more databases. Data integrity is <BR>
+the most essential aspect of correct business functioning. Transactions control the concurrent access of data <BR>
+by multiple programs. In the event of a system failure, transactions make sure that after recovery the data will<BR>
+ be in a consistent state. This document helps to understand transaction management in RDB DAS.</P>
+
+<P>One DAS instance is always associated with one database and one Connection. DAS participates in <BR>
+<B>A&gt; DAS managed  and B&gt; Externally managed transactions</B>.</P>
+
+<H3><A name="RDBDAS-TransactionControl-DASmanagedtransactions"></A><A name="RDBDAS-TransactionControl-DASmanagedtransactions"></A>DAS managed transactions</H3>
+
+<P>By default, the RDB DAS assumes responsibility for managing transaction boundaries by executing commit and <BR>
+rollback operations against the database. A configuration attribute managedtx is assumed with default value <BR>
+TRUE. This signals DAS to control the transaction. The boundaries of these transactions are as follows:</P>
+
+<P><B>Reading Data</B><BR>
+Queries to the database are always made by calling DAS command's &quot;executeQuery()&quot; method. The associated <BR>
+transaction lives for the duration of this method execution. That is, the transaction can be thought to start <BR>
+when control is transferred to &quot;executeQuery&quot; and the transaction ends just prior to return from this method.</P>
+
+<P><B>Writing Data</B><BR>
+Writes can be accomplished by two DAS APIs. First is calling the DAS &quot;execute()&quot; command against a command the <BR>
+will perform write operations and, in this case, the transaction boundaries are the same as read queries. That <BR>
+is the transaction life matches the life of the &quot;execute&quot; processing. If  the method returns without exception <BR>
+then the application can assume that any changes were successfully committed to the database. If an exception is <BR>
+returned then the changes will have all been rolled back.</P>
+
+<P>The second API used by clients is the DAS applyChanges() method (see ChangeSummaryProcessing). Again, the <BR>
+boundaries of the transaction match the boundaries of the call to the method. The DAS will create a set of <BR>
+INSERT/UPDATE and DELETE statements to flush the graph changes to the database and all of these statements <BR>
+will be executed as part of a single transaction. If the method returns without exception then the application <BR>
+can assume that all changes were successfully committed to the database. If an exception is returned then the changes <BR>
+will have all been rolled back.</P>
+
+<P><B>Use</B></P>
+
+<P>This mode is useful for simple data operations, where there is no need of having group of SQL statements or group of DAS <BR>
+Commands in one transaction unit. At the maximum one applyChanges() call having multiple INSERT/UPDATE/DELETE executes <BR>
+under one transaction. Cases where multiple applyChanges() method calls or multiple executeQuery() method calls are <BR>
+required to be part of one transaction, this mode is not useful. In this mode, the database Connection can be internally <BR>
+obtained using DAS Config ConnectionInfo settings or database Connection can also be  passed from the client to DAS instance. <BR>
+When DAS obtains database Connection internally, in Config ConnectionInfo, settings can either specify DataSource name or <BR>
+Database Driver related information. Typical examples - </P>
+<UL>
+	<LI>When using Tomcat based web app with DAS, Tomcat configured DataSource name is set in the DAS Config.</LI>
+	<LI>When using J2SE application client with DAS, Database Driver related information from DAS Config is used to form a database Connection.</LI>
+</UL>
+
+
+<P>When multiple SQL statements/DAS commands need to be part of one transaction and also when multiple DAS instances need to participate <BR>
+in one transaction, the other mode &quot;Externally managed transactions&quot; is useful.</P>
+
+<H3><A name="RDBDAS-TransactionControl-Externallymanagedtransactions"></A><A name="RDBDAS-TransactionControl-Externallymanagedtransactions"></A>Externally managed transactions</H3>
+
+<P>The RDB DAS provides a straightforward mechanism for working with external transactions. In this mode, DAS is configured to not issue <BR>
+commit/rollback. This behavior is needed to have the DAS participate in a larger transaction since some external party is responsible <BR>
+for these actions. </P>
+
+<P><B>Use</B></P>
+
+<P>The scope of transaction support is a blend of <B>Supports</B> and <B>Mandatory</B> transaction attributes in J2EE scenario. i.e. DAS will use the <BR>
+client's transaction if it is available. DAS does not throw exception if external client transaction is not available, but the end result <BR>
+without external transaction is unpredictable. So, when using DAS in this mode, client needs to ensure availability of external transaction <BR>
+encompassing required DAS/s commands. External transaction can be JDBC transaction or JTA transaction. </P>
+
+<P>When JDBC transaction, it is possible to group multiple Commands from single DAS instance in one transaction. Also nested transactions using <BR>
+multiple DAS instances can be carried out. AS JTA does not support nested transactions, if  <B>nested transactions</B> is the requirement, JDBC <BR>
+Transactions should be used. For example:-</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>Das1 = DAS.FACTORY.createDAS(jdbcconn1);
+Das2 = DAS.FACTORY.createDAS(jdbcconn2);
+
+try {
+     doSomeDAS1Stuff();
+        doSomeDAS2Stuff();
+        jdbcconn2.commit();
+     doSomeDAS1Stuff();
+     jdbcconn1.commit();
+} catch (AnyException ex) {
+     jdbcconn1.rollback();
+     jdbcconn2.rollback();
+}
+</PRE>
+</DIV></DIV>
+
+<P>When JTA transaction, multiple units like JMS, DAS1(derbydatabase1), DAS2(derbydatabase2/mysqldatabase2) can be part of single transaction. <BR>
+See example:-</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>tx.begin();
+try {
+     doSomeJMSStuff();
+     doSomeDAS1Stuff();
+     doSomeDAS2Stuff();
+     tx.commit();
+} catch (AnyException ex) {
+     tx.rollback();
+}
+</PRE>
+</DIV></DIV>
+
+<P>In both the examples above, the DAS1 and DAS2 have been configured to not manage transactions since this is handled by the calling program.<BR>
+The DAS is set to behave this way by a piece of configuration (typically via a configuration xml file). The following config file snippet <BR>
+illustrates this setting:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;
+        xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+        &lt;ConnectionInfo managedtx=&quot;false&quot;/&gt;
+
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+
+<P><B>Note</B> When using DAS with &quot;Externally managed transactions&quot;, it is required by the client to pass appropriate Connection object to DAS <BR>
+instance. There is no meaning to forming Connection internally in DAS using Config info, as such Connections will not be part of external <BR>
+Transaction Control.</P>
+
+<P><B>Methods Not Used in Externally managed transactions</B><BR>
+DAS does not invoke any method that might interfere with the transaction boundaries set by the Transaction Manager. The list of prohibited <BR>
+methods follows: </P>
+<UL>
+	<LI>The commit, setAutoCommit, and rollback methods of java.sql.Connection</LI>
+	<LI>The getUserTransaction method of javax.ejb.EJBContext</LI>
+	<LI>Any method of javax.transaction.UserTransaction</LI>
+</UL>
+
+
+<P><B>Note</B> DAS never allows AutoCommit(TRUE) for the Connection it is using and throws Exception if this mode is detected.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-user-guide.html b/site/trunk/site-publish/rdb-das-user-guide.html
new file mode 100644
index 0000000000..058b32ae4d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-user-guide.html
@@ -0,0 +1,185 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : RDB DAS - User Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52724">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - User Guide">RDB DAS - User Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="RDBDAS-UserGuide-Tuscany%2FTuscanyJava%2FDASJavaOverview%2FRDBDASJavaUserGuide"></A>Tuscany/TuscanyJava/DAS Java Overview/RDBDAS Java User Guide</H1>
+
+
+<H2><A name="RDBDAS-UserGuide-Introduction"></A>Introduction</H2>
+
+<P>&nbsp;&nbsp;&nbsp; This Guide provides user-level information describing the capabilities of the RDB DAS.</P>
+
+<H2><A name="RDBDAS-UserGuide-Concepts"></A>Concepts</H2>
+
+<P>&nbsp;&nbsp;&nbsp; This section provides an overview of several main concepts that are key to understanding and working with the RDB DAS.</P>
+<UL>
+	<LI><A href="conventionoverconfiguration.html" title="ConventionOverConfiguration">ConventionOverConfiguration</A></LI>
+	<LI><A href="changesummaryprocessing.html" title="ChangeSummaryProcessing">ChangeSummaryProcessing</A></LI>
+	<LI><A href="writeoperationordering.html" title="WriteOperationOrdering">WriteOperationOrdering</A></LI>
+	<LI><A href="partialupdate.html" title="PartialUpdate">PartialUpdate</A></LI>
+	<LI><A href="resultsetdrivendataobjecttypes.html" title="ResultSetDrivenDataObjectTypes">ResultSetDrivenDataObjectTypes</A></LI>
+	<LI><A href="optimisticconcurrencycontrol.html" title="OptimisticConcurrencyControl">OptimisticConcurrencyControl</A></LI>
+	<LI><A href="foreignkeyrepresentationandmanagement.html" title="ForeignKeyRepresentationAndManagement">ForeignKeyRepresentationAndManagement</A></LI>
+</UL>
+
+
+<H2><A name="RDBDAS-UserGuide-Capabilities%28Howto%29"></A>Capabilities (How to)</H2>
+
+<UL>
+	<LI><A href="workingwithbasiccrud.html" title="WorkingWithBasicCrud">WorkingWithBasicCrud </A>&#45; Reading and writing to the database</LI>
+	<LI><A href="workingwithoptimisticconcurrencycontrol.html" title="WorkingWithOptimisticConcurrencyControl">WorkingWithOptimisticConcurrencyControl</A></LI>
+	<LI><A href="workingwithgenerateddatabasekeys.html" title="WorkingWithGeneratedDatabaseKeys">WorkingWithGeneratedDatabaseKeys</A></LI>
+	<LI><A href="configurable-database-generated-keys-support.html" title="Configurable database generated keys support">Configurable database generated keys support</A></LI>
+	<LI><A href="workingwithstoredprocedures.html" title="WorkingWithStoredProcedures">WorkingWithStoredProcedures</A></LI>
+	<LI><A href="workingwithrelationships.html" title="WorkingWithRelationships">WorkingWithRelationships</A></LI>
+	<LI><A href="workingwithconventions.html" title="WorkingWithConventions">WorkingWithConventions</A></LI>
+	<LI><A href="workingwithtransactions.html" title="WorkingWithTransactions">WorkingWithTransactions</A></LI>
+	<LI><A href="workingwithcolumnconverters.html" title="WorkingWithColumnConverters">WorkingWithColumnConverters</A></LI>
+	<LI><A href="workingwithpaging.html" title="WorkingWithPaging">WorkingWithPaging</A></LI>
+	<LI><A href="workingwithstaticdataobjects.html" title="WorkingWithStaticDataObjects">WorkingWithStaticDataObjects</A></LI>
+	<LI><A href="workingwithcompoundkeys.html" title="WorkingWithCompoundKeys">WorkingWithCompoundKeys</A></LI>
+	<LI><A href="workingwithnamemapping.html" title="WorkingWithNameMapping">WorkingWithNameMapping </A>(aliasing)</LI>
+	<LI><A href="tuscanytuscanyjavadas-java-overviewimproved-logging.html" title="Tuscany.TuscanyJava.DAS Java Overview.Improved logging">Logging</A></LI>
+	<LI><A href="explicit-createupdatedelete.html" title="Explicit CREATE,UPDATE,DELETE">Explicit CREATE,UPDATE,DELETE</A></LI>
+	<LI><A href="explicit-resultset-shape-definition.html" title="Explicit ResultSet shape definition">Explicit ResultSet shape definition</A></LI>
+	<LI><A href="graph-merge.html" title="Graph Merge">Graph Merge</A></LI>
+	<LI><A href="connection-support-for-j2se-environment.html" title="Connection support for J2SE environment">Connection support for J2SE environment</A></LI>
+	<LI><A href="named-parameters-support.html" title="Named parameters support">Named parameters support</A></LI>
+</UL>
+
+
+<H2><A name="RDBDAS-UserGuide-Samples%28SeeCapabilitiesInUse%29"></A>Samples (See Capabilities In Use)</H2>
+
+<P>User can try the samples below to understand the above mentioned concepts and capabilities.</P>
+<UL>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples/company-webapp/readme.htm" class="external-link" rel="nofollow">Company Web Sample</A> (Demonstrates basic CRUD)</LI>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples/customer/readme.htm" class="external-link" rel="nofollow">Customer J2SE Sample</A> (Demonstrate using DAS in J2SE environment)</LI>
+	<LI><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples/advanced-webapp/readme.htm" class="external-link" rel="nofollow">Advanced Web Sample</A> (Demonstrate advanced DAS features like ResultSet Shape, Optimistic Concurrency Control, Converter usage)</LI>
+</UL>
+
+
+<P>To download go to <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Downloads" class="external-link" rel="nofollow">Downloads</A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/rdb-das-users-guide.html b/site/trunk/site-publish/rdb-das-users-guide.html
new file mode 100644
index 0000000000..9ce467ccbc
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das-users-guide.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>RDB DAS - Users Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java-project.html" title="DAS Java Project">DAS Java Project</A>&nbsp;&gt;&nbsp;<A href="rdb-das.html" title="RDB DAS">RDB DAS</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS - Users Guide">RDB DAS - Users Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">RDB DAS - Users Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=52724">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=52724">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=52724">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=52724">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=52724">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=52724">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Apr 27, 2007
+                      
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>Place holder to migrate the DAS Users guide from old wiki.<BR>
+<SPAN class="nobr"><A href="http://wiki.apache.org/ws/Tuscany/TuscanyJava/DAS_Java_Overview/RDBDAS_Java_User_Guide" title="Visit page outside Confluence" rel="nofollow">http://wiki.apache.org/ws/Tuscany/TuscanyJava/DAS_Java_Overview/RDBDAS_Java_User_Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG b/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG
new file mode 100644
index 0000000000..4ac629f9e3
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG
diff --git a/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG.jpeg b/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG.jpeg
new file mode 100644
index 0000000000..0ee10a255d
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das.data/RDB DAS.PNG.jpeg
diff --git a/site/trunk/site-publish/rdb-das.data/rdbDAS.gif b/site/trunk/site-publish/rdb-das.data/rdbDAS.gif
new file mode 100644
index 0000000000..7c96e84552
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das.data/rdbDAS.gif
diff --git a/site/trunk/site-publish/rdb-das.data/rdbDAS.gif.jpeg b/site/trunk/site-publish/rdb-das.data/rdbDAS.gif.jpeg
new file mode 100644
index 0000000000..abb57b0ada
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das.data/rdbDAS.gif.jpeg
diff --git a/site/trunk/site-publish/rdb-das.html b/site/trunk/site-publish/rdb-das.html
new file mode 100644
index 0000000000..f3f788fc14
--- /dev/null
+++ b/site/trunk/site-publish/rdb-das.html
@@ -0,0 +1,111 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>RDB DAS : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50948">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="" title="RDB DAS">RDB DAS</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=55092" title="Create Page: RDB DAS Java - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="rdb-das-releases.html" title="RDB DAS - Releases">Releases</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS&linkCreation=true&fromPageId=55092" title="Create Page: What's New in DAS" class="createlink">What's new?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="starting-with-das.html" title="Starting with DAS">Starting with DAS</A><BR>
+<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">User Guide</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=RDB%20DAS%20architecture%20guide&linkCreation=true&fromPageId=55092" title="Create Page: RDB DAS architecture guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20Doc&linkCreation=true&fromPageId=55092" title="Create Page: Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<H4><A name="RDBDAS-WhatisRDBDataAccessService%3F"></A>What is RDB Data Access Service?</H4>
+
+<P>RDB DAS provides provides transformation capability between SDO data graphs and relational databases and vise versa.</P>
+
+<P>By using RDB DAS, applications developers avoid the details and complications of working directly with a relational database and also the complex transformation between relational rows/columns and SDO Data Object types/properties.</P>
+
+<P>RDB DAS processes the SDO change summary and produces efficient update statements that only write to columns that have actually been modified.</P>
+
+<P>The following diagram illustrates a DAS client. The client starts by reading a graph of data specified by some query. The client then makes modifications to the graph, possibly by adding elements, and then requests the DAS to push the changes back to the database.</P>
+
+
+<P><IMG src="rdb-das.data/rdbDAS.gif" align="absmiddle" border="0"></P></TD></TR></TBODY></TABLE>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/related-projects.html b/site/trunk/site-publish/related-projects.html
new file mode 100644
index 0000000000..0ca996dbd3
--- /dev/null
+++ b/site/trunk/site-publish/related-projects.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : related projects</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=101628">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="related projects">related projects</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/release-process.html b/site/trunk/site-publish/release-process.html
new file mode 100644
index 0000000000..971b8adfbd
--- /dev/null
+++ b/site/trunk/site-publish/release-process.html
@@ -0,0 +1,212 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Release Process : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51237">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Release Process">Release Process</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H2><A name="ReleaseProcess-StartingaReleaseforDASSubproject"></A>Starting a Release for DAS Subproject</H2>
+<P><B>This is work in progress. At this point, thoughts are put together to review with the community. Please help to complete this</B></P>
+
+<H2><A name="ReleaseProcess-What%27saRelease"></A>What's a Release</H2>
+
+<P>The <SPAN class="nobr"><A href="http://www.apache.org/dev/release.html#what" title="Visit page outside Confluence" rel="nofollow">ASF release definition<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> basically says that any artifact that is made available for people outside of the Apache Tuscany project is considered a release. The Release process usually consist of preparing the contents of the release on the project dev-list, voting release candidate(s) and, because Tuscany is still under Incubation, asking the iPMC to approve the release after it has already been approved on the project development community.</P>
+
+<H2><A name="ReleaseProcess-Prerequisites"></A>Prerequisites</H2>
+
+<P>DAS releases are dependent on SDO release. Make sure we have a SDO release to base this release on.</P>
+
+<H2><A name="ReleaseProcess-Startingthereleaseprocess"></A>Starting the release process</H2>
+<OL>
+	<LI>Identify a release manager on devlist.</LI>
+	<LI>The release manager initiates the discussion on the dev list or gathers previous dicussion threads related to the release content and starts a release thread discussion. Get consensus on the content from the community early.</LI>
+	<LI>Nail the must-have functions from the community that is required to be delivered in this release.</LI>
+	<LI>Target (or reTarget) all of the Jira defects and new function that is required for the release.  Move non-critical items to the next milestone.</LI>
+</OL>
+
+
+<H3><A name="ReleaseProcess-Duringtherelease"></A>During the release</H3>
+<OL>
+	<LI>Keep Jiras under control during the milestone.   Make sure new opened ones are targeted for the appropriate release, and the backlog is decreasing.</LI>
+	<LI>Make sure the new function Jira are marked appropriately (since they will be used in the ReadMe file creation).</LI>
+	<LI>Look for Jira's that have patches attached to them and get the code integrated early in the cycle.   Don't wait until the last minute.</LI>
+	<LI>Make sure that you begin to obtain clean versions for all SNAPSHOTs in the build.  This can sometimes be a lengthy process as dependent packages are sometimes not available.</LI>
+	<LI>Lay out a plan for the distributed execution of the test suites (unit tests, integration tests, scenarios)</LI>
+	<LI>Ensure that all of the licenses are valid and replacements/remediation should be done.</LI>
+	<LI>Make sure that you remind the community that all modules should have the appropriate header file with the appropriate <SPAN class="nobr"><A href="http://www.apache.org/legal/src-headers.html#headers" title="Visit page outside Confluence" rel="nofollow">copyright statement<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+	<LI>Prepare for signing/authenticating distro files
+	<OL>
+		<LI>identify/install s/w for public key infrastructure stuff and MD5 message digest generation</LI>
+		<LI>Create a PGP key for signing files</LI>
+		<LI>Lodge your PGP key with a keyserver</LI>
+		<LI>Put your public key in the svn KEYS file</LI>
+	</OL>
+	</LI>
+	<LI>Get set up for easy file transfer to people.apache.org
+	<OL>
+		<LI>Identify/Install clients for ssh, secure copying and secure ftping</LI>
+		<LI>Establish authentication with people.apache.org by key</LI>
+	</OL>
+	</LI>
+	<LI>Ensure that there is inter-module understanding of how we plan to sequence releasing modules and requesting IPMC votes</LI>
+	<LI>make the trunk reference the newly released parent pom and buildtools</LI>
+	<LI>optionally make a branch</LI>
+	<LI>stabilize code in branch (or trunk if development activity can be halted in trunk)
+	<OL>
+		<LI>check LICENSE and NOTICE files in project roots and in jar manifests
+		<OL>
+			<LI>run the rat tool against the source and check for exceptions</LI>
+			<LI>once exceptions have been fixed, store the rat log and make a note of rat log exceptions which are there because they have to be</LI>
+			<LI>repeat this as necessary during the release process if new files are included</LI>
+		</OL>
+		</LI>
+		<LI>update readme with the important New Function and a pointer to defect fixes for this release.   Put the delivery date of the release at the top of the readme.</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<OL>
+	<LI>
+	<OL>
+		<LI>Ensure the DAS Tuscany project's root level svn Status file is up to date, and then copy/update it into the root folders of any source distribution that will be made,</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<H2><A name="ReleaseProcess-Exitingthereleasecycle"></A>Exiting the release cycle</H2>
+
+<OL>
+	<LI>Create a release candidate
+	<OL>
+		<LI>Create local copies of source hierarchies, , one per source distribution, using svn export &lt;uri&gt; &lt;local-dir&gt;</LI>
+		<LI>Make archives of your clean exports in order to be able to distribute source</LI>
+		<LI>Follow the instructions in BUILDING.txt in the root folders of the source distributions to produce the binary distribution</LI>
+		<LI>Test binary distro on a clean machine before publishing it as an RC.</LI>
+		<LI>When ready, put in place distro signing capabilities
+		<OL>
+			<LI>Sign and create md5 checksums for each of the source and binary distribution archives</LI>
+			<LI>transfer the archives to a logical place under your public_html people.apache.org space</LI>
+			<LI>create a suitable readme for the root level of your release candidate folder, and ensure the readme names the release candidate version</LI>
+		</OL>
+		</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<OL>
+	<LI>Declare a candidate build and ask for feedback on devlist and user list.  Work out any issues that are voiced.</LI>
+	<LI>Get some to verify that all of the samples pass without issues. Integration tests and unit tests should run and known problems need to be identifed.</LI>
+	<LI>Initiate a vote on tuscany-dev mailing list for the release candidate to make the build a public release.</LI>
+	<LI>After 3 days,  post the result to the devlist</LI>
+	<LI>Once the community approved the candidate, create a tag from the branch (or trunk if no branch)
+	<OL>
+		<LI>Note that a release must have a referenceable tag<BR>
+   <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> svn will complain when you try to do an svn commit into a tag, which is a warning only, and during this phase of the release process, updates to a tag are justifiable</LI>
+	</OL>
+	</LI>
+	<LI>Get approval from IPMC to make this a public release. Send a note to general@apache.org which summarizes the result of vote on devlist and include a pointer to the release in your note. 3 (+1) IPMC votes are required to make this a public release and of course no (-1).</LI>
+	<LI>Once you have IPMC approval, post the release to people.apache.org.</LI>
+	<LI>Update the version elements of the poms to define the version of the parent pom and buildtools that should be used</LI>
+	<LI>Update the tags version names of the distributable artifacts to non SNAPSHOT titles that match the release name</LI>
+	<LI>Update the tags version names of the dependencies to non SNAPSHOT versions, if not already done earlier in the release candidate process</LI>
+	<LI>Ideally update the tags version names of maven plugins to non SNAPSHOT versions if not already done earlier in the release candidate process (note that if the plugin behaviour changes after release, your tag or source distribution may not build in the same way as it did when you released if you rely on SNAPSHOT plugin versions)</LI>
+	<LI>Rebuild and upload a new release to /www/people.apache.org/dist/incubator/tuscany/java</LI>
+	<LI>update 'Download' link on the wiki and make it a goal to update or add documentation.</LI>
+	<LI>Announce the release by sending to anounce@apache.org (note that you must use an apache.org email address to do this), copying tuscany-dev, tuscany-user and general@incubator</LI>
+	<LI>Don't forget that all this could not have been done without everyone's help. Post a congratulation note to the dev list and thank the entire team for their efforts to make this happen <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"> And thank you for the extra ordinary effort to make this happen <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></LI>
+</OL>
+
+
+
+<H2><A name="ReleaseProcess-GoodReferences"></A>Good References</H2>
+
+<UL>
+	<LI>Apache Release: <SPAN class="nobr"><A href="http://www.apache.org/dev/release.html" title="Visit page outside Confluence" rel="nofollow">http://www.apache.org/dev/release.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Apache Release Management: <SPAN class="nobr"><A href="http://incubator.apache.org/guides/releasemanagement.html" title="Visit page outside Confluence" rel="nofollow">http://incubator.apache.org/guides/releasemanagement.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Apache release publishing guide: <SPAN class="nobr"><A href="http://www.apache.org/dev/release-publishing.html" title="Visit page outside Confluence" rel="nofollow">http://www.apache.org/dev/release-publishing.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>ARAT: <SPAN class="nobr"><A href="http://code.google.com/p/arat/" title="Visit page outside Confluence" rel="nofollow">http://code.google.com/p/arat/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Apache Voting: <SPAN class="nobr"><A href="http://www.apache.org/foundation/voting.html" title="Visit page outside Confluence" rel="nofollow">http://www.apache.org/foundation/voting.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Signing Releases: <SPAN class="nobr"><A href="http://www.apache.org/dev/release-signing.html" title="Visit page outside Confluence" rel="nofollow">http://www.apache.org/dev/release-signing.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+<H2><A name="ReleaseProcess-Examples"></A>Examples</H2>
+<P><SPAN class="nobr"><A href="http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps" title="Visit page outside Confluence" rel="nofollow">http://wiki.apache.org/ws/FrontPage/Axis2C/releases/steps<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+<UL>
+	<LI>Release process from Apache Cayenne: <SPAN class="nobr"><A href="http://cwiki.apache.org/CAY/release-guide.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/CAY/release-guide.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Release process from Apache Geronimo: <SPAN class="nobr"><A href="http://cwiki.apache.org/GMOxPMGT/release-manager-checklist.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/GMOxPMGT/release-manager-checklist.html<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/repeating-menu.html b/site/trunk/site-publish/repeating-menu.html
new file mode 100644
index 0000000000..8c00ead59b
--- /dev/null
+++ b/site/trunk/site-publish/repeating-menu.html
@@ -0,0 +1,84 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Repeating Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55194">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="Repeating Menu">Repeating Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/repeating-subproject-menu.html b/site/trunk/site-publish/repeating-subproject-menu.html
new file mode 100644
index 0000000000..935be459d7
--- /dev/null
+++ b/site/trunk/site-publish/repeating-subproject-menu.html
@@ -0,0 +1,83 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Repeating Subproject Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55875">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="Repeating Subproject Menu">Repeating Subproject Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/resources/space.css b/site/trunk/site-publish/resources/space.css
new file mode 100644
index 0000000000..9ca27bc4a3
--- /dev/null
+++ b/site/trunk/site-publish/resources/space.css
@@ -0,0 +1,5269 @@
+
+/* Confluence master stylesheet */
+body {
+    margin: 0;
+    padding: 0;
+    background-color: #f0f0f0;
+}
+body.content-preview {
+    background: #fff;
+    border: none;
+}
+
+body, p, td, table, tr, .bodytext, .stepfield {
+    font-size: 10pt;
+    line-height: 1.3;
+    color: #000;
+    font-weight: normal;
+}
+
+#page {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+#PageContent {
+    text-align: left;
+    background-color: #fff;
+    padding: 0 0 20px 0;
+    margin: 0;
+}
+
+.print-only {
+    display: none;
+}
+
+.monospaceInput {
+    font: 12px Monaco, Consolas, "Courier New", monospace;
+}
+
+pre {
+    padding: 0;
+    margin: 10px 0;
+    text-align: left;
+    overflow: auto;
+}
+
+.helpheading {
+    font-weight: bold;
+    background-color: #d0d9bd;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    padding: 4px;
+    margin: 0;
+    margin-top: 10px;
+}
+.helpcontent {
+    padding: 4px 4px 20px 4px;
+    background-color: #f5f7f1;
+}
+
+.help-section-div .helpheading {
+    margin: 0;
+}
+.help-section-div {
+    margin-bottom: 2em;
+}
+
+#print-friendly-help-toggle {
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    text-indent: -999em;
+    width: 16px;
+    height: 16px;
+    background-image: url("../../../images/icons/print_16.gif");
+    background-repeat: no-repeat;
+    outline: none;
+}
+
+#commentsHide {
+    color: #666;
+    font-weight: normal;
+}
+
+#showingComments {
+    border: none;
+    font-size: 10pt;
+}
+
+.pageSection {
+    margin-top: 10px;
+    clear: both;
+}
+
+
+.pageSectionHeader {
+    margin-bottom: 5px;
+    padding: 2px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.pageSectionHeader.summary {
+    border-bottom: none;
+}
+
+.pageSectionBody {
+    margin-top: 4px;
+}
+
+a.grey:link { color: #666; }
+a.grey:visited { color: #666; }
+a.grey:active { color: #666; }
+a.grey:hover { color: #666; }
+
+.more-comments {
+    font-size: 10pt;
+    color: #dde2e6;
+}
+
+.commentBox  {
+    padding: 0;
+    margin: 10px 0;
+    overflow: auto;
+}
+
+.commentBox table.comment {
+    border: 0;
+    border-bottom: #f0f0f0 1px solid;
+    border-top: #f0f0f0 1px solid;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.commentBox .commentinfo {
+    background-color: #f0f0f0;
+    vertical-align: top;
+    padding: 12px;
+}
+
+.commentBox .commentinfo .smalltext {
+    line-height: 11pt;
+}
+
+.commentBox .commentphoto {
+    background-color: #f0f0f0;
+    text-align: right;
+    vertical-align:top;
+    padding: 12px;
+}
+
+.commentBox .commentphoto img {
+    border: none;
+}
+
+.commentBox .commentname a:hover {
+    text-decoration: underline;
+}
+
+.commentdate {
+    margin-top: 3px;
+}
+
+.commentBox .commentdate, .commentdate a {
+    color: #000;
+    text-decoration: none;
+    font-size: 9pt;
+}
+
+.commentdate a:hover {
+    text-decoration: underline
+}
+
+.commentBox .smalltext {
+    line-height: 10pt;
+}
+
+.commentBox .smalltext a {
+    text-decoration: none;
+}
+
+.commentBox .smalltext a:hover {
+    text-decoration: underline;
+}
+
+.commentBox td.commentdetails {
+    vertical-align: top;
+    padding: 0 10px;
+}
+
+.commentBox td.commentActions {
+    padding: 0 10px 10px 10px;
+    vertical-align: bottom;
+}
+
+.commentThread {
+    clear: both; /* clear both in case there are floats or aligned images in the content that sits above the comment thread */
+}
+
+#replying .commentdetails {
+    padding: 15px 0 15px 25px
+}
+
+#replying .commentinfo {
+    background-color: #a0a0a0;
+    color: #f0f0f0;
+}
+
+#replying .commentdate, #replying .commentdate a {
+    color: #f0f0f0;
+}
+
+#replying .commentname a {
+    color: #f0f0f0;
+}
+
+#replying .commentphoto {
+    background-color: #a0a0a0;
+}
+
+#replying table.comment {
+    border-bottom-color: #a0a0a0;
+    border-top-color: #a0a0a0;
+}
+
+#addition .commentdetails {
+    padding: 15px 30px 10px 30px;
+}
+
+#addition .commentinfo {
+    background-color: #a0a0a0;
+    color: #f0f0f0;
+}
+
+#addition .commentname a {
+    color: #f0f0f0;
+}
+
+#addition .commentdate, #addition .commentdate a {
+    color: #f0f0f0;
+}
+
+#addition .commentphoto {
+    background-color: #a0a0a0;
+}
+
+#addition table.comment {
+    border-bottom-color: #a0a0a0;
+    border-top-color: #a0a0a0;
+}
+
+#focusedComment .commentBox td.commentdetails, #focusedComment td.commentActions {
+    background: #ffffd7;
+}
+
+.anonymousAlert, .lockAlert {
+    background-color: #f0f0f0;
+    border: 1px dashed red;
+    font-size: 11px;
+    padding: 10px 5px;
+    margin: 4px;
+    line-height: 13px;
+}
+
+.lockAlert {
+    width: 50%;
+}
+
+.navmenu {
+    border: 1px solid #f0f0f0;
+    margin: 0;
+}
+
+.menuheading {
+    font-weight: bold;
+    padding: 5px 4px 5px 10px;
+    color: #222;
+    background-color: #f0f0f0;
+}
+
+.navmenu.collapsible-menu .menuheading {
+    background: #f0f0f0 url(../../../images/icons/grey_arrow_down.gif) no-repeat 98% 50%;
+}
+.navmenu.collapsible-menu .menuheading.closed {
+    background-image: url(../../../images/icons/grey_arrow_right.gif);
+}
+
+.menuitems {
+    padding: 4px 4px 20px 4px;
+}
+
+ul.navmenu {
+    padding-left: 0;
+    margin-top: 0;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+ul.navmenu li.menu-section {
+    list-style: none;
+}
+
+.menu-section-list {
+    margin: 0;
+    padding: 5px 0 10px 0;
+}
+
+.menu-section-list li {
+    list-style: none;
+    margin: 0;
+    line-height: 1.3;
+}
+
+.menu-section-list li a:hover {
+    background-color: #f0f0f0;
+}
+
+.menu-section-list li.active a,
+.menu-section-list li.active a:hover {
+    color: #fff;
+    font-weight: bold;
+    background-color: #444; /* set to neutral colour */
+}
+
+.menu-section-list li a {
+    text-decoration: none;
+    color: #666;
+    display: block;
+    padding: 0.2em 10px;
+    cursor: pointer;
+}
+
+.menu-section-list li a img {
+    padding-right: 2px;
+}
+
+.rightpanel {
+    background: #f0f0f0;
+    -moz-border-radius: 3px; /* Firefox */
+    -webkit-border-radius: 3px; /* Safari */
+    border-radius: 3px; /* CSS3 (Opera?) */
+    padding: .9em;
+}
+
+h3.underlined,
+#helpheading,
+.sidebar-heading {
+    padding: 0;
+    margin: 10px 0;
+    text-align: left;
+    color: #333;
+    border-bottom: 1px solid #ccc;
+}
+
+#helpheading,
+#helpcontent h3.underlined,
+.sidebar-heading {
+    font-size: 13px;
+    margin: -.1em;
+    padding: .1em .1em .2em .1em;
+}
+
+#helpcontent h3.helpheading-spacing{
+    margin-top: 20px;
+}
+
+#helpcontent {
+    margin-top: .9em;
+}
+
+#helpcontent p {
+    margin-bottom: 0;
+    margin-top: .9em;
+}
+
+#helpcontent ul {
+    padding-left: 1.3em;
+}
+
+#helpcontent dl {
+    margin-top: 0;
+}
+
+#helpcontent dl dd {
+    margin: 0;
+    color: #333;
+    font-size: 90%;
+    margin-bottom: .2em;
+}
+
+#helpcontent dl dd code,
+#helpcontent dl dd pre {
+    color: #666;
+    margin: 0;
+    padding: 0;
+}
+
+#helpcontent dl dd.text-formatting code {
+    display: inline-block;
+    width: 6em;
+}
+
+#helpcontent dl dt {
+    margin-top: 1em;
+}
+#helpcontent dl dt.first {
+    margin-top: 0;
+}
+
+.helptab-unselected {
+    font-weight: bold;
+    padding: 5px;
+    background-color: #f5f7f1;
+}
+.helptab-selected {
+    font-weight: bold;
+    background-color: #d0d9bd;
+    padding: 5px;
+}
+.helptabs {
+    margin: 0;
+    background-color: #f5f7f1;
+    padding: 5px;
+}
+
+#profileSummary h3 {
+    font-weight: bold;
+    font-size: 10pt;
+    margin: 12px 0 4px;
+    padding: 0;
+}
+#profileSummary ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+.pageheader {
+    padding: 5px 5px 5px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.pagetitle {
+    font-size: 18pt;
+    line-height: normal;
+    font-weight: bold;
+}
+
+.newpagetitle {
+    color: #ccc !important;
+}
+
+.steptitle {
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 7px;
+}
+
+.substeptitle {
+    font-size: 12px;
+    font-weight: bold;
+    margin: 2px 4px 4px 4px;
+    padding: 2px 4px 1px 4px;
+}
+
+.has-blog-sidebar #title-text a {
+    word-wrap: break-word;
+    display: inline-block;
+    max-width: 75%;
+}
+
+.stepdesc {
+    font-size: 10pt;
+    line-height: 13pt;
+    font-weight: normal;
+    color: #666;
+    margin-top: 7px;
+    margin-bottom: 7px;
+}
+
+.steplabel {
+    font-weight: bold;
+    margin-right: 4px;
+    color: black;
+    float: left;
+    width: 15%;
+    text-align: right;
+}
+
+.stepfield {
+    background: #f0f0f0;
+    padding: 5px;
+}
+
+.submitButtons{
+    margin-top:5px;
+    text-align:right;
+}
+
+.formtitle {
+    font-size: 12px;
+    font-weight: bold;
+}
+
+.sectionbottom {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.topRow {
+    border-top-width: 2px;
+    border-top-style: solid;
+}
+
+/* CONF-20585:
+ * non-dashboard headings will keep their current style
+ * text styling is duplicated in the div because not all divs contain headings
+ */
+.tabletitle {
+    font-size: 10pt;
+    font-weight: bold;
+    padding: 3px 0 2px 0;
+    margin: 8px 4px 2px 0;
+    border-bottom-width: 2px;
+    border-bottom-style: solid;
+}
+.tabletitle h2,
+.wiki-content .tabletitle h2 {
+    font-size: 10pt;
+    font-weight: bold;
+    padding: 0;
+    margin: 0;
+}
+form[name=inlinecommentform] .tabletitle {
+    border: 0;
+}
+
+/* CONF-20585:
+ * .tabletitle on the dashboard is purely a container
+ * dashboard headings are styled like .welcome-message-heading
+ */
+.dashboard .tabletitle {
+    margin: 0;
+    padding: 0;
+    border: none;
+}
+.dashboard .tabletitle h2 {
+    font-size: 14pt;
+    color: #3C78B5;
+    font-weight: normal;
+    font: Arial FreeSans Helvetica sans-serif;
+    padding: 3px 0 2px 0;
+    margin: 1em 0 0 0;
+    border-bottom: 1px solid #ccc
+}
+
+.tabletitleops {
+    float: right;
+}
+.tabletitleops, .tabletitleops a, .tabletitleops img {
+    vertical-align: middle;
+}
+.tabletitleops img {
+    border: none;
+}
+
+.fullWidth {
+    width: 100%;
+}
+
+.pagesubheading {
+    color: #666;
+    font-size: 10px;
+    padding: 0 0 5px 0;
+}
+
+hr {
+    color: #ccc;
+    height: 1px;
+}
+
+h1 a:link, h1 a:visited, h1 a:active {
+    text-decoration: none;
+}
+
+.logocell {
+    padding: 10px;
+}
+
+input {
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 10pt;
+    color: #000;
+}
+input[type='password'] {
+    -webkit-appearance: caps-lock-indicator;
+}
+
+textarea, textarea.editor {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    color: #333;
+}
+
+.spacenametitle-printable {
+    font: 20px Impact, Arial, Helvetica;
+    font-weight: 100;
+    line-height: 25px;
+    margin: 0;
+}
+
+.spacenametitle-printable a,
+.spacenametitle-printable a:visited {
+    text-decoration: none;
+}
+
+.blogDate {
+    font-weight: bold;
+    text-decoration: none;
+    color: black;
+}
+
+.blogSurtitle {
+    background: #f0f0f0;
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.blog-post-listing {
+    margin-bottom: 66px;
+}
+
+.blog-post-listing .logo-heading-block {
+    padding-left: 61px;
+}
+
+.blog-post-listing a.blogHeading{
+    margin: 0.05em 0;
+    padding: 0;
+}
+
+.blog-post-listing .blogHeading{
+    display: inline-block;
+    word-wrap: break-word;
+    margin: 0.1em 0;
+}
+.blog-post-listing .logoBlock{
+    display: inline-block;
+    float: left;
+    margin-left: -61px;
+    vertical-align: top;
+}
+
+.blog-post-listing .page-metadata{
+    margin: 0.1em 0 0.1em 0.1em;
+}
+
+.blog-post-listing .page-metadata.not-personal{
+   font-size: 1em;
+}
+
+.blog-post-listing .wiki-content {
+    clear: both;
+}
+
+a.blogHeading {
+    font-size: 20pt;
+    line-height: normal;
+    font-weight: bold;
+    text-decoration: none;
+    word-wrap: break-word;
+}
+
+.blogHeading a:hover {
+   text-decoration: underline;
+}
+
+.blog-pagination{
+    padding-bottom: 1em;
+}
+
+.endsection {
+    color: #666;
+    clear: both;
+    padding: 1em 0 0.5em;
+    font-size: 1em;
+}
+.endsectionleftnav {
+    text-align: right;
+    color: #666;
+    clear: both;
+    padding-top: 10px;
+}
+
+.endsection img{
+    border: 0;
+    vertical-align: middle;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    line-height: normal;
+    font-weight: bold;
+    padding: 2px;
+}
+
+h1 {
+    font-size: 24px;
+    margin: 36px 0 4px 0;
+}
+
+h2 {
+    font-size: 18px;
+    margin: 27px 0 4px 0;
+}
+
+h3 {
+    font-size: 14px;
+    margin: 21px 0 4px 0;
+}
+
+h4 {
+    font-size: 12px;
+    margin: 18px 0 4px 0;
+}
+
+h5 {
+    font-size: 10px;
+    margin: 14px 0 4px 0;
+}
+
+h6 {
+    font-size: 8px;
+    margin: 14px 0 4px 0;
+}
+
+.smallfont {
+    font-size: 10px;
+}
+.descfont {
+    color: #666;
+    font-size: 10px;
+}
+.smallerfont {
+    font-size: 9px;
+}
+.smalltext {
+    color: #666;
+    font-size: 12px;
+}
+.smalltext a {
+    color: #666;
+}
+.greyText
+{
+    color: #666;
+}
+.smalltext-blue {
+    font-size: 8pt;
+    color: #69c;
+}
+.surtitle {
+    margin-left: 1px;
+    margin-bottom: 5px;
+    font-size: 14px;
+    color: #666;
+}
+
+/* css hack found here:  http://www.fo3nix.pwp.blueyonder.co.uk/tutorials/css/hacks/ */
+.navItemOver {
+    font-size: 10px;
+    font-weight: bold;
+    voice-family: "\'}\'";
+    voice-family: inherit;
+    cursor: pointer;
+}
+
+.navItem {
+    font-size: 10px;
+    font-weight: bold;
+    color: #fff;
+}
+
+.navItemOver a,
+.navItemOver a:visited,
+.navItemOver a:hover,
+.navItem a,
+.navItem a:hover,
+.navItem a:visited {
+    text-decoration: none;
+}
+
+div.padded {
+    padding: 4px;
+}
+
+div.thickPadded {
+    padding: 10px;
+}
+
+h3.macrolibrariestitle {
+    margin: 0;
+}
+
+div.centered {
+    text-align: center;
+    margin: 10px;
+}
+
+div.centered table {
+    margin: 0 auto;
+    text-align: left;
+}
+
+.tableview table {
+    margin: 0;
+}
+
+.tableview tr.alternateRow {
+    background: #f0f0f0;
+}
+
+.tableview th {
+    text-align: left;
+    font-size: 12px;
+    padding: 5px 15px 2px 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+.tableview td {
+    text-align: left;
+    border-color: #eee;
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    margin: 0;
+    padding: 5px 15px 3px 0;
+}
+
+.grid {
+    margin: 2px 0 5px 0;
+    border-collapse: collapse;
+}
+.grid th  {
+    border: 1px solid #ccc;
+    padding: 2px 4px 2px 4px;
+    background: #f0f0f0;
+    text-align: center;
+}
+.grid td  {
+    border: 1px solid #ccc;
+    padding: 3px 4px 3px 4px;
+}
+.gridHover {
+    background-color: #f9f9f9;
+}
+
+td.infocell {
+    background-color: #f0f0f0;
+}
+.error {
+    background-color: #fcc;
+}
+
+.errorBox {
+    background-color: #fcc;
+    border: 1px solid #c00;
+    padding: 5px;
+    margin: 5px;
+}
+
+.errorMessage, .errorMessage p {
+    color: #c00;
+}
+
+.success {
+    background-color: #dfd;
+}
+
+.successBox {
+    background-color: #dfd;
+    border: 1px solid #090;
+    padding: 5px;
+    margin-top:5px;
+    margin-bottom:5px;
+}
+
+blockquote {
+    font-style: italic;
+    font-size: 10pt;
+    border-left-width: 1px;
+    border-left-style: solid;
+    padding: 0 20px;
+    margin: 10px 20px;
+}
+
+blockquote p {
+    font-size: 10pt;
+}
+
+blockquote em {
+    font-style: normal;
+}
+
+div.small {
+    font-size: 9px;
+}
+
+h1.pagename {
+    margin-top: 0;
+}
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote {
+    text-align: center;
+    font-size: 11px;
+    color: red;
+}
+
+/* How the preview content should be shown */
+.previewcontent {
+    background: #e0e0e0;
+}
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent {
+    background: #e0e0e0;
+}
+
+.createlink,
+a.createlink,
+a.createlink:link,
+a.createlink:visited,
+a.createlink:active,
+a.createlink:hover {
+    color: maroon;
+}
+.templateparameter {
+    font-size: 9px;
+    color: #00008b;
+}
+
+#page-diffs, #conflict-diffs{
+    min-height: 54px;
+}
+
+#page-diffs {
+    margin-bottom: 2em;
+}
+#page-diffs .diff {
+    margin-top: 0;
+}
+#page-diffs .diff div {
+    word-wrap: break-word;
+}
+
+.key-diffs {
+    border: 1px solid #CCCCCC;
+    float: right;
+    padding: 0.5em;
+}
+.key-diffs .diff {
+    margin: 0;
+    padding: 0;
+}
+
+.diff {
+    font: 12px Monaco, Consolas, "Courier New", monospace;
+    padding: 0 0 0 1.5em;
+    margin-top: 1em;
+}
+.diff td {
+    font-size: 0.9em;
+    padding-bottom: 0.3em;
+}
+.diff-added-lines, .diff-added-words, .diff-added-chars {
+    background: #dfd;
+}
+.diff-deleted-lines, .diff-deleted-words, .diff-deleted-chars {
+    color: #999;
+    background: #fdd;
+    text-decoration: line-through;
+}
+.differror {
+    background: #A52A2A;
+}
+
+div.diff-snip-link img.twixie,
+div.diff-snip-text img.twixie {
+    margin: 0 4px -6px -20px; /* Twixie is 16 pixels wide, sum of left and right margins should be -16px */
+}
+
+div.diff-snip-link,
+div.diff-snip-text {
+    margin: 0.85em 0;
+}
+
+.greybackground {
+    background: #f0f0f0
+}
+
+.greybox {
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.borderedGreyBox {
+    background-color: #F0F0F0;
+    padding: 0.9em;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    margin-bottom: 17px;
+
+}
+
+.space-labels div.borderedGreyBox{
+    float: right;
+    width: 189px;
+}
+
+
+
+.borderedLabelHeading{
+    border-bottom: 1px solid #CCCCCC;
+    color: #333333;
+    font-size: 13px;
+    font-weight: bold;
+    margin-bottom: 0.7em;
+}
+
+.greyboxfilled {
+    border: 1px solid #ddd;
+    background: #f0f0f0;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.lightGreyBox {
+    background: #fafafa;
+}
+
+.navBackgroundBox {
+    padding: 5px;
+    font-size: 22px;
+    font-weight: bold;
+    color: white;
+    text-decoration: none;
+}
+
+.previewBoxTop {
+    background-color: #f0f0f0;
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+    padding: 5px;
+    margin: 5px 0px 0px 0px;
+    text-align: center;
+}
+.previewContent {
+    background-color: #fff;
+    border-width: 0px 1px 0px 1px;
+    border-style: solid;
+    padding: 10px;
+    margin: 0px;
+}
+.previewBoxBottom {
+    background-color: #f0f0f0;
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    padding: 5px;
+    margin: 0px 0px 5px 0px;
+    text-align: center;
+}
+
+.functionbox {
+    background-color: #f0f0f0;
+    border: 1px solid;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.functionbox-greyborder {
+    background-color: #f0f0f0;
+    border: 1px solid #ddd;
+    padding: 3px;
+    margin: 1px 1px 10px 1px;
+}
+
+.rowNormal {
+    background-color: #fff;
+ }
+
+.rowAlternate {
+    background-color: #f7f7f7;
+}
+
+/* used in the list attachments table */
+.rowAlternateNoBottomColor {
+    background-color: #f7f7f7;
+}
+
+.rowAlternateNoBottomColor td,
+.rowAlternateNoBottomNoColor td {
+    border-bottom: 0;
+}
+
+.rowHighlight {
+    background-color: #f0f0f0;
+}
+
+td.greenBar,
+td.greenbar,
+td.graybar,
+td.redbar,
+td.darkredbar {
+    font-size: 1em;
+    border: 1px solid #9c9c9c;
+    padding: 0;
+}
+
+td.greenBar,
+td.greenbar {
+    background: #00df00;
+}
+td.graybar {
+    background: #808080;
+}
+td.redbar {
+    background: #df0000;
+}
+td.darkredbar {
+    background: #af0000;
+}
+
+tr.testpassed {
+    font-size: 2px;
+    background: #dfd;
+    padding: 0;
+}
+tr.testfailed {
+    font-size: 2px;
+    background: #fdd;
+    padding: 0;
+}
+
+.toolbar  {
+    margin: 0;
+    border-collapse: collapse;
+}
+
+.toolbar td  {
+    border: 1px solid #ccc;
+    padding: 2px;
+    color: #ccc;
+}
+
+td.noformatting {
+    border-width: 0;
+    border-style: none;
+    text-align: center;
+    padding: 0;
+}
+
+/*
+ * Divs displaying the license information, if necessary.
+ */
+.license {
+    border-top: 1px solid #bbb;
+    text-align: center;
+    font-size: 10pt;
+    background-color: #ffffe0;
+}
+
+.license-eval, .license-none {
+    background-color: #fcc;
+}
+
+.license-eval b, .license-none b {
+    color: #900;
+}
+
+/*
+ * The shadow at the bottom of the page between the main content and the
+ * "powered by" section.
+ */
+.bottomshadow {
+    height: 12px;
+    background-image: url("../../../images/border/border_bottom.gif");
+    background-repeat: repeat-x;
+}
+
+/*
+ * Styling of the operations box
+ */
+.navmenu .operations li, .navmenu .operations ul {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.navmenu .operations ul {
+    margin-bottom: 9px;
+}
+
+.navmenu .label {
+    font-weight: inherit;
+}
+
+/*
+ * Styling of ops as a toolbar
+ */
+.toolbar div {
+    display: none;
+}
+
+.toolbar .label {
+    display: none;
+}
+
+.toolbar .operations {
+    display: block;
+}
+
+.toolbar .operations ul {
+    display: inline;
+    list-style: none;
+    margin-left: 10px;
+    padding-left: 0;
+}
+
+.toolbar .operations li {
+    list-style: none;
+    display: inline;
+}
+
+.bold {
+    font-weight: bold;
+}
+
+
+/* space action links */
+.tabnav .spaceActionLinks {
+    float: right;
+    margin: 0;
+    display: block;
+}
+
+.tabnav .spaceActionLinks a span {
+    text-decoration: underline;
+}
+.tabnav .spaceActionLinks a.current {
+    color: black;
+}
+.tabnav .spaceActionLinks a.current span {
+    text-decoration: none;
+}
+
+.tabnav .spaceActionLinks a.current:link {
+    color: black;
+}
+
+.tabnav .spaceActionLinks a.current:visited {
+    color: black;
+}
+
+/* non tabs */
+.tabnav .nontabs {
+    padding: 0;
+    margin: 5px 0 0 3px;
+    display: block;
+    float: left;
+}
+
+/* editor tab customizations of the tabnav */
+#markupTab, #wysiwygTab, #previewTab {
+    font-size: 9pt;
+    padding: 3px 5px 2px; /* tab padding */
+    margin: 8px 0 0 3px; /* margin-top is used to 'push' the tab down to fill in any gaps */
+    font-weight: normal;
+}
+
+/* alphabet list */
+#squaretab {
+    margin-left: 0;
+    padding-left: 0;
+    white-space: nowrap;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 8pt;
+    line-height: 11pt
+}
+
+#squaretab li {
+    display: inline;
+    list-style-type: none;
+}
+
+#squaretab a {
+    padding: 5px 7px 3px 7px;
+    border-width: 1px;
+    border-style: solid;
+}
+
+#squaretab a:link,
+#squaretab a:visited {
+    color: #fff;
+    text-decoration: none;
+}
+
+#squaretab a:hover {
+    text-decoration: none;
+}
+
+#current {
+    background: #fff;
+    color: #000;
+}
+
+.blogcalendar th,
+.blogcalendar td  {
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+}
+
+table.blogcalendar {
+    border-width: 1px;
+    border-style: solid;
+}
+
+.blogcalendar th.calendarhead,
+a.calendarhead {
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    letter-spacing: 0.3em;
+    text-transform: uppercase;
+}
+
+.blogcalendar th.calendarhead,
+.calendarhead,
+.calendarhead:link,
+.calendarhead:visited,
+.calendarhead:active,
+.calendarhead:hover {
+    color: #fff;
+}
+
+.blogcalendar th {
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    background-color: #f0f0f0;
+}
+
+.blogcalendar td {
+    font-size: x-small;
+    font-weight: normal;
+}
+
+.sidebar-section #bloglist{
+    margin-top: 5px;
+    display: inline;
+}
+
+
+#bloglist{
+    background-color: #f0f0f0;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    width: 22em;
+    padding-top: 0.1em;
+}
+
+.blogmonthnavigation{
+    border:1px solid #CCCCCC;
+    position:relative;
+    text-decoration:none;
+    display: inline-block;
+    width: 10em;
+    font-size: 0.85em;
+    text-align:center;
+    margin: 0 0.3em 1em 1.1em;
+    padding: 0.2em 0.4em;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+div.pagination .blogmonthnavigation{
+    margin: 0 0.5em 0 0;
+    width: 5em;
+    font-size: 1em;
+}
+
+#blog-sidebar .bloglistmultiple{
+    position: absolute;
+}
+
+.bloglistitems li .icon-container {
+    display:block;
+    float:none;
+    padding-left:1.75em;
+}
+
+.bloglistmultiple .bloglistheading h2{
+    padding-top: 0;
+}
+
+.bloglistitems{
+    list-style-type: none;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+.bloglistitems li{
+    padding-bottom: 7px;
+    word-wrap: break-word;
+}
+
+.bloglistitems li img{
+    padding-right: 0.5em;
+    vertical-align: middle;
+}
+
+
+.bloglistheading h2{
+    text-align: left;
+    margin: 1em;
+    color: #333333;
+}
+
+.bloglistheading h2 a{
+    text-decoration: none;
+    color: #333333;
+}
+
+.has-personal-sidebar .bloglistheading h2 a,
+.has-personal-sidebar .bloglistheading h2
+{
+    margin-left: -0.1em;
+    margin-right: -0.1em;
+    padding: 0.1em 0.1em 0.2em;
+}
+
+.has-personal-sidebar .bloglistitems
+{
+    margin-left: -0.9em;
+}
+
+.has-personal-sidebar .blogmonthnavigation
+{
+    margin-left: 0;
+    margin-right: 1em;
+
+}
+
+#bloglist .control {
+    position: absolute;
+    top: 8px;
+}
+#bloglist .control.prev {
+    left: 13px;
+}
+
+#bloglist .control.next {
+    right: 13px;
+}
+
+.searchGroup {
+    padding: 0 0 10px 0;
+    background: #f0f0f0;
+}
+
+.searchGroupHeading {
+    font-size: 10px;
+    font-weight: bold;
+    color: #fff;
+    padding: 2px 4px 1px 4px;
+}
+
+.searchItem {
+    padding: 1px 4px;
+}
+
+.searchItemSelected {
+    padding: 1px 4px;
+    font-weight: bold;
+    background: #ddd;
+}
+
+/* permissions page styles */
+.permissionHeading {
+    border-bottom: #bbb;
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    font-size: 16px;
+    text-align: left;
+}
+
+.permissionTab,
+.permissionSuperTab,
+.permissionCell {
+    border-width: 0 0 0 1px;
+    border-style: solid;
+}
+
+.permissionTab {
+    font-size: 10px;
+}
+
+.permissionCell {
+    border-left: #bbb;
+    white-space: nowrap;
+}
+
+/* side menu highlighting (e.g. space content screen) */
+.optionPadded {
+    padding: 2px;
+}
+
+.optionSelected, .optionPadded.selected {
+    background-color: #ffc;
+    padding: 2px;
+    border: 1px solid #ddd;
+    margin: -1px;
+}
+
+.optionSelected a, .optionPadded.selected a {
+    font-weight: bold;
+    text-decoration: none;
+    color: black;
+}
+
+/* styles for extended operations */
+.greyLinks a:link,
+.greyLinks a:visited,
+.greyLinks a:active,
+.greyLinks a:hover {
+    color: #666;
+    text-decoration: underline;
+}
+
+.greyLinks {
+    color: #666;
+    padding: 10px;
+}
+
+.operation-links {
+    color: #666;
+    margin-bottom: 10px;
+}
+.operation-links a:link,
+.operation-links a:visited,
+.operation-links a:active,
+.operation-links a:hover {
+    color: #666;
+    text-decoration: underline;
+}
+
+.separatorLinks a:link,
+.separatorLinks a:visited,
+.separatorLinks a:active {
+    color: white;
+}
+
+.greynavbar {
+    background-color: #f0f0f0;
+    border-top-width: 1px;
+    border-top-style: solid;
+}
+
+div.headerField {
+    float: left;
+    width: auto;
+    height: 100%;
+}
+
+.headerFloat {
+    margin-left: auto;
+    width: 50%;
+}
+
+.headerFloatLeft {
+    float: left;
+    margin-right: 20px;
+    margin-bottom: 10px;
+}
+
+#headerRow {
+    padding: 10px;
+}
+
+.greyFormBox {
+    border: 1px solid #ccc;
+    padding: 5px;
+}
+
+.openPageHighlight {
+    background-color: #ffc;
+    padding: 2px;
+    border: 1px solid #ddd;
+}
+
+.editPageInsertLinks, .editPageInsertLinks a {
+    color: #666;
+    font-weight: bold;
+    font-size: 10px;
+}
+
+/* Style for label heatmap. */
+.top10 a {
+    font-weight: bold;
+    font-size: 2em;
+    color: #036;
+}
+.top25 a {
+    font-weight: bold;
+    font-size: 1.6em;
+    color: #036;
+}
+.top50 a {
+    font-size: 1.4em;
+    color: #036;
+}
+.top100 a {
+    font-size: 1.2em;
+    color: #036;
+}
+
+.heatmap {
+    list-style: none;
+    width: 95%;
+    margin: 0 auto;
+}
+
+.heatmap a {
+    text-decoration: none;
+}
+
+.heatmap a:hover {
+    text-decoration: underline;
+}
+
+.heatmap li {
+    display: inline;
+}
+
+.minitab {
+    padding: 5px;
+    margin: 1px 0 0 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    text-decoration: none;
+    float: none;
+}
+
+.minitab a {
+    padding: 5px 5px;
+    margin-left: 3px;
+    margin-top: 1px;
+    border-top: 1px solid;
+    border-right: 1px solid;
+    border-left: 1px solid;
+}
+
+#makeRichTextDefault, #makeMarkupDefault {
+    border: 0;
+    font-weight: normal;
+    text-decoration: none;
+    display: block;
+    height: 2.5em;
+}
+
+.minitab .selected {
+    background: white;
+    border-bottom: 1px solid white;
+    color: #000;
+    text-decoration: none;
+}
+.minitab .unselected {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    color: #fff;
+    text-decoration: none;
+}
+
+.minitab a.unselected:link,
+.minitab a.unselected:visited {
+    color: white;
+}
+.minitab a.selected:link,
+.minitab a.selected:visited {
+    color: black;
+}
+
+.minitabFont {
+    font-size: 9pt;
+    line-height: 9pt;
+}
+
+.linkerror {
+    background-color: #fcc;
+}
+
+a.labelOperationLink:link,
+a.labelOperationLink:active,
+a.labelOperationLink:visited,
+a.labelOperationLink:hover {
+    text-decoration: underline;
+}
+
+a.newLabel:link,
+a.newLabel:active,
+a.newLabel:visited,
+a.newLabel:hover {
+    background-color: #dfd;
+}
+
+ul.square {
+    list-style-type: square;
+}
+
+/* Label auto complete styles needed until we use requireResource properly in labels-include.vm */
+div.auto_complete {
+    width: 350px;
+    background: #fff;
+}
+div.auto_complete ul {
+    border: 1px solid #888;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style-type: none;
+}
+div.auto_complete ul li {
+    margin: 0;
+    padding: 3px;
+}
+div.auto_complete ul li.selected {
+    background-color: #ffb;
+}
+div.auto_complete ul strong.highlight {
+    color: #800;
+    margin: 0;
+    padding: 0;
+}
+
+/******* Edit Page Styles *******/
+.toggleFormDiv{
+    border: 1px solid #a7a6aa;
+    background-color: white;
+    margin-top: 5px;
+}
+
+.toogleInfoDiv{
+    border: 1px solid #a7a6aa;
+    background-color: white;
+    display: none;
+    padding: 5px;
+    margin-top: 10px;
+}
+
+.inputSection{
+    margin-bottom: 20px;
+}
+
+#anonymous-warning {
+    padding: 15px 10px;
+}
+
+#editBox{
+   border: 1px solid #d3d3d3;
+   background-color: #f0f0f0;
+}
+
+.tab-navigation .current a {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff;
+}
+
+.replaced {
+    background-color: #3c6;
+}
+
+.topPadding {
+    margin-top: 20px;
+}
+
+/* new form style */
+.form-block {
+    padding: 6px;
+}
+.form-error-block {
+    background: #fcc;
+    border-top: #f0f0f0 1px solid;
+    border-bottom: #f0f0f0 1px solid;
+    margin-bottom: 6px;
+    padding: 0 12px;
+}
+.form-element-large {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.form-element-small {
+    font-size: 12px;
+    font-weight: bold;
+}
+
+.form-header {
+    background: #ffffe0;
+    border-top: #f0f0f0 1px solid;
+    border-bottom: #f0f0f0 1px solid;
+    margin-bottom: 6px;
+    padding: 12px;
+}
+.form-header p, .form-block p, .form-error-block p {
+    line-height: normal;
+    margin: 12px 0;
+}
+.form-example {
+    color: #888;
+    font-size: 11px;
+}
+.form-divider {
+    border-bottom: #ccc 1px solid;
+    margin-bottom: 6px;
+}
+.confluence-button,
+a.confluence-button,
+a.confluence-button:link,
+a.confluence-button:hover,
+a.confluence-button:visited {
+    text-decoration: none;
+    border: 1px solid #aaa;
+    color: #000;
+    padding: 5px 10px;
+    cursor: default;
+    background: #fff url(../../../images/decoration/buttons-bg-white.png) repeat-x 0 100%;
+    -moz-border-radius: 5px; /* Firefox */
+    -webkit-border-radius: 5px; /* Safari */
+}
+
+.confluence-button:active,
+a.confluence-button:active {
+    border-color: #69c;
+    background-color: #eee;
+    background-image: url(../../../images/decoration/buttons-bg.png);
+}
+
+.form-block .error {
+    padding: 6px;
+    margin-bottom: 6px;
+}
+
+form.edit-trust-app fieldset {
+    border: none;
+}
+form.edit-trust-app fieldset div {
+    border: none;
+    border-left: solid 11em #f0f0f0;
+    padding: 0;
+    float: left;
+}
+form.edit-trust-app fieldset label {
+    float: left;
+    width: 10em;
+    padding: 0;
+    margin: 5px 1em 0 -10.5em;
+    text-align: right;
+    clear: left;
+}
+form.edit-trust-app fieldset input,
+form.edit-trust-app fieldset textarea {
+     margin: 5px 0 0 0;
+     float: left;
+}
+form.edit-trust-app fieldset div.buttons {
+     border: none;
+     clear: left;
+     text-align: center;
+     float: none;
+}
+form.edit-trust-app fieldset div.buttons input {
+     float: none;
+}
+
+.status-red {
+    color: #800;
+    font-weight: bold;
+}
+.status-green {
+    color: #080;
+    font-weight: bold;
+}
+
+.person {
+    background-color: white;
+    width: 200px;
+    float: left;
+}
+.person td {
+    white-space: nowrap;
+}
+
+#blogcalendar span.fwdArrow {
+    float: right;
+    display: block;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-image: url(/images/icons/forwd_16.gif);
+}
+#blogcalendar span.fwdArrow span {
+    display: none;
+}
+#blogcalendar span.backArrow {
+    float: left;
+    display: block;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-image: url(/images/icons/back_16.gif);
+}
+#blogcalendar span.backArrow span {
+    display: none;
+}
+.pageInfoTable {
+    padding: 0;
+    margin: 0;
+    border: 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+.pageInfoTable td {
+    padding: 3px;
+}
+.pageInfoTable tr.alternateRow {
+    background: #f0f0f0;
+}
+.pageInfoLayoutTable {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.pageInfoLayoutTable td {
+    padding: 5px 16px 5px 0;
+}
+
+.pageInfoLayoutTable .tableview td {
+    padding-left: 0;
+}
+
+.pageInfoLayoutTable ul {
+    padding-left: 20px;
+    list-style-type: none;
+}
+
+.memoryusagebar {
+    width: 100%;
+}
+.memoryusagebar td {
+    border: none !important;
+    vertical-align: middle !important;
+}
+
+input.alignedCheckbox {
+    margin: 0;
+}
+
+div.spacer {
+    clear: both;
+}
+
+span.left {
+    float: left;
+    text-align: left;
+}
+
+span.right {
+    float: right;
+    text-align: right;
+}
+
+.nobr {
+    white-space: nowrap;
+}
+
+label.normal {
+    font-weight: normal;
+    color: black
+}
+
+div.leftFloatMargined {
+    float: left;
+    margin-right: 2px
+}
+
+#entitySearchResults {
+    border-collapse: collapse;
+    background-color: #fafafa;
+    text-align: left;
+    width: 100%;
+}
+
+#entitySearchResults td {
+    border-top: 1px solid #ccc;
+    padding: 3px;
+    background-color: white;
+    vertical-align: top;
+}
+
+#entitySearchResults th {
+    color: #666;
+    padding: 3px;
+    white-space:nowrap;
+}
+
+#entitySearchResults .firstColumn {
+    width: 2%;
+    text-align: right;
+}
+
+#entitySearchResults .secondColumn {
+    width: 1px;
+    text-align: right;
+}
+
+a.paddedGreyDisabled {
+    background-color: #f0f0f0;
+    padding: 4px;
+    text-decoration: none;
+    color: #666;
+}
+
+a.grey {
+    color: #666;
+}
+
+div.topBottomMargin {
+    margin: 10px 0 10px 0
+}
+
+div.bottomMargin {
+    margin-bottom: 10px
+}
+
+table.spaceList {
+    border-collapse: collapse;
+}
+
+tr.spaceList td {
+    padding: 5px 0 5px 5px;
+    border-bottom: 1px solid #eee;
+    vertical-align: top;
+}
+
+.spaceList .spaceDescription {
+    margin-top: 3px;
+    color: #666;
+}
+
+tr.spaceList .operations {
+    vertical-align: top;
+    padding-right: 5px;
+}
+
+.fontSizeBigger {
+    font-size: 11pt;
+    line-height: 14pt;
+}
+
+.fontSizeDefault {
+    line-height: 1.3em;
+}
+
+.fontSizeSmaller {
+    font-size: 10pt;
+    line-height: 13pt;
+}
+
+/* deprecated. TODO - check for use in themes and remove. */
+.fontSizeTiny {
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 8pt;
+    line-height: 11pt;
+}
+
+table.dashboard td.left {
+    padding-right: 16px;
+}
+
+/* dashboard action buttons */
+.dashboard .dashboard-action-button {
+    overflow: auto;
+    padding: 10px 0 20px 0;
+}
+.dashboard .dashboard-action-button span {
+    clear: both;
+    display: block;
+    margin: 0 0 10px 0;
+}
+.dashboard .dashboard-action-button span a,
+.dashboard .dashboard-action-button span a:focus,
+.dashboard .dashboard-action-button span a:hover {
+    color: #003366;
+    float: left;
+    padding: 0 10px 0 9px;
+    font-weight: bold;
+}
+/* pull the icons out so the link underline doesn't extend under them */
+.dashboard .dashboard-action-button span.icon {
+    float: left;
+    left: -5px;
+    position:relative;
+}
+/* end dashboard action buttons */
+
+#view-attachments .dashboard-action-spacing{
+    padding-top: 6px;
+    padding-bottom: 3px;
+}
+
+#view-attachments a.dashboard-action{
+    color: #000;
+}
+
+.dashboard .dashboard-action:hover, #view-attachments .dashboard-action:hover {
+    color: #4F85BC;
+    background-position: 100% 0;
+}
+
+.clearBoth {
+    clear: both;
+}
+
+#labelInputSpan {
+    margin-top: 1px;
+}
+
+form#quickSearch {
+    margin: 2px;
+    padding: 0;
+}
+
+form#quickSearch input {
+    font-size: 10pt;
+    vertical-align: middle;
+}
+
+table.fullWidthBorderless
+{
+    width: 100%;
+    border: 0;
+    border-collapse: collapse;
+}
+
+/* Hacks for YUI menustuff */
+
+#pageMenusMenuBar {
+   padding: 4px;
+}
+
+#notificationFormat {
+    padding: 0;
+    margin: -9px 15px;
+}
+
+#notificationFormat h4 {
+    font-weight: normal;
+}
+
+#notificationFormat h2 {
+    font-weight: normal;
+}
+
+#rssFormat {
+    padding: 0;
+    margin: 6px 15px;
+}
+
+.notificationGreySide {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 0 0 5px 0;
+    padding: 3px 17px;
+}
+
+.notificationDigest {
+    padding: 0 17px;
+}
+
+.darkBlue {
+    color: #036;
+}
+
+.grey {
+    color: #666;
+}
+
+table.attachments {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+table.attachments th {
+    white-space: nowrap;
+    width: 1%;
+}
+
+table.attachments td {
+    white-space: nowrap;
+    vertical-align: top;
+    width: 1%;
+}
+
+table.attachments td.comment, table.attachments th.comment, table.attachments td.attachedto, table.attachments th.attachedto {
+    white-space: normal;
+    width: auto;
+}
+
+#contentOptions {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#exportContentTree {
+    list-style-type: none;
+    margin: 5px 0;
+}
+
+#contentOptionAllNote {
+    color: #666;
+    font-weight: normal;
+}
+
+/* hidden: use when we want the content totally unavailable. */
+.hidden,
+li.hidden {
+    display: none !important;
+    visibility: hidden;
+}
+
+/* assistive: use when the hidden content should remain available to screen readers */
+.assistive, legend.assistive span {
+    position: absolute;
+    left: -20000px;
+    width: 4000px;
+    overflow: hidden;
+    top: 0;
+    height: 0;
+}
+
+/* Needed for IE to stop the menu being expanded to 4000px */
+.ajs-menu-bar .ajs-menu-item .assistive {
+    position: absolute;
+    left: -20000px;
+    width: 4000px;
+    display: block;
+    visibility: visible;
+}
+
+.ajs-menu-bar .ajs-menu-item .most-right-menu-item.assistive {
+    left: auto;
+    right: 20000px;
+}
+
+#main {
+    text-align: left;
+    background-color: #fff;
+}
+#header {
+    min-height: 1.8em;
+    line-height: 1.8;
+    margin: 0;
+    padding: 0;
+    position: relative;
+    z-index: 1;
+}
+.quick-search {
+    margin: 0;
+    padding: 0;
+}
+#quick-search fieldset {
+    float: right;
+}
+.quick-search fieldset {
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+.quick-search legend {
+    display: none;
+}
+input.blank-search,
+input.placeholded,
+.quick-search .placeholded {
+    color: #666;
+}
+#quick-search-query {
+    width: 13em;
+}
+/* default user navigation styles for themes using the old markup */
+#user-control-panel, #page-view-panel, #page-prefs-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#user-control-panel li,
+#page-view-panel li,
+#page-prefs-list li,
+.userNavBar li { /* deprecated styles provided for themes written prior to 2.8 */
+    list-style: none;
+    display: inline;
+    color: #666;
+    font-size: 0.95em;
+    padding: 0 0 0 0.3em;
+}
+#user-control-panel a {
+    color: #666;
+}
+#user-control-panel li.first {
+    border:medium none;
+}
+#user-control-panel li {
+    border-left: 1px solid #666;
+    padding-left: 0.5em;
+}
+#page-view-panel li {
+    float: right;
+}
+
+#breadcrumbs {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    overflow: auto;
+}
+
+#breadcrumbs li {
+    white-space: nowrap;
+    display: inline;
+    float: left;
+    margin: 0 .2em 0 0;
+    padding-left: 15px;
+    background: url(../../../images/decoration/white_breadcrumbs_indicator.png);
+    background-repeat: no-repeat;
+    background-position: 3px center;
+}
+
+#breadcrumbs li.first {
+    padding-left: 0;
+    background-image: none;
+}
+
+#breadcrumbs li a {
+    text-decoration: none;
+}
+
+#breadcrumbs li a:hover {
+    text-decoration: underline;
+}
+
+#breadcrumbs li span {
+    display: block;
+}
+
+#ellipsis strong {
+    cursor: pointer;
+    font-weight: normal;
+}
+
+#breadcrumbs li.hidden-crumb {
+    display: none;
+}
+
+a.twisty-open, a.twisty-closed {
+    background: no-repeat 50% 50%;
+    float: left;
+    margin-right: 0.5em;
+}
+a.twisty-open {
+    background-image: url(../../../images/icons/arrow_down.gif);
+}
+a.twisty-closed {
+    background-image: url(../../../images/icons/arrow_right.gif);
+}
+
+a.print {
+    background: url(../../../images/icons/print_16.gif) no-repeat 50% 50%;
+}
+a.feed {
+    background: url(../../../images/icons/feed-icon-16x16.png) no-repeat 50% 50%;
+}
+a.pdf {
+    background: url(../../../images/icons/attachments/pdf.gif) no-repeat 50% 50%;
+}
+a.help {
+    background: url(../../../images/icons/help_16.gif) no-repeat 50% 50%;
+}
+a.add-user {
+    background: url(../../../images/icons/classic/16/125.png) no-repeat 50% 50%;
+}
+
+a.remove-user {
+    background: url(../../../images/icons/classic/16/123.png) no-repeat 50% 50%;
+}
+
+a.groups {
+    background: url(../../../images/icons/classic/16/127.png) no-repeat 50% 50%;
+}
+
+a.cancel {
+    background: url(../../../images/icons/emoticons/error.gif) no-repeat 50% 50%;
+}
+
+a.search-icon {
+    background: url(../../../images/icons/srch_16.gif) no-repeat 50% 50%;
+}
+
+a img {
+    border: none;
+}
+
+a.texticon {
+    min-height: 16px;
+    text-align: left;
+    padding:0 10px 0 20px;
+    background-position: 0 50%;
+    outline:0 none;
+}
+
+
+/* // Links **/
+#com-atlassian-confluence h1 {
+    line-height: 2;
+    margin: 0 0 10px 0;
+    padding: 0;
+    width: 100%;
+}
+#com-atlassian-confluence h1 img {
+    float: left;
+    margin: 0 .3em 0 0;
+}
+br.clear {
+    clear: both;
+    height: 1px;
+    overflow: hidden;
+}
+#footer, #footer-warning {
+    background: #f0f0f0;
+    text-align: center;
+}
+#footer p.license, #footer p.license a {
+    background: #036;
+    color: #fff;
+    margin: 0;
+}
+#poweredby {
+    border-top: 1px solid #bbb;
+    color: #666;
+    margin: 0;
+    padding: .5em;
+    list-style: none;
+}
+#poweredby a, #footer-warning {
+    color: #666;
+    text-decoration: none;
+}
+#poweredby li {
+    display: inline;
+}
+#poweredby li.print-only {
+    display: none;
+}
+
+#poweredby a:hover.hover-footer-link{
+    text-decoration: underline;
+}
+
+#footer p.warning {
+    margin: 0 40px 10px 40px;
+    text-align: center;
+}
+
+#menu-bar, #navigation .space-browse-links {
+    float: right;
+}
+#navigation .space-browse-links ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#menu-bar {
+    margin: 0 .5em;
+}
+table {
+    clear: left;
+}
+.space-browse-links a:link,
+.space-browse-links a:active,
+.space-browse-links a:visited {
+    border: 1px solid #69c;
+    color: #000;
+    display: block;
+    font-weight: bold;
+    line-height: 2;
+    margin: 0.35em 0 -1px 0.5em;
+    padding: 0 0.5em 0 24px;
+    position: relative;
+    text-decoration: none;
+}
+.space-browse-links a:hover {
+    background-color: #036;
+    border: 1px solid #036;
+    color: #fff;
+}
+.space-browse-links a img {
+    float: left;
+    left: 4px;
+    margin: -8px 0 0;
+    position: absolute;
+    top: 50%;
+}
+#tree-div {
+    min-height:300px;
+}
+.mailLabel {
+    color: #666;
+    font-weight: bold;
+}
+
+.unparented {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.parented {
+    list-style-image: url(../../../images/icons/link_out_bot.gif);
+}
+
+.mailthread ul {
+    list-style-image: url(../../../images/icons/link_out_bot.gif);
+}
+.selectedMail {
+  background-color: #ffc;
+  padding: 2px;
+  border: 1px solid #ddd;
+}
+
+.excerpt {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.captcha {
+    padding: 10px;
+}
+
+.captcha-image {
+    width: 200px;
+    height: 100px;
+}
+
+#version-info {
+    margin-bottom: 10px;
+    padding:15px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+.version-info span.page-history-view{
+    display: block;
+    padding-bottom: 5px;
+    padding-top: 5px;
+    margin-left: 24px;
+}
+
+.version-info span.page-history-view, .version-info span.page-history-view a {
+    color: #666666;
+    font-size: 9pt;
+
+}
+
+.version-info a.version-navigation{
+    border:1px solid #EEEEEE;
+    padding:0.2em 0.4em;
+    position:relative;
+    text-decoration:none;
+    top:1px;
+    display: inline-block;
+    min-width: 75px;
+    text-align:center;
+}
+
+.version-info span.current-version-margin{
+    margin: 15px;
+}
+
+.version-info div.navigation-spacing{
+    margin-left: 24px;
+    padding-top: 2px;
+    font-size: 8pt;
+
+}
+
+.version-info strong.version-info-description{
+    margin-left: 4px;
+}
+
+.has-sidebar #version-info{
+    margin-right: 17em;
+}
+
+.has-blog-sidebar #version-info{
+    margin-right: 24em;
+}
+
+/* Fix menu focus when selecting with mouse in Firefox */
+li:active, a:active {
+  outline: none;
+}
+
+/* Confluence global/space message styles */
+#messageContainer {
+    background: #fff;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#messageContainer li {
+    padding: 5px;
+    display: none;
+}
+
+.message-close-button {
+    height: 16px;
+    width: 16px;
+    border: none;
+    float: right;
+    cursor: pointer;
+}
+
+.page-metadata ul {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+}
+
+.page-metadata ul li {
+    list-style: none;
+    float: left;
+    padding: 0 5px 0 0;
+    margin: 0;
+}
+
+.page-metadata ul a.page-metadata-icon {
+    text-decoration: none;
+}
+
+.page-metadata ul a.page-restrictions span,
+.page-metadata ul a.page-tinyurl span,
+.page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    float: left;
+    height: 16px;
+    width: 16px;
+    text-indent: -9999em;
+}
+
+.page-metadata ul a.page-restrictions span {
+    background: url(../../../images/icons/lock_16_grey.png) no-repeat;
+}
+
+.page-metadata ul a.page-tinyurl span {
+    background: url(../../../images/icons/permalink_light_16.png) no-repeat;
+}
+
+.page-metadata ul a.page-tinyurl:hover span {
+    background: url(../../../images/icons/permalink_dark_16.png) no-repeat;
+}
+
+.page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    background: url(../../../images/icons/attach_16.png) no-repeat;
+}
+
+.on-label, .yes-label {
+    color: #090;
+    font-weight: 800;
+}
+
+.off-label, .no-label {
+    color: #900;
+    font-weight: 800;
+}
+
+.progress-fill-color {
+    background: #00df00;
+}
+
+.progress-background-color {
+    background: #fff;
+}
+
+.vertical-center-aligning-container {
+    display: table;
+    height: 400px;
+    /* position : relative; */
+    overflow: hidden;
+}
+
+.vertical-center-div-outer {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.vertical-center-div-inner {
+    text-align: center;
+}
+
+.in-progress {
+    background-color: #ccc;
+}
+
+h2.subheading,
+#profile-main h2.subheading {
+    border-bottom: 1px solid #ddd;
+    color: #333;
+    font-weight: normal;
+    font-size: 1.1em;
+    margin: 0;
+}
+
+.subheading {
+    color: #222;
+}
+
+/*Columns*/
+div.section.one {
+    float: left;
+    width: 40%;
+}
+div.section.two {
+    float: left;
+    width: 60%;
+}
+div.section.two .section {
+    margin-left: 10px;
+}
+
+.subheading .rss-icon {
+    background: url(../../../images/icons/feed-icon-16x16.png);
+    float: right;
+    height: 16px;
+    text-decoration: none;
+    width: 16px;
+    line-height: 0;
+}
+
+.subheading .email-notification-icon {
+    background: url(../../../images/icons/watch_on_16.png);
+    float: right;
+    height: 16px;
+    text-decoration: none;
+    width: 16px;
+    line-height: 0;
+    margin-right: 5px;
+}
+/* End Confluence master stylesheet */
+
+/** Font Colours */
+em.bad,
+strong.bad {
+    font-style: normal;
+    color: #900;
+}
+em.good,
+strong.good {
+    font-style: normal;
+    color: #090;
+}
+em.disabled,
+strong.disabled {
+    font-style: normal;
+    color: #999;
+}
+/* **/
+
+.blogpost .wiki-content {
+    _height: 1%;
+}
+
+#version-comment.noteMacro {
+    padding: 5px;
+
+}
+
+#space-admin-body {
+    padding: 0 10px;
+}
+
+#ajax-error {
+    background-color: #fcc;
+    border: 1px solid #741311;
+}
+
+#ajax-error span.error{
+    display: block;
+    text-align: center;
+    color: #741311;
+    line-height: 2;
+}
+
+#ajax-error span.error a.close{
+    margin-left: 10px;
+    text-decoration: underline;
+}
+
+#poweredby {
+    background-image: url(../../../images/decoration/footer-shadow.gif);
+    background-repeat: repeat-x;
+}
+
+#footer-warning {
+    display: block;
+    background-color: #ffffce;
+    border-top: 1px solid #f0c000;
+    border-bottom: 1px solid #f0c000;
+    color: #000;
+    padding: 2px 5px;
+}
+
+.welcome-message-heading{
+    font-size: 14pt;
+    color: #3C78B5;
+    font-weight: normal;
+    font: Arial FreeSans Helvetica sans-serif;
+    padding: 3px 0 2px 0;
+    margin: 1em 4px 0 0;
+    border-bottom: 1px solid #ccc;
+}
+.wiki-content,
+.wiki-content p,
+.wiki-content table,
+.wiki-content tr,
+.wiki-content td,
+.wiki-content th,
+.wiki-content ol,
+.wiki-content ul,
+.wiki-content li {
+    font-size: 10pt;
+    line-height: 13pt;
+}
+
+.wiki-content p {
+    margin: 10px 0;
+    padding: 0;
+}
+
+.wiki-content li,
+.wiki-content ul p,
+.wiki-content ol p {
+    margin: 0;
+    padding: 0;
+}
+
+.wiki-content ul {
+    list-style-type: disc;
+}
+
+.wiki-content ol,
+.wiki-content ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: decimal;
+}
+
+.wiki-content ol ol,
+.wiki-content ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: lower-alpha;
+}
+
+.wiki-content ol ol ol,
+.wiki-content ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol,
+.wiki-content ol ol ol ol ol ol ol ol ol ol ol ol {
+    list-style-type: lower-roman;
+}
+
+/*Needs the id selector because of the
+'#com-atlassian-confluence h1' entry in master.css*/
+#com-atlassian-confluence .wiki-content h1,
+.wiki-content h1,
+.wiki-content h2,
+.wiki-content h3,
+.wiki-content h4,
+.wiki-content h5,
+.wiki-content h6 {
+    font-weight: bold;
+    line-height: normal;
+    padding: 0;
+}
+
+
+#com-atlassian-confluence .wiki-content h1,
+.wiki-content h1
+{
+    font-size: 21pt;
+    margin-top: 38px;
+}
+
+.wiki-content h2 {
+    font-size: 18pt;
+    margin-top: 32px;
+}
+
+.wiki-content h3 {
+    font-size: 15pt;
+    margin-top: 28px;
+}
+
+.wiki-content h4 {
+    font-size: 13pt;
+    margin-top: 25px;
+}
+
+.wiki-content h5 {
+    font-size: 11pt;
+    margin-top: 22px;
+}
+
+.wiki-content h6 {
+    font-size: 10pt;
+    margin-top: 22px;
+}
+
+.wiki-content .confluenceTable, .grid {
+/*
+    margin-left: 0;
+    margin-right: 0;
+    margin-top: 10px;
+    margin-bottom: 10px;
+*/
+    padding: 0;
+    margin: 5px 0;
+}
+
+.wiki-content td.confluenceTd,
+.wiki-content th.confluenceTh {
+    padding: 5px 7px;
+}
+.wiki-content-preview {
+    padding: 5px;
+    border-left: 1px solid;
+    border-right: 1px solid;
+}
+
+.wiki-content .preformattedContent,
+.wiki-content .codeContent{
+    padding: 12px 10px;
+}
+
+.wiki-content .preformattedContent pre,
+.wiki-content .codeContent pre{
+    margin:0;
+    /** matches renderer-macros.css: .preformatted pre */
+    font-family:"Courier New",Courier,monospace;
+    line-height:1.3;
+}
+
+/* Styles for TinyMCE editor content */
+
+.mceContentBody {
+    border: none;
+    padding: 10px;
+    text-align: left;
+    background: #fff;
+}
+
+/* IE makes paragraphs in tables, so remove the default margin */
+.mceContentBody .confluenceTable p {
+    margin: 0;
+}
+
+/* Firefox puts resizing controls on tables. They don't line up with tables unless they have margin 1px.
+(0 breaks the border) */
+body.mceContentBody table.confluenceTable {
+    margin: 1px;
+}
+
+.mceContentBody .wysiwyg-macro-body-preformat {
+    border: #ccc solid 1px; /* stick to neutral colour, or move to colors-css.vm if required */
+    /* horizontal margin matches .panel */
+    margin: 5px 20px;
+}
+
+/* Styles for macros */
+.mceContentBody .wysiwyg-macro-inline {
+    display: inline;
+}
+.mceContentBody .user-new-line,
+.mceContentBody .wysiwyg-macro-body-newline {
+    display: none;
+    line-height: 0;
+}
+
+/* Styles for the RTE Autocomplete component */
+#autocomplete {
+    background-color: #eee;
+    border: solid 1px #ddd;
+}
+#autocomplete-trigger{
+    background-color: #ddd;
+    padding: 0 2px;
+}
+#autocomplete-search-text {
+    padding: 0 4px 0 2px;
+}
+#tab-navigation {
+    border-bottom: 1px solid;
+    margin: 0 -10px;
+    margin-bottom: 10px;
+    padding: 0 10px;
+}
+
+.tab-navigation {
+    list-style: none;
+    display: block;
+    margin: 0 0 -1px;
+    padding: 0;
+    overflow: hidden;
+}
+.tab-navigation .tab {
+    float: left;
+    display: inline;
+    font-weight: bold;
+    margin: 0 5px -1px 0;
+}
+.tab-navigation .tab a {
+    padding: .3em .4em;
+    text-decoration: none;
+    display: block;
+    -moz-border-radius-topleft: 3px;
+    -moz-border-radius-topright: 3px;
+    -webkit-border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+}
+.tab-navigation .notab {
+    margin: 1px 1px 0 1px;
+    padding: .3em;
+    float: left;
+}
+
+/* Make the following more specific, so they aren't overriden by themes. */
+ul.tab-navigation .current a {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff; /* IE */
+}
+ul.tab-navigation .current a:hover {
+    color: #000;
+    background-color: #fff;
+    border-bottom-color: #fff; /* IE */
+}
+
+/*
+ * Drop down menu stylesheet
+ */
+
+/* Menu bar layout */
+.ajs-menu-bar {
+    float: right;
+    line-height: 1.5;
+    position: relative;
+}
+.ajs-menu-bar,
+.ajs-menu-bar .ajs-button,
+.ajs-menu-bar .ajs-button a,
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title span,
+.ajs-menu-bar .ajs-menu-item .ajs-menu-title span span,
+.ajs-menu-bar .ajs-drop-down a,
+.ajs-menu-bar .ajs-drop-down a span,
+.ajs-menu-bar .ajs-drop-down a span span {
+     /* all containers are block-level with no margin or padding by default */
+    display: block;
+    margin: 0;
+    padding: 0;
+}
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    padding-right: 1em; /* gap after menu label, must be wider than indicator image */
+}
+.ajs-menu-bar .ajs-menu-item,
+.ajs-menu-bar .ajs-button {
+    float: left;
+    list-style: none;
+    position: relative;
+}
+.ajs-menu-bar .ajs-menu-item a,
+.ajs-menu-bar .ajs-button a {
+    line-height: 1.5;
+    text-decoration: none;
+    white-space: nowrap;
+}
+.ajs-menu-bar .ajs-button {
+    float: left;
+    line-height: 2;
+    list-style: none;
+    position: static;
+}
+
+/* Drop-down indicator icon and on-hover colour changing */
+.ajs-menu-bar .ajs-menu-item .trigger span {
+    background-image: url(../../../images/decoration/menu_indicator.gif);
+    position: relative;
+}
+.ajs-menu-bar .ajs-menu-item.opened .trigger span {
+    background-image: url(../../../images/decoration/white_menu_indicator.gif);
+}
+
+.ajs-menu-bar .ajs-menu-item.opened .trigger span span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    background-image: none;
+}
+.ajs-menu-bar .ajs-button a:hover,
+.ajs-menu-bar .ajs-menu-item.opened .trigger span {
+    color: #fff; /* system colour - not derived from colour scheme */
+}
+
+/* Menu bar icons */
+.ajs-menu-bar .ajs-menu-item .trigger span {
+    background-position: 100% 50%;
+    background-repeat: no-repeat;
+}
+.ajs-menu-bar .ajs-button span,
+.ajs-menu-bar .ajs-menu-item .trigger span span {
+    background-position: 0 50%;
+    background-repeat: no-repeat;
+}
+
+/* Drop-down menu layout */
+.ajs-menu-bar .ajs-menu-item .ajs-drop-down a {
+    background: #fff no-repeat 4px 50%;
+    border: none;
+    display: block;
+    line-height: 1.6;
+    margin: 0;
+    padding: 0 0.5em 0 24px;
+    text-decoration: none;
+}
+.ajs-menu-bar .ajs-drop-down {
+    -moz-border-radius-bottomleft: 3px;
+    -moz-border-radius-bottomright: 3px;
+    -webkit-border-bottom-left-radius: 3px;
+    -webkit-border-bottom-right-radius: 3px;
+    background: #fff; /* system colour - not derived from colour scheme */
+    border: solid 1px #c1c1c1;
+    font-weight: normal;
+    min-width: 12em;
+    padding: 0;
+    position: absolute;
+    left: 0;
+    white-space: nowrap;
+    z-index: 1000;
+}
+
+/* CONFDEV-820 - Temporary fix */
+#header-menu-bar .ajs-drop-down {
+    min-width: 15em;
+}
+
+.ajs-menu-bar .ajs-drop-down.above {
+    -moz-border-radius: 0;
+    -moz-border-radius-topleft: 3px;
+    -moz-border-radius-topright: 3px;
+    -webkit-border-radius: 0;
+    -webkit-border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+    bottom: 2em;
+    margin-top: -2px;
+}
+.ajs-menu-bar .ajs-drop-down ul,
+.ajs-menu-bar ul.ajs-drop-down {
+    border-top: solid 1px #e1e1e1;
+    margin: 0;
+    padding: 5px 0;
+    position: relative;
+    list-style: none;
+}
+.ajs-menu-bar .ajs-drop-down ul.first,
+.ajs-menu-bar ul.ajs-drop-down.first {
+    border-top: none;
+}
+.ajs-menu-bar .ajs-drop-down li {
+    margin: 0;
+    padding: 0;
+}
+.ajs-menu-bar .ajs-menu-item div.ajs-drop-down a {
+    background-position: .5em 50%;
+    background-repeat: no-repeat;
+    border: none;
+    display: block;
+    line-height: 2;
+    margin: 0;
+    padding: 0 1em 0 28px;
+    position: relative;
+    text-decoration: none;
+    white-space: nowrap;
+}
+.ajs-menu-bar .ajs-drop-down a img {
+    float: left;
+    height: 16px;
+    margin: .3em 0 0 -20px;
+    width: 16px;
+}
+
+/* Drop-down menu icons */
+.ajs-menu-bar .ajs-drop-down a.add-comment {
+    background-image: url(../../../images/icons/comment_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.add-attachment {
+    background-image: url(../../../images/icons/attach_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.add-page {
+    background-image: url(../../../images/icons/docs_16.gif);
+}
+.ajs-menu-bar .ajs-drop-down a.add-news {
+    background-image: url(../../../images/icons/blogentry_16.gif);
+}
+.ajs-menu-bar .ajs-drop-down a.action-view-history {
+    background-image: url(../../../images/icons/clock_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-permissions {
+    background-image: url(../../../images/icons/lock_16_grey.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-view-attachments {
+    background-image: url(../../../images/icons/attach_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-favourite {
+    background-image: url(../../../images/icons/fav_off_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected { /* using IE style here to make IE7 not duplicate bg */
+    background-image: url(../../../images/icons/fav_on_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-watching-space {
+    background-image: url(../../../images/icons/watching_space_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-manage-watchers {
+    background-image: url(../../../images/icons/watch_manage_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.action-page-watching {
+    background-image: url(../../../images/icons/watch_off_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected { /* using IE style here to make IE7 not duplicate bg */
+    background-image: url(../../../images/icons/watch_on_16.png);
+}
+.ajs-menu-bar .ajs-drop-down a.waiting {
+    background-image: url(../../../images/icons/wait.gif);
+}
+
+.ajs-menu-bar .ajs-menu-item .section-secondary li a,
+.ajs-menu-bar .ajs-menu-item .section-modify li a {
+    padding-left: 8px;
+    font-size: .9em;
+}
+
+.ajs-menu-bar .ajs-menu-item .ajs-drop-down li.hidden {
+    display: none;
+}
+
+/* Customisations for header menu bar */
+#header-menu-bar {
+    margin-top: 0;
+    margin-right: 5px;
+}
+#header .ajs-menu-item a {
+    float: left;
+    line-height: 1.5;
+    margin: 0;
+    text-decoration: underline;
+}
+#header-menu-bar li.ajs-menu-item a {
+    line-height: 2;
+}
+#header-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    line-height: 1.5;
+}
+#header .ajs-menu-bar li.ajs-menu-item,
+#header .ajs-menu-bar li.ajs-button {
+    margin: 0;
+    padding: 0;
+}
+#header .ajs-menu-bar li.ajs-menu-item a {
+    padding-left: 0.5em;
+}
+#header .ajs-menu-item .trigger span {
+    background-image: url(../../../images/decoration/white_menu_indicator.gif); /* header menus always use a white indicator */
+}
+#header .ajs-menu-item .trigger span span {
+    background: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item a.trigger:focus {
+    outline: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item a.trigger {
+    float: left;
+    padding: 0 0.5em;
+    text-decoration: none;
+}
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down li,
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down a {
+    background-color: #fff; /* system colour - not derived from colour scheme */
+    background-image: none;
+}
+.ajs-menu-bar .ajs-menu-item.opened,
+.ajs-menu-bar .ajs-button a {
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+.ajs-menu-bar .ajs-menu-item.opened {
+    -moz-border-radius-bottomleft: 0;
+    -moz-border-radius-bottomright: 0;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+}
+
+/* Customisations for header menus */
+#header .ajs-menu-bar .ajs-drop-down {
+    -moz-border-radius-bottomleft: 3px;
+    -moz-border-radius-bottomright: 3px;
+    -webkit-border-bottom-left-radius: 3px;
+    -webkit-border-bottom-right-radius: 3px;
+    border-top: none;
+    margin-top: 0;
+    margin-left: -1px;
+    top: 2em;
+    z-index: 9;
+}
+#header .ajs-menu-bar .ajs-drop-down a {
+    float: none;
+    padding: 2px 2em;
+    text-decoration: none;
+}
+#header .ajs-menu-bar .ajs-menu-item .ajs-drop-down ul,
+#header .ajs-menu-bar .ajs-menu-item ul.ajs-drop-down {
+    border-top: 1px solid #cce;
+}
+#header .ajs-menu-bar .ajs-drop-down ul.first,
+#header .ajs-menu-bar ul.ajs-drop-down.first {
+    border: none;
+}
+
+/* Customisations for navigation menu bar */
+#navigation .ajs-menu-bar {
+    margin: 10px 0 0 1em;
+}
+#navigation .ajs-menu-bar .ajs-button span,
+#navigation .ajs-menu-bar .ajs-menu-item .ajs-menu-title span span {
+    padding-left: 25px; /* width of icon + gap before menu label */
+}
+/*#navigation .ajs-menu-bar li.ajs-menu-item,
+#navigation .ajs-menu-bar li.ajs-button {
+    margin-top: -10px;
+}
+*/
+#navigation .ajs-menu-bar li.ajs-menu-item .ajs-menu-title,
+#navigation .ajs-menu-bar li.ajs-button a {
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    color: #535353; /* system colour - not derived from colour scheme */
+    font-size: 1.1em;
+    line-height: 20px;
+    padding: .35em .5em;
+}
+#navigation .ajs-menu-bar li.ajs-menu-item .ajs-menu-title {
+    -moz-border-radius-bottomleft: 0;
+    -moz-border-radius-bottomright: 0;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+}
+#navigation .ajs-menu-bar .ajs-button a.edit span {
+    background-image: url(../../../images/icons/edit_20.png);
+}
+#navigation .ajs-menu-bar .ajs-button a.view span {
+    background-image: url(../../../images/icons/view_20.png);
+}
+#navigation .ajs-menu-bar li.ajs-menu-item a.add span span {
+    background-image: url(../../../images/icons/add_20.png);
+}
+#navigation .ajs-menu-bar li.ajs-menu-item a.action span span {
+    background-image: url(../../../images/icons/tools_20.png);
+}
+.ajs-menu-bar .ajs-menu-item .most-right-menu-item {
+    left: auto;
+    margin: 0;
+    right: 0;
+}
+#header .ajs-menu-item a.ajs-menu-title span { /* Not sure why these styles need to be duplicated for IE, but it works. */
+    background-image: url(../../../images/decoration/white_menu_indicator.gif); /* header menus always use a white indicator */
+    background-repeat: no-repeat;
+    background-position: 100% 60%; /* 60% lines up with middle of lowercase letters in IE */
+}
+.ajs-drop-down {
+    clear: both;
+    z-index: 500;
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down li {
+    border-bottom: solid 1px #fff;
+}
+.ajs-menu-bar .ajs-drop-down li {
+    display: block;
+    margin: 0;
+    padding: 0;
+    position: relative;
+}
+
+#navigation .ajs-menu-bar .ajs-drop-down a {
+    display: block;
+    padding: 0.33em 0.67em;
+    cursor: pointer;
+}
+#navigation .ajs-menu-bar div.ajs-drop-down a span {
+    padding: 0 0 0 21px;
+    height: 16px;
+    line-height: 16px;
+}
+.ajs-menu-bar div.ajs-drop-down a span {
+    cursor: pointer;
+    height: 16px;
+    line-height: 16px;
+    zoom: 1;
+}
+#navigation .ajs-menu-bar .section-secondary li a,
+#navigation .ajs-menu-bar .section-modify li a {
+    line-height: 2;
+    padding-left: 0;
+}
+#navigation .ajs-menu-bar .section-secondary li a span,
+#navigation .ajs-menu-bar .section-modify li a span {
+    padding-left: 8px;
+}
+.ajs-menu-bar .ajs-drop-down a img {
+    clear: left;
+    float: none;
+    margin: .3em 0 .3em -20px;
+    vertical-align: middle;
+}
+
+#navigation .ajs-menu-bar .ajs-button a,
+#navigation .ajs-menu-bar .ajs-button a span {
+    display: inline-block; /* makes the edit button have layout, but doesn't give it enormous width*/
+}
+
+.ajs-menu-bar .ajs-drop-down a.add-page,
+.ajs-menu-bar .ajs-drop-down a.add-news {
+    background: none;
+}
+.ajs-menu-bar .ajs-drop-down a.add-page span {
+    background: url(../../../images/icons/docs_16.gif) no-repeat 0 50%;
+}
+.ajs-menu-bar .ajs-drop-down a.add-news span {
+    background: url(../../../images/icons/blogentry_16.gif) no-repeat 0 50%;
+}
+
+* html .ajs-menu-bar .ajs-drop-down a.add-comment {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-comment span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/comment_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-attachment,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-attachments,
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.add-attachment span,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-attachments span,
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-text {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/attach_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .page-metadata ul a.action-view-attachments span.page-metadata-attachments-count {
+    display: inline-block;  /* IE6 */
+    text-indent: 9999em;
+}
+* html .page-metadata ul a.page-restrictions span,
+* html .ajs-menu-bar .ajs-drop-down a.action-view-history,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-permissions,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-favourite,
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected,
+* html .ajs-menu-bar .ajs-drop-down a.action-manage-watchers,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching-space,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching,
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-view-history span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/clock_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .page-metadata ul a.page-restrictions span,
+* html .ajs-menu-bar .ajs-drop-down a.action-page-permissions span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/lock_16_grey.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-favourite span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/fav_off_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-favourite-selected span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/fav_on_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching-space span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watching_space_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-manage-watchers span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_manage_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.action-page-watching span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_off_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.ie-page-watching-selected span {
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/watch_on_16.png', sizingMethod='crop')");
+    zoom: 1;
+}
+* html .ajs-menu-bar .ajs-drop-down a.waiting {
+    background-image: none;
+}
+* html .ajs-menu-bar .ajs-drop-down a.waiting span {
+    background-image: url(../../../images/icons/wait.gif);
+    background-repeat: no-repeat;
+    filter: inherit;
+}
+* html #navigation .ajs-menu-bar .ajs-button a.edit span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/edit_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar li.ajs-menu-item a.add span span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/add_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar li.ajs-menu-item a.action span span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/tools_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+* html #navigation .ajs-menu-bar .ajs-button a.view span {
+    background-image: none;
+    filter: expression(runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+        document.getElementById('confluence-context-path').content +
+        "/images/icons/view_20.png', sizingMethod='crop')");
+    width: 1%;
+}
+
+table.confluenceTable {
+    margin: 5px;
+    border-collapse: collapse;
+}
+
+td.confluenceTd, table.confluenceTable td.confluenceTd {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    padding: 5px;
+    vertical-align: top;
+    min-width: 0.6em;
+}
+
+th.confluenceTh, table.confluenceTable th.confluenceTh {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    padding: 5px;
+    background-color: #f0f0f0;
+    text-align: left;
+    vertical-align: top;
+    min-width: 0.6em;
+}
+.panel {
+    color: black;
+    padding: 0;
+    margin: 10px 20px;
+    background: #f0f0f0;
+    border-width: 1px;
+    border-style: solid;
+    overflow: hidden;
+}
+
+.alertPanel {
+    border-color: #c00;
+}
+
+.infoPanel {
+    border-color: #69c;
+}
+
+.alertPanel, .infoPanel {
+    border-style: solid;
+    border-width: 1px;
+    padding: 8px;
+    margin: 10px;
+}
+
+.infopanel-heading {
+    font-weight: bold;
+	padding: 4px 0 2px 0;
+}
+
+/* basic panel (basicpanel.vmd) style */
+.basicPanelContainer {
+    border-width: 1px;
+    border-style: solid;
+    margin-top: 2px;
+    margin-bottom: 8px;
+    width: 100%;
+}
+
+.basicPanelTitle {
+    padding: 5px;
+    margin: 0;
+    background-color: #f0f0f0;
+    color: black;
+    font-weight: bold;
+}
+
+.basicPanelBody {
+    padding: 5px;
+    margin: 0;
+}
+
+.panelHeader {
+    padding: 0 12px;
+    line-height: 2; /* vertical alignment for title */
+    text-align: center;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+.codeHeader, .panelHeader, .panelContent {
+    background: #f0f0f0;
+}
+
+.preformattedHeader, .codeContent, .preformattedContent {
+    background: #fff;
+}
+
+.panelContent {
+    color: #000;
+    margin: 0;
+    padding: 0 12px;
+    text-align: left;
+    font-size: .95em;
+}
+
+.panelContent,
+.panelContent p, .panelContent th,
+.panelContent td, .panelContent li {
+    text-align: left;
+}
+
+
+html body { /* HACK: Temporary fix for CONF-15412 */
+    overflow: visible;
+}
+
+/* IE7 fix for CONFDEV-1056 */
+body.dashboard {
+    *min-width: 1000px;
+}
+img {
+    -ms-interpolation-mode: bicubic;
+}
+#header {
+    height: 1%;
+}
+#breadcrumbs {
+    height: 1%; /* IE6 wrapping */
+    overflow: auto;
+    *overflow: visible; /* IE7 and below */
+}
+#breadcrumbs li {
+    white-space: nowrap;
+}
+* html #breadcrumbs li {
+    background-image: url(../../../images/decoration/white_breadcrumbs_indicator.gif); /* IE6 */
+}
+* html .page-metadata {
+    height: 1.2em; /* IE6 */
+}
+#breadcrumbs li {
+    background-position: 3px 10px;
+}
+form {
+    margin: 0;
+    padding: 0;
+}
+.tab-navigation .tab {
+    float: left;
+    display: inline;
+    font-weight: bold;
+    margin: 0 5px 0 0;
+    position: relative;
+}
+.tab-navigation .tab a {
+    display: inline-block; /* anchors were making tabs very wide in Clickr theme in IE */
+}
+a.icon {
+    height: 16px;
+}
+#tree-div {
+    min-height: 300px;
+    height: auto !important;
+    height: 300px;
+}
+h1 #content-title {
+    margin: 0;
+    display: block;
+    width: 90%; /* 93% and upwards breaks at least one of the IEs */
+}
+
+h1 span.title-text {
+    height: 1%;
+}
+#com-atlassian-confluence h1 {
+    width: auto;
+}
+
+#com-atlassian-confluence h1 img.logo {
+    *margin-bottom: 0;
+}
+
+* html #com-atlassian-confluence h1 img.custom {
+   /* sets max-height for IE - roughly equivalent to what real browsers do with 2.5em max-height */
+   height: expression( this.scrollHeight > 59 ? "60px" : "auto" );
+}
+
+#tab-navigation,
+.tab-navigation {
+    zoom: 1;
+}
+.has-sidebar #content .code {
+    _clear: both; 
+    _overflow: auto; 
+}
+.menu-section-list li a:visited,
+.menu-section-list li a:hover {
+    color: #666;
+}
+.menu-section-list li.active a:visited {
+    color: #fff;
+}
+
+/* Don't remove or dropdowns may break in IE6. CONF-17932 */
+* html #header-menu-bar .hidden {
+    width: 12em;
+}
+
+* .bloglistitems{
+    list-style-type: none;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    margin-left: 0;
+}
+
+* .blogmonthnavigation{
+    border:1px solid #CCCCCC;
+    position:relative;
+    text-decoration:none;
+    display: inline-block;
+    width: 10em;
+    font-size: 0.85em;
+    text-align:center;
+    margin: 0 -0.5em 1em 1em;
+    padding: 0.2em 0.4em;
+}
+
+#conflict-diffs, #page-diffs{
+    min-height: 55px;
+}
+
+#page-diffs .diff {
+    *margin-right: 1em;
+}
+
+/* TODO: remove temp fix after AUI upgrade
+   CONFDEV-918 temp fix, prevents IE7 crash. Don't remove until https://studio.atlassian.com/browse/AJS-509
+   is resolved and the fix version is implemented in Confluence. */
+#com-atlassian-confluence form.dashboard-actions {
+    *min-height: 0;
+}
+/* end CONFDEV-918 temp fix */
+
+/*
+    Styles for macros bundled in Renderer.
+*/
+
+.panelMacro {
+    margin: 10px 20px;
+    overflow: hidden; /* fix width next to floated content */
+}
+
+.panelMacro table {
+    text-align: left;
+    padding: 0 20px;
+    width: 100%;
+}
+
+.panelMacro td, .panelMacro p {
+    font-size: 1em;
+    padding: 14px 0;
+}
+
+.searchMacro {
+    font-size: 10pt;
+    margin: 10px 0;
+}
+
+.searchMacro .result {
+    margin-top: 3px;
+    padding: 0 5px 5px 5px;
+    border-bottom: 1px solid #ddd;
+}
+
+.searchMacro .resultSummary {
+    margin-bottom: 7px;
+}
+
+.rssMacro {
+    font-size: 10pt;
+}
+
+.rssMacro table {
+    margin: 10px 0;
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.rssMacro table th,
+.rssMacro table td {
+    border: 1px solid #ccc;
+    padding: 4px;
+}
+
+.rssMacro table th {
+    background: #f0f0f0;
+}
+
+/* Code styles */
+.code {
+    border-width: 1px;
+    border-style: dashed;
+    overflow: auto;
+}
+
+.code, .preformatted {
+    background-color: #fff;
+}
+
+.code pre, .preformatted pre { /* needs 'pre' to override TinyMCE style */
+    font-family:"Courier New", Courier, monospace;
+    line-height: 1.3;
+}
+
+.code-keyword {
+  color: #000091;
+  background-color: inherit;
+}
+
+.code-object {
+  color: #910091;
+  background-color: inherit;
+}
+
+.code-quote {
+  color: #009100;
+  background-color: inherit;
+}
+
+.code-comment {
+  color: #808080;
+  background-color: inherit;
+}
+
+.code-xml .code-keyword {
+  color: inherit;
+  font-weight: bold;
+}
+
+.code-tag {
+  color: #000091;
+  background-color: inherit;
+}
+
+/* Recently Updated Styles */
+.recentlyUpdatedItem {
+	border-bottom: #f0f0f0 1px solid;
+	border-top: #f0f0f0 1px solid;
+	margin: 10px 0 0 0;
+	padding: 0;
+	border-spacing: 0;
+	width: 100%;
+    text-decoration: none;
+    border-collapse: collapse;
+}
+
+.recentlyUpdatedItem td {
+    padding: 10px;
+    border-bottom: #f0f0f0 1px solid;
+    vertical-align: top;
+}
+
+.recentlyUpdatedItem .authorAndDate {
+	background-color: #f0f0f0;
+	width: 25%;
+}
+
+.recentlyUpdatedItem .date {
+    margin-top: 4px;
+    font-size: 90%;
+    color: #666;
+}
+
+.recentlyUpdatedItem .profilePic {
+    float: right;
+    background-color: #f0f0f0;
+    margin: 0 2px;
+}
+
+.recentlyUpdatedItem .twixie {
+    padding: 10px 0 0 4px;
+}
+
+.recentlyUpdatedItem td.icon {
+    padding: 8px 0 0 1px;
+}
+
+.recentlyUpdatedItem .details {
+    padding-left: 7px;
+}
+
+.recentlyUpdatedItem .summary, .recentlyUpdatedItem .thumbnail {
+    margin-top: 3px;
+    color: #666;
+}
+
+.moreRecentlyUpdatedItems {
+    text-align: right;
+    margin-top: 10px;
+    font-size: 10pt;
+}
+
+a.content-type-page span, div.content-type-page, span.content-type-page {
+    background-image: url(../../../images/icons/docs_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-blogpost span, div.content-type-blogpost, span.content-type-blogpost {
+    background-image: url(../../../images/icons/blogentry_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-comment span, div.content-type-comment, span.content-type-comment {
+    background-image: url(../../../images/icons/comment_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-space span, div.content-type-space, span.content-type-space,
+a.content-type-spacedesc span, div.content-type-spacedesc, span.content-type-spacedesc {
+    background-image: url(../../../images/icons/web_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-personalspacedesc span, div.content-type-personalspacedesc, span.content-type-personalspacedesc {
+    background-image: url(../../../images/icons/personal_space_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-mail span, div.content-type-mail, span.content-type-mail {
+    background-image: url(../../../images/icons/mail_content_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment span, div.content-type-attachment, span.content-type-attachment {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-file span, div.content-type-file, span.content-type-file {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-pdf span, div.content-type-attachment-application-pdf, span.content-type-attachment-application-pdf {
+    background-image: url(../../../images/icons/attachments/pdf.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-image span, div.content-type-attachment-image, span.content-type-attachment-image {
+    background-image: url(../../../images/icons/attachments/image.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-xml span, div.content-type-attachment-text-xml, span.content-type-attachment-text-xml {
+    background-image: url(../../../images/icons/attachments/xml.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-html span, div.content-type-attachment-text-html, span.content-type-attachment-text-html {
+    background-image: url(../../../images/icons/attachments/html.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text span, div.content-type-attachment-text, span.content-type-attachment-text {
+    background-image: url(../../../images/icons/attachments/text.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-zip span, div.content-type-attachment-application-zip, span.content-type-attachment-application-zip {
+    background-image: url(../../../images/icons/attachments/zip.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-excel span, div.content-type-attachment-application-excel, span.content-type-attachment-application-excel {
+    background-image: url(../../../images/icons/attachments/excel.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-powerpoint span, div.content-type-attachment-application-powerpoint, span.content-type-attachment-application-powerpoint {
+    background-image: url(../../../images/icons/attachments/powerpoint.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-word span, div.content-type-attachment-application-word, span.content-type-attachment-application-word {
+    background-image: url(../../../images/icons/attachments/word.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-java span, div.content-type-attachment-java, span.content-type-attachment-java {
+    background-image: url(../../../images/icons/attachments/java.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-attachment-file span, div.content-type-attachment-file, span.content-type-attachment-file {
+    background-image: url(../../../images/icons/attachments/file.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-status span, div.content-type-status, span.content-type-status {
+    background-image: url(../../../images/icons/quotes.png);
+    background-repeat: no-repeat;
+}
+
+div.content-type-userinfo, span.content-type-userinfo {
+    background-image: url(../../../images/icons/user_16.gif);
+    background-repeat: no-repeat;
+}
+
+a.content-type-follow span, div.content-type-follow, span.content-type-follow {
+    background-image: url(../../../images/icons/fav_on_16.png);
+    background-repeat: no-repeat;
+}
+
+a.content-type-favourite span, div.content-type-favourite, span.content-type-favourite {
+    background-image: url(../../../images/icons/fav_on_16.png);
+    background-repeat: no-repeat;
+}
+
+body.login,
+body.login #main,
+body.login #full-height-container {
+    background: #fafafa;
+}
+
+* html body.login,
+* html body.login #full-height-container {
+    background: #f0f0f0;
+}
+
+#com-atlassian-confluence.login h1 {
+    width: 560px;
+    margin: 0 auto;
+}
+
+#login-container {
+    margin: 0 auto;
+    width: 500px;
+    padding: 20px 30px;
+    background: #fff;
+}
+
+body.login #header, body.login #websudo {
+    display: none;
+}
+
+/* Gets rid of the break above the footer */
+body.login .clear {
+    display: none;
+}
+
+body.login #main {
+    overflow: hidden;
+    padding: 10% 0 12%;
+}
+
+#login-container .form-error-block{
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+
+#login-container,
+#login-container form.aui {
+    color: #333;
+}
+
+#login-container,
+#login-container .captcha-image {
+    border: 1px solid #eee;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+}
+
+#login-container div.login-form-container {
+    margin-bottom: 10px;
+    padding: 0 0 5px 20px;
+}
+
+#login-container .login-form-container fieldset {
+    padding-top: 15px;
+}
+
+#login-container .checkbox label {
+    left: 0;
+    margin-right: 0;
+    float: none;
+    display: inline;
+}
+
+/* Overide default label styling */
+#com-atlassian-confluence.login #login-container label {
+    color: #333;
+}
+
+#com-atlassian-confluence.login #login-container .error p {
+    background: #fff;
+    color: #c00;
+}
+
+#login-container .login-form-container .text,
+#login-container .login-form-container .password {
+    width: 95%;
+}
+
+#login-container .message {
+    padding: 0;
+    width: auto;
+}
+
+#login-container p {
+    margin: 0 0 1em;
+    color: #333;
+}
+
+#login-container p.last {
+    margin: 0;
+}
+
+#login-container p.success-message {
+    color: green;
+}
+
+body.signup #main{
+    padding: 5% 0 7%;
+}
+
+#login-container .captcha-image {
+    margin: 10px 0;
+    width: 200px;
+    height: 100px;
+    float: left;
+}
+
+#captcha-error span.errorMessage {
+    font-weight: normal;
+}
+
+#captcha-container .reload {
+    width: 16px;
+    height: 16px;
+    float: left;
+    position: relative;
+    top: 16px;
+    left: 10px;
+}
+
+#captcha-container label#captcha-reponse-label {
+    float: none;
+    left: 0;
+    margin: 0;
+    width: auto;
+}
+
+#captcha-container input {
+    width: 192px;
+}
+
+#coherence-copyright {
+    margin: 0;
+    text-align: center;
+    font-size: 0.8em;
+    padding-bottom: 3px;
+}
+
+#coherence-copyright a {
+    color: #666;
+}
+
+#login-container .userLogoLink {
+    float: left;
+    padding-right: 5px;
+}
+
+#login-container a#login-notyou {
+    padding-left: 5px;
+}
+
+#login-container div.warningPanel {
+    margin: 0 0 10px 0;
+}
+span.icon, a.icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    text-align: left;
+    text-indent: -9999em;
+}
+
+/* used in pagelist.vm */
+.tabletitleops .icon {
+    width: 12px;
+    height: 12px;
+}
+
+.icon-wait {
+    background: transparent url(../../images/icons/wait.gif) no-repeat scroll 0 0;
+}
+.icon-space {
+    background: transparent url(../../images/icons/web_16.gif) no-repeat scroll 0 0;
+}
+.icon-browse-space {
+    background: transparent url(../../images/icons/browse_space.gif) no-repeat scroll 0 0;
+}
+.icon-add-page {
+    background: transparent url(../../images/icons/add_page_16.gif) no-repeat scroll 0 0;
+}
+.icon-add-page-disabled {
+    background: transparent url(../../images/icons/add_page_faded_16.gif) no-repeat scroll 0 0;
+}
+.icon-add-fav {
+    background: transparent url(../../images/icons/star_grey.gif) no-repeat scroll 0 0;
+}
+.icon-remove-fav {
+    background: transparent url(../../images/icons/star_yellow.gif) no-repeat scroll 0 0;
+}
+.icon-home-page {
+    background: transparent url(../../images/icons/home_16.gif) no-repeat scroll 0 0;
+}
+.icon-recently-updated-page {
+    background: transparent url(../../images/icons/new_16.gif) no-repeat scroll 0 0;
+}
+.icon-page {
+    background: transparent url(../../images/icons/docs_16.gif) no-repeat scroll 0 0;
+}
+.icon-comment {
+    background: transparent url(../../images/icons/comment_16.gif) no-repeat scroll 0 0;
+}
+.icon-space {
+    background: transparent url(../../images/icons/web_16.gif) no-repeat scroll 0 0;
+}
+.icon-personal-space {
+    background: transparent url(../../images/icons/personal_space_16.gif) no-repeat scroll 0 0;
+}
+.icon-user {
+    background: transparent url(../../images/icons/user_16.gif) no-repeat scroll 0 0;
+}
+.icon-blog {
+    background: transparent url(../../images/icons/blogentry_16.gif) no-repeat scroll 0 0;
+}
+.icon-trackback {
+    background: transparent url(../../images/icons/document_exchange.gif) no-repeat scroll 0 0;
+}
+.icon-mail {
+    background: transparent url(../../images/icons/mail_content_16.gif) no-repeat scroll 0 0;
+}
+.icon-status {
+    background: transparent url(../../images/icons/quotes.png) no-repeat scroll 0 0;
+}
+.icon-show-more {
+    background: transparent url(../../images/icons/add_12.gif) no-repeat scroll 0 0;
+}
+.icon-show-less {
+    background: transparent url(../../images/icons/subtract_12.gif) no-repeat scroll 0 0;
+}
+.icon-file-pdf {
+    background: transparent url(../../images/icons/attachments/pdf.gif) no-repeat scroll 0 0;
+}
+.icon-file-image {
+    background: transparent url(../../images/icons/attachments/image.gif) no-repeat scroll 0 0;
+}
+.icon-file-xml {
+    background: transparent url(../../images/icons/attachments/xml.gif) no-repeat scroll 0 0;
+}
+.icon-file-html {
+    background: transparent url(../../images/icons/attachments/html.gif) no-repeat scroll 0 0;
+}
+.icon-file-java {
+    background: transparent url(../../images/icons/attachments/java.gif) no-repeat scroll 0 0;
+}
+.icon-file-text {
+    background: transparent url(../../images/icons/attachments/text.gif) no-repeat scroll 0 0;
+}
+.icon-file-zip {
+    background: transparent url(../../images/icons/attachments/zip.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel97-template {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint97-template {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word97-template {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel97 {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint97 {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word97 {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel-macro {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-excel-template {
+    background: transparent url(../../images/icons/attachments/excel.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-macro {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-slideshow {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-powerpoint-template {
+    background: transparent url(../../images/icons/attachments/powerpoint.gif) no-repeat scroll 0 0;
+}
+.icon-file-word {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-word-template {
+    background: transparent url(../../images/icons/attachments/word.gif) no-repeat scroll 0 0;
+}
+.icon-file-unknown {
+    background: transparent url(../../images/icons/attachments/file.gif) no-repeat scroll 0 0;
+}
+
+/*
+ * TODO: BN added in 3.3
+ * https://studio.atlassian.com/browse/PLUG-580: Until this issue is
+ * resolved we can't follow the sprite guideline.
+ */
+.icon-people-directory span.icon {
+    background: transparent url(../../images/icons/people_directory_16.png) no-repeat scroll 0 0;
+}
+
+.icon-rss-feed-small span.icon {
+    background: transparent url(../../images/icons/feed-icon-16x16-small.png) no-repeat scroll 0 0;
+}
+
+.icon-create-space span.icon {
+    background: transparent url(../../images/icons/add_space_16.gif) no-repeat scroll 0 0;
+}
+/* Information plugin styles */
+
+.noteMessage, .warningMessage, .infoMessage, .tipMessage {
+    border-style: solid;
+    border-width: 1px;
+    text-align: center;
+    padding: 5px;
+    overflow: hidden; /* fix width next to floated content */
+}
+
+.noteMessage {
+    border-color: #f0c000;
+    background: #ffffce;
+}
+
+.warningMessage {
+    border-color: #c00;
+    background: #fcc;
+}
+
+.infoMessage {
+    border-color: #69c;
+    background: #d8e4f1;
+}
+
+.tipMessage {
+    border-color: #090;
+    background-color: #dfd;
+}
+
+table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td {
+    border: none;
+}
+
+.informationMacroPadding {
+    padding: 5px 0 0 5px;
+}
+
+.noteMacro, .warningPanel {
+    background-color: #ffffce;
+}
+#addition .noteMacro {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0c000;
+    background-color: #ffffce;
+    text-align:left;
+    padding: 10px;
+    width: 100%;
+    margin: 5px 20px;
+}
+
+#addition .noteMacro td {
+    font-size: 10pt;
+    padding: 2px;
+    padding-right: 15px;
+}
+
+#addition .noteMacro p {
+    font-size: 10pt;
+}
+
+#addition .noteMacro b {
+    font-size: 10pt;
+}
+
+#addition table.noteMacro td {
+    border: none;
+}
+
+#replying .noteMacro {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0c000;
+    background-color: #ffffce;
+    text-align:left;
+    padding: 10px;
+    width: 100%;
+    margin: 5px 20px;
+}
+
+#replying .noteMacro td {
+    font-size: 10pt;
+    padding: 2px;
+    padding-right: 15px;
+}
+
+#replying .noteMacro p {
+    font-size: 10pt;
+}
+
+#replying .noteMacro b {
+    font-size: 10pt;
+}
+
+#replying table.noteMacro td {
+    border: none;
+}
+
+.tipMacro {
+    background-color: #dfd;
+}
+
+.warningMacro {
+    background-color: #fcc;
+}
+
+.infoMacro {
+    background-color: #d8e4f1;
+}
+
+.warningPanel {
+    border-style: solid;
+    border-width: 1px;
+    padding: 8px;
+    margin: 10px;
+}
+
+.warningPanel {
+    border-color: #f0c000;
+}
+
+
+
+
+/* Layout plugin styles */
+
+.sectionMacro,
+.sectionMacro p,
+.sectionMacro ul,
+.sectionMacro ol {
+    font-size: 10pt;
+}
+
+table.sectionMacro td {
+    border: none;
+}
+
+table.sectionMacroWithBorder td.columnMacro {
+    border-style: dashed;
+    border-width: 1px;
+    border-color: #ccc;
+}
+
+
+/*
+    Colors for Confluence (included for all themes by default).
+*/
+h1, h2, h3, h4, h5, h6,
+.wiki-content h1,
+.wiki-content h2,
+.wiki-content h3,
+.wiki-content h4,
+.wiki-content h5,
+.wiki-content h6,
+.pagetitle,
+.steptitle,
+.substeptitle,
+.formtitle,
+a.blogHeading,
+.more-comments a,
+th.confluenceTh,
+table.confluenceTable th.confluenceTh,
+table.admin th,
+.form-element-large,
+.form-element-small,
+#com-atlassian-confluence .mce_h1 span.mceText,
+#com-atlassian-confluence .mce_h2 span.mceText,
+#com-atlassian-confluence .mce_h3 span.mceText,
+#com-atlassian-confluence .mce_h4 span.mceText,
+#com-atlassian-confluence .mce_h5 span.mceText,
+#com-atlassian-confluence .mce_h6 span.mceText {
+    color: #003366;
+}
+
+.wiki-content h1,
+.wiki-content h2 {
+ 	border-bottom-color: #6699cc;
+}
+
+.wiki-content-preview {
+    border-left-color: #6699cc;
+    border-right-color: #6699cc;
+}
+
+.pageSectionHeader {
+    border-bottom-color: #6699cc;
+}
+
+.panel {
+    border-color: #6699cc;
+}
+
+.panelHeader,
+.menuheading,
+.pageheader,
+.sectionbottom {
+    border-bottom-color: #6699cc;
+}
+
+.topRow {
+    border-top-color: #6699cc;
+}
+
+.tabletitle, .pageSectionHeader, .section-header h2 {
+    color: #003366;
+}
+.tabletitle, .pageSectionHeader {
+	border-bottom-color: #6699cc;
+}
+
+a:link,
+a:visited,
+a:active,
+a:hover,
+#default-labels-header a.add {
+	color: #003366;
+}
+
+h1 a:hover {
+    border-bottom-color: #003366;
+}
+
+.spacenametitle-printable,
+.spacenametitle-printable a,
+.spacenametitle-printable a:visited {
+    color: #999999;
+}
+
+.navItemOver,
+.navItemOver a,
+.navItemOver a:visited,
+.navItemOver a:hover {
+    color: #ffffff;
+    background-color: #003366;
+}
+
+.navItem {
+    background-color: #6699cc;
+}
+
+.navItem a,
+.navItem a:hover,
+.navItem a:visited {
+    color: #ffffff;
+}
+
+.tableview th {
+    color: #003366;
+    border-bottom-color: #6699cc;
+}
+
+blockquote {
+    border-left-color: #6699cc;
+}
+
+.navBackgroundBox {
+    background: #6699cc;
+}
+
+.previewBoxTop,
+.previewContent,
+.previewBoxBottom,
+.functionbox {
+    border-color: #6699cc;
+}
+
+.smalltext-blue {
+    color: #6699cc;
+}
+
+.tabnav,
+.comment .tabnav,
+ul.tabnav {
+    border-bottom-color: #6699cc;
+}
+
+.tabnav .tabs a {
+    border-color: #6699cc;
+    background: #6699cc;
+}
+
+.tabnav .tabs a:link, .tabnav .tabs a:visited {
+    color: #ffffff;
+}
+.tabnav .tabs a:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+.tabnav .spaceActionLinks a:link,
+.tabnav .spaceActionLinks a:visited {
+    color: #003366;
+}
+
+.foldertab-box {
+	border-left-color: #6699cc;
+	border-right-color: #6699cc;
+	border-bottom-color: #6699cc;
+}
+
+#squaretab a {
+    border-color: #6699cc;
+}
+
+#squaretab a:link, #squaretab a:visited {
+    background-color: #6699cc;
+}
+
+#squaretab a:hover {
+    color: #ffffff;
+    background-color: #003366;
+    border-color: #003366;
+}
+
+table.blogcalendar {
+    border-color: #6699cc;
+}
+
+.blogcalendar th.calendarhead,
+a.calendarhead,
+a.calendarhead:link,
+a.calendarhead:visited,
+a.calendarhead:hover {
+    background-color: #6699cc;
+    color: #ffffff;
+}
+
+.searchGroupHeading {
+    background-color: #6699cc;
+    color: #ffffff;
+}
+
+.permissionTab {
+    background: #6699cc;
+    color: #ffffff;
+}
+
+.permissionSuperTab {
+    background: #003366;
+    color: #ffffff;
+}
+
+/* styles for links in the top bar */
+.topBarDiv a:link,
+.topBarDiv a:visited,
+.topBarDiv a:active,
+.topBarDiv a:hover,
+.topBarDiv {
+    color: #ffffff;
+}
+
+.topBar {
+    background-color: #003366;
+}
+
+.basicPanelContainer {
+    border-color: #6699cc;
+}
+
+.greynavbar {
+    border-top-color: #6699cc
+}
+
+div.license-personal {
+   background-color: #003366;
+   color: #ffffff;
+}
+
+div.license-personal a {
+   color: #ffffff;
+}
+
+.minitab {
+    border-bottom-color: #6699cc;
+}
+
+.minitab a {
+    border-top-color: #6699cc;
+    border-right-color: #6699cc;
+    border-left-color: #6699cc;
+}
+
+.minitab .unselected {
+    border-bottom-color: #6699cc;
+    background: #6699cc;
+}
+
+#header {
+    background-color: #003366;
+}
+#header a,
+#breadcrumbs,
+#header .ajs-menu-bar li.ajs-menu-item a.trigger {
+    color: #ffffff;
+}
+.breadcrumbs {
+ 	border-color: #6699cc;
+}
+
+#navigation, #tab-navigation {
+    border-bottom-color: #6699cc;
+}
+
+#com-atlassian-confluence .aui-dd-parent .aui-dropdown .dropdown-item a,
+.ajs-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    color: #535353;
+}
+#header .ajs-menu-bar li.ajs-menu-item .ajs-drop-down a {
+    color: #003366;
+}
+
+#com-atlassian-confluence .aui-dd-parent a.perms-dropdown-trigger:hover,
+#com-atlassian-confluence .aui-dd-parent a.perms-dropdown-trigger:focus,
+#com-atlassian-confluence .aui-dd-parent .aui-dropdown .dropdown-item.active a,
+.menu-section-list li.active a,
+.menu-section-list li.active a:hover,
+#navigation .ajs-menu-bar .ajs-button a:hover,
+/* .ajs-menu-bar .ajs-menu-item.opened, */
+.ajs-menu-bar .ajs-menu-item li.active a,
+.aui-dd-parent .aui-dropdown li.active,
+.aui-dd-parent .aui-dropdown li:hover span,
+.aui-dd-parent .aui-dropdown a:focus span,
+.ajs-menu-bar .ajs-menu-item.opened .ajs-drop-down li.active a,
+#navigation .ajs-menu-bar li.ajs-button a.active,
+#header .ajs-menu-bar li.ajs-menu-item.opened .ajs-drop-down li.active a,
+.ajs-content-hover .popup-follow a:hover {
+    color: #ffffff;
+    background-color: #6699cc;
+}
+#header .ajs-menu-bar li.ajs-menu-item.opened,
+#header .ajs-menu-bar li.ajs-menu-item.opened a.trigger {
+    background-color: #336699;
+    border-color: #336699;
+}
+.ajs-menu-bar .ajs-menu-item.opened a.trigger {
+    background-color: #6699cc;
+}
+
+#header .ajs-menu-bar .ajs-drop-down {
+    border-color: #003366;
+}
+#header .ajs-menu-bar .ajs-drop-down li.separator {
+    border-top-color: #003366;
+}
+
+.tab-navigation .tab a {
+    background-color: #6699cc;
+    border: 1px solid #6699cc;
+    color: #ffffff;
+}
+.tab-navigation .tab a:hover {
+    color: #ffffff;
+    background-color: #003366;
+    border-bottom-color: #003366;
+}
+
+
+
+/***** Pre 2.8 markup styles for backwards compatability ******/
+#foldertab {
+    border-bottom-color: #6699cc;
+}
+
+#foldertab li a {
+    border-color: #6699cc;
+    background: #6699cc;
+}
+
+#foldertab li a:link,
+#foldertab li a:visited {
+    color: #ffffff;
+}
+#foldertab li a:hover {
+    color: #ffffff;
+    background: #003366;
+    border-color: #003366;
+}
+
+.logoSpaceLink,
+.logoSpaceLink a:link,
+.logoSpaceLink a:visited,
+.logoSpaceLink a:active {
+    color: #999999;
+}
+
+.logoSpaceLink a:hover {
+    color: #003366;
+}
+
+.selectedminitab {
+    border-color: #6699cc
+}
+
+.unselectedminitab {
+	border-color: #6699cc;
+	background: #6699cc;
+}
+
+.tabletitle, .heading-text-color {
+    color: #003366;
+}
+
+a.unselectedminitab:hover {
+	color: #ffffff;
+	background: #003366;
+	border-color: #003366;
+}
+
+ol.autocompleter li.focused {
+	background: #6699cc;
+	color: #ffffff;
+}
+
+/* End colour styles for Confluence */
+
+/*
+    This stylesheet defines styles that only apply to the Default theme. Styles common to all themes should go in
+    master.css
+*/
+html, body {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    font-family: Helvetica, Arial, sans-serif;
+    background-color:#fff;
+}
+
+#full-height-container {
+    min-height: 100%;
+    position: relative;
+    background-color: #fff;    
+}
+
+#header {
+    margin: 0;
+    padding: 0 10px;
+    min-height: 2em;
+    line-height: 2;
+}
+
+#websudo {
+    margin: 0;
+    padding: 0 10px;
+    min-height: 2em;
+    line-height: 2;
+}
+
+.email{
+    /* offset the negative margin set by the header for emails only */
+    margin: 10px;
+}
+
+#page-view-panel {
+    float: right;
+}
+
+#com-atlassian-confluence h1 img {
+    max-height: 2.5em; /* scale logo image with font size */
+    margin-bottom: 0.3em;
+}
+#com-atlassian-confluence h1 img.custom {
+    height: auto;
+}
+
+h1 span.title-text {
+    display: table; /* page title wrapping drops straight down */
+}
+h1 a:hover {
+    color: inherit; /* inherit the colour instead of hard-coding blue */
+}
+.editable-title {
+    margin: 0 10px 0 58px;
+}
+
+#main {
+    padding: 10px 10px 6em 10px;
+}
+.content-preview #main {
+    padding-bottom: 10px;
+}
+
+#content {
+    clear: left;
+}
+#content.space {
+    margin-top: 2.6em;
+}
+
+.quick-search-submit {
+    display: none;
+}
+
+#page-view-panel li, #page-prefs-list li {
+    color: #666;
+    float: left;
+    font-size: .9em;
+    margin: 0 0 0 .3em;
+    padding: 0 0 0 .3em;
+}
+
+#navigation {
+    display: inline;
+}
+
+.page-actions {
+    float: right;
+    border: solid 1px #ccc;
+    padding: 5px;
+    margin-left: 10px;
+}
+
+.remove-control {
+    display: none;
+}
+
+.page-metadata {
+    color: #666;
+    font-size: 0.9em;
+    margin: 10px 0;
+}
+.page-metadata a:link,
+.page-metadata a:active,
+.page-metadata a:hover,
+.page-metadata a:visited {
+    color: #666;
+    font-style: normal;
+}
+
+.section-header {
+    margin-bottom: 5px;
+    padding: 2px 0;    
+}
+
+/* All links are set to action.linkColor but section header links are grey */
+.section-header a:link,
+.section-header a:active,
+.section-header a:hover,
+.section-header a:visited {
+    color: #666;
+}
+
+h2.section-title {
+    font-size: 12pt;
+    font-weight: bold;
+    color: black;
+    margin-top: 20px;
+    padding: 0;
+    display: inline;
+}
+
+.section-title a:link,
+.section-title a:active,
+.section-title a:hover,
+.section-title a:visited {
+    color: black;
+}
+
+#sidebar,
+.sidebar {
+    clear: right;
+    float: right;
+    width: 16em;
+    margin-left: 10px;
+}
+
+#space-blog-search-query{
+    width: 21.5em;
+}
+
+#blog-sidebar{
+    width: 22em;
+    margin-top: 2em;
+}
+
+.has-sidebar #content.space,
+.has-sidebar #content.edit form.markup,
+.has-sidebar .wiki-content,
+.has-sidebar.active-wikimarkup .errorBox{
+    margin-right: 17em;
+}
+
+.has-blog-sidebar #content.space,
+.has-blog-sidebar #content.edit form.markup,
+.has-blog-sidebar .wiki-content
+{
+    margin-right: 24em;
+}
+
+.blog-post-listing .wiki-content,
+.has-blog-sidebar .blogpost-view .wiki-content .wiki-content{
+    margin-right: 0;
+}
+
+.has-sidebar .wiki-content .wiki-content,
+.has-blog-sidebar .wiki-content .wiki-content,
+.has-blog-sidebar .comment-content.wiki-content {
+    margin-right: 0;
+}
+
+.active-richtext #content.create-page,
+.active-preview #content.create-page {
+    margin-right: 0 !important;
+}
+
+.sidebar-content {
+    margin: 10px 0 0 1em;
+}
+.blogcalendar {
+    width: 16em;
+}
+.blogcalendar th a.calendarhead,
+.blogcalendar th.calendarhead {
+    font-size: 1em;
+}
+.blogcalendar td,
+.blogcalendar th {
+    font-size: .85em;
+}
+
+/* folder tab link styles */
+.tabnav .tabs a {
+    padding: 5px 5px 4px;
+    margin: 5px 3px 0 0;
+    border-width: 1px;
+    border-style: solid;
+    border-bottom: none;
+    text-decoration: none;
+    display: block;
+    float: left;
+}
+
+.tabnav .tabs a.current {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+.tabnav .tabs a.current:link, .tabnav .tabs a.current:visited {
+    color: black;
+}
+.tabnav .tabs a.current:hover {
+    background: white;
+    border-bottom: 1px solid white;
+    color: black;
+}
+
+/* list page navigational tabs */
+.tabnav, .comment .tabnav {
+    padding: 0;
+    margin: 0;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    float: left;
+    display: inline;
+    list-style-position: outside;
+    width: 100%;
+    font-weight: bold;
+    font-size: 10pt;
+}
+
+.after-tabnav {
+    clear: both;
+}
+
+.tabnav li.tabs {
+    list-style: none;
+    margin: 0 0 -1px 10px;
+    float: left;
+    display: block;
+}
+
+
+/* dashboard customization */
+#spacesLabel {
+    padding: 4px 6px;
+    float: left;
+    margin-top: 5px;
+}
+
+#footer {
+    position:absolute;
+    bottom:0;
+    width:100%;
+}
+
+#poweredby,
+#poweredby a {
+    font-size: 11px;
+}
+
+/* We can't have a separate IE css file because the default theme
+   hard codes the location of the theme stylesheet */
+
+/* IE6: treated as min-height*/
+* html #full-height-container {
+    height: 100%;
+    background-color:#F0F0F0;
+}
+
+* html #main {
+    padding-bottom: 1em;
+    height: 88%; /* fake ie6 min height - not perfect but better than alternatives */
+}
+
+* html #footer {
+    position: relative;
+}
+
+/* no footer in popups. */
+body.popup-window #footer {
+    display: none;
+}
+
+* html .popup-window #full-height-container {
+    background-color:#fff;
+}
+
+
+
+
+
+
diff --git a/site/trunk/site-publish/resultsetdrivendataobjecttypes.html b/site/trunk/site-publish/resultsetdrivendataobjecttypes.html
new file mode 100644
index 0000000000..66395ad70e
--- /dev/null
+++ b/site/trunk/site-publish/resultsetdrivendataobjecttypes.html
@@ -0,0 +1,132 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : ResultSetDrivenDataObjectTypes</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52819">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="ResultSetDrivenDataObjectTypes">ResultSetDrivenDataObjectTypes</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="ResultSetDrivenDataObjectTypes-ResultSetDrivenDataObjectTypes%26nbsp%3B"></A>ResultSetDrivenDataObjectTypes&nbsp;</H1>
+
+<P>When the RDB DAS is operating in pure dynamic mode (no user provided static DataObjects), it uses uses JDBC <A href="http://java.sun.com/j2se/1.3/docs/api/java/sql/ResultSetMetaData.html" class="external-link" rel="nofollow">ResultSetMetadata</A>to create the set of SDO Types used to construct the data graph returned as a result of a query. JDBC returns the data resulting from a query as a set of rows of column values. The associated ResultSetMetadata provides information about these values. Table name, column name, column type, etc. are all provided for each returned value.</P>
+
+<P>For example, consider a database with the following table:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>TABLE CUSTOMER
+      ID         INTEGER
+      LASTNAME   VARCHAR(20)
+      ADDRESS    VARCHAR(30)
+</PRE>
+</DIV></DIV>
+<P>The user might query the database like this:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command readCustomers = das.createCommand(&quot;select * from CUSTOMER where LASTNAME = 'Williams'&quot;);<BR>
+ DataObject root = readCustomers.executeQuery();</P>
+</DIV></DIV>
+<P>The DAS returns a graph of DataObjects each of Type CUSTOMER and each instance will have three properties: (ID, LASTNAME, ADDRESS). Since this example does not pass the DAS a set of SDO Types to use, the DAS creates the Types dynamically based on the ResultSetMetadata.</P>
+
+<P>The RDB DAS also allows clients to receive the results of queries as Static DataObjects (see <A href="workingwithstaticdataobjects.html" title="WorkingWithStaticDataObjects">WorkingWithStaticDataObjects</A>). </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/running-the-samples.data/BigBank.Apache.Tuscany.ppt b/site/trunk/site-publish/running-the-samples.data/BigBank.Apache.Tuscany.ppt
new file mode 100644
index 0000000000..f2a133deb2
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/BigBank.Apache.Tuscany.ppt
diff --git a/site/trunk/site-publish/running-the-samples.data/DELETE.txt b/site/trunk/site-publish/running-the-samples.data/DELETE.txt
new file mode 100644
index 0000000000..fa892050ad
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/DELETE.txt
diff --git a/site/trunk/site-publish/running-the-samples.data/DELETEME.txt b/site/trunk/site-publish/running-the-samples.data/DELETEME.txt
new file mode 100644
index 0000000000..04c3096255
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/DELETEME.txt
diff --git a/site/trunk/site-publish/running-the-samples.data/DELETEMETOO.txt b/site/trunk/site-publish/running-the-samples.data/DELETEMETOO.txt
new file mode 100644
index 0000000000..4e422a21f2
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/DELETEMETOO.txt
diff --git a/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.pdf b/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.pdf
new file mode 100644
index 0000000000..c95bb62a6a
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.pdf
diff --git a/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.ppt b/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.ppt
new file mode 100644
index 0000000000..c608a74be1
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.data/ModifiedCalculatorExample.ppt
diff --git a/site/trunk/site-publish/running-the-samples.html b/site/trunk/site-publish/running-the-samples.html
new file mode 100644
index 0000000000..689d58cf91
--- /dev/null
+++ b/site/trunk/site-publish/running-the-samples.html
@@ -0,0 +1,129 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Running the samples</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44883">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Running the samples">Running the samples</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Runningthesamples-DocumentationabouttheBigBankExample"></A>Documentation about the BigBank Example</H1>
+
+<P>I wrote a document which explains in some detail the BigBank example. I think it is quite convenient to get to understand in more detail the way the sample works. It is a PPT file which can be downloaded from <A href="http://cwiki.apache.org/confluence/download/attachments/44883/BigBank.Apache.Tuscany.ppt" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/download/attachments/44883/BigBank.Apache.Tuscany.ppt</A>.</P>
+
+<P>Regards,<BR>
+Mario</P>
+
+<H1><A name="Runningthesamples-ModifiedCalculatorComboExample%3AChangingamongdifferentserviceimplementations"></A>Modified Calculator Combo Example: Changing among different service implementations</H1>
+
+<P>I made some modifications to the Calculator Combo example and I made a presentation about it focusing on the ability to change among different service implementations/bindings. </P>
+
+<P>You can get the PPT presentation from:
+<A href="http://cwiki.apache.org/confluence/download/attachments/44883/ModifiedCalculatorExample.ppt" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/download/attachments/44883/ModifiedCalculatorExample.ppt</A><BR>
+Or the PDF version at:
+<A href="http://cwiki.apache.org/confluence/download/attachments/44883/ModifiedCalculatorExample.pdf" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/download/attachments/44883/ModifiedCalculatorExample.pdf</A></P>
+
+<P>Best Regards,<BR>
+Cristian Fiorentino.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png
new file mode 100644
index 0000000000..1205f49abb
--- /dev/null
+++ b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png
diff --git a/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png.jpeg b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png.jpeg
new file mode 100644
index 0000000000..ab77111fcf
--- /dev/null
+++ b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png.jpeg
diff --git a/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/tuscany.policy b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/tuscany.policy
new file mode 100644
index 0000000000..1d4b1f0718
--- /dev/null
+++ b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.data/tuscany.policy
@@ -0,0 +1,20 @@
+// If the URL substitution property fails, use a hard coded Tuscany home
+// For example, replace "${{tuscany.home}}" with "/e:/tuscany/java/sca" .
+grant codeBase "file:/e:/t/java/sca/-" {
+  permission java.security.AllPermission;
+};
+
+// If the URL substitution property fails, use a hard coded Maven repos home
+// For example, replace "${{m2_repo.home}}" with "/e:/g/m2" .
+grant codeBase "file:/e:/g/m2/-" {
+  permission java.security.AllPermission;  
+};
+
+grant codeBase "file:/e:/temp/eclipse/eclipse/-" {
+  // permission java.security.AllPermission;
+  permission java.net.SocketPermission "127.0.0.1:*", "connect,resolve";
+  permission java.io.FilePermission "<<ALL FILES>>", "read";
+  permission java.lang.RuntimePermission "accessDeclaredMembers";  
+  permission java.lang.RuntimePermission "getClassLoader";  
+  permission java.lang.RuntimePermission "createClassLoader";  
+};  
+\ No newline at end of file
diff --git a/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.html b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.html
new file mode 100644
index 0000000000..01e32c98bf
--- /dev/null
+++ b/site/trunk/site-publish/running-tuscany-with-java-2-security-enabled.html
@@ -0,0 +1,266 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Running Tuscany with Java 2 Security Enabled</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=92356">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Running Tuscany with Java 2 Security Enabled">Running Tuscany with Java 2 Security Enabled</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="RunningTuscanywithJava2SecurityEnabled-RunningTuscanywithJava2SecurityEnabled"></A>Running Tuscany with Java 2 Security Enabled</H1>
+<P><FONT color="blue"> <BR>
+<A href="http://vcasmo.com/video/beckerdo/2750" class="external-link" rel="nofollow"><B>Java Security</B></A> is available in Video, use tuscany passcode</FONT> </P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-OverviewofJava2Security"></A>Overview of Java 2 Security</H2>
+
+<P><B>Apache Tuscany</B> promotes the Java 2 security model by allowing one to run Service Component Architecture (SCA) applications in a secured environment. By default, with Java 2 security disabled, Java application code and the Tuscany runtime code base run in an unsecure environment with no security manager. This gives the Java application and Tuscany runtime access to all system resources. The application may read and write all system properties, open and read any system files, and do all sorts of unprotected actions. All Tuscany code will run unhindered in this environment. And all malicious Tuscany users will also run unhindered in this environment.</P>
+
+<P>With Java 2 security enabled, the user contribution to the SCA domain has very tight security restrictions. This ensures that the user SCA application does not introduce mischevious code (for instance with a user-provided custom classloader) or perform unprotected investigations (such as when a user-provided application starts snooping around the file system looking for interesting files.) The Tuscany runtime is also forced to abide by these tight security resitrictions, but the runtime has been fitted and tested with privileged code to check for proper access permissions before performing any sensitive operations. Because of this privileged code which obeys the Java 2 security architecture, the Tuscany runtime acts as a proxy and performs sensitive operations on behalf of the user application.</P>
+
+<P>The purpose of this article is to show how one can run Apache Tuscany and SCA applications in various environments while enabling Java 2 security and ensuring the application is running in a secured environment. Tuscany users and deployers and administrators should read this article. More in-depth runtime developers should also proceed onto the associated article <A href="security-aware-programming-in-tuscany.html" title="Security Aware Programming in Tuscany">Security Aware Programming in Tuscany</A>.</P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-EnablingJava2SecurityfromaCommandLine"></A>Enabling Java 2 Security from a Command Line</H2>
+
+<P>The most basic way to run Tuscany applications is from a command line window or shell. You may enable security in this environment by running your Tuscany application with the java.exe <TT>-Djava.security.manager</TT> option on the command line. This enables the default Java security manager which delegates access control decisions to <TT>java.security.AccessController</TT>. The <TT>AccessController</TT> determines access authority for your Java code by consulting the permissions in a <TT>java.security.Policy</TT> class usually specified in the default <TT>security.policy</TT> file.</P>
+
+<P>There is only one <TT>Policy object</TT> installed into a Java runtime at any given time. The default behavior for Java is to  load the authorization data from one or more security policy files, but Tuscany users may add to or replace the policy by running with additional policy information on the command line. For instance <TT>&quot;-Djava.security.manager -Djava.security.policy=tuscany.policy&quot;</TT> will add the permissions in the tuscany.policy file to the default Java permissions. If you specify <TT>&quot;-Djava.security.policy==tuscany.policy&quot;</TT> you replace the default policy with those specified in the Tuscany policy file. The format of the java.security.policy is a URL, which can contain any of the legal URL protocols such as file: or http: protocol.</P>
+
+<P>Each policy file will contain a list of grant statements. A grant tells the runtime where the code came from (a URL specifying the code base), who signed the code (a list of signer certificates), and what permissions are given. The permissions can be read write permissions to the file system, access to system properties, or class loading privileges.<BR>
+An example of a granting all permission to an unsigned Tuscany code base is given here:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>security.policy example</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grant codeBase <SPAN class="code-quote">&quot;file:$/{{user.home}}/tuscany/java/sca/-&quot;</SPAN> {
+  permission java.security.AllPermission;
+};
+</PRE>
+</DIV></DIV>
+<P>This example grant statement is quite a broad bludgeon. Namely it says that all Tuscany code has been granted all permissions. This seems like this is not very secure as it provides all permissions to Tuscany, however, it is still a step up from running with no security policy. In this case Tuscany is provided with privileged access, while user application are not. In practice, a user policy might want much finer-grained permissions towards the Tuscany code and allow only specific pieces of the code to have privileged access. An example <A href="running-tuscany-with-java-2-security-enabled.data/tuscany.policy">tuscany.policy</A> is attached to this article.</P>
+
+<P>Notice that the URL in this example supports the substitution of system properties. You can also provide other property names such as tuscany.home or whatever property you provide to the command line. Additionally you may end the URL with '*' which includes all JARs and class files in the current location or '-' which includes all JAR and class file recursively below this location. Additional information on Java application security architecture and features is given at <A href="http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html" class="external-link" rel="nofollow">Java Security</A>.</P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-EnablingJava2SecurityUsingMaven"></A>Enabling Java 2 Security Using Maven</H2>
+
+<P>JIRA TUSCANY-2339 allows <B>Maven</B> to run all Tuscany itests and vtests with Java 2 security enabled.  To run this Maven profile, you must provide a tuscany.policy file in your java.home /lib/security directory (default location) or provide a tuscany.policy.file property to provide a local file URL, or copy the contents of tuscany.policy to another policy file. As the tuscany.policy file is written, you must have system properties tuscany.home and maven.repos defined, or you must hard code the location of these code bases.</P>
+
+<P>Run the Tuscany test profile with Maven by naming the security profile name explicitly or my providing a tuscany.policy.file property:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn test -P security
+</PRE>
+</DIV></DIV>
+
+<P>or</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn <SPAN class="code-quote">&quot;-Dtuscany.policy.file=file:<SPAN class="code-comment">///e:/tuscany.policy&quot;</SPAN></SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Here is the addition to the pom.xml file to run with security. You may uncomment or add other modules to perform tests.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        &lt;profile&gt;
+            &lt;id&gt;security&lt;/id&gt;
+            &lt;modules&gt;
+                &lt;!-- &lt;module&gt;demos&lt;/module&gt; --&gt;
+                &lt;module&gt;itest&lt;/module&gt;
+                &lt;module&gt;vtest&lt;/module&gt;
+            &lt;/modules&gt;
+            &lt;activation&gt;
+                &lt;property&gt;
+                    &lt;name&gt;tuscany.policy.file&lt;/name&gt;
+                &lt;/property&gt;
+            &lt;/activation&gt;
+            &lt;properties&gt;
+                &lt;tuscany.policy.file&gt;&lt;Your tuscany.policy file location&gt;&lt;/tuscany.policy.file&gt;
+            &lt;/properties&gt;
+            &lt;build&gt;
+                &lt;plugins&gt;
+                    &lt;plugin&gt;
+                        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+                        &lt;artifactId&gt;maven-surefire-plugin&lt;/artifactId&gt;
+                        &lt;version&gt;2.3.1&lt;/version&gt;
+                        &lt;configuration&gt;
+                            &lt;includes&gt;
+                                &lt;include&gt;**/*TestCase.java&lt;/include&gt;
+                            &lt;/includes&gt;
+                            &lt;reportFormat&gt;brief&lt;/reportFormat&gt;
+                            &lt;useFile&gt;<SPAN class="code-keyword">false</SPAN>&lt;/useFile&gt;
+                            &lt;forkMode&gt;once&lt;/forkMode&gt;
+                            &lt;!-- Place tuscany.policy in your Java home security directory. Alternatively, hardcode the file location here. --&gt;
+                            &lt;argLine&gt;-Djava.security.manager -Djava.security.policy=${tuscany.policy.file}
+                               -Dpolicy.allowSystemProperty=<SPAN class="code-keyword">true</SPAN> -Djava.security.debug=policy&lt;/argLine&gt;
+                        &lt;/configuration&gt;
+                    &lt;/plugin&gt;
+                &lt;/plugins&gt;         
+            &lt;/build&gt;
+        &lt;/profile&gt;
+</PRE>
+</DIV></DIV>
+
+<P>One gotcha in this environment is that the security profile adds a bit more memory requirements for the test run. You may need to increase the Java heap max size <TT>-Xmx1024m</TT> or increase the Maven <TT>MAVEN_OPTS=-XX:MaxPermSize=512m</TT> if you see memory related errors when you run in this environment.</P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-EnablingJava2SecurityinEclipse"></A>Enabling Java 2 Security in Eclipse</H2>
+
+<P>Many users import Tuscany projects into <B>Eclipse</B> or other Integrated Development Environment and run or develop applications in this type of environment. Whether you are running your own SCA application, or one of the many Tuscany samples or demos, the process for running with Java 2 security enabled is the same. Your application or sample has build and runtime dependencies on the Tuscany code, and the application is run with a security profile.</P>
+
+<P>Eclipse provides a run dialog that determines how a project is run. For instance, many Tuscany samples are run as Java applications. The Tuscany samples also provide many test cases that may be run in a JUnit test suite. In either case, you specify Java 2 security options in a similar way. You create a 'run' configuration for your type of code (Java application, Java applet, JUnit test case, etc.). The run dialog has a 'Arguments' tab where you can provide Java Virtual Machine options. You provide the Java 2 security options in the 'Program Arguments' text box.</P>
+
+<P>An example of this configuration is shown here:<BR>
+<SPAN class="image-wrap" style=""><IMG src="running-tuscany-with-java-2-security-enabled.data/EclipseAppConfig.png" style="border: 0px solid black"></SPAN></P>
+
+<P>There are two small gotchas to be aware of in this environment. Once again the location of the policy file is a URL. If you specify the policy with no file or http prefix, the default location will be location of the project in the workspace. So in this example, a simple <B>-Djava.security.policy=tuscany.policy</B> requires a tuscany policy file in the sample-calculator project in your Eclipse workspace. Since this is URL, you can put the policy file anywhere in your file system. Secondly, some of the Tuscany demos and samples use privileged code (such as load classes dynamically, read system properties, read the file system, or connect to various server sockets). These example do this to demonstrate various SCA features. However, these applications may throw a security exception because they are given proper access. In this case you may want to add access for Eclipse or application code. An example is given here:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grant codeBase <SPAN class="code-quote">&quot;file:${eclipse.home}/-&quot;</SPAN> {
+  permission java.net.SocketPermission <SPAN class="code-quote">&quot;127.0.0.1:*&quot;</SPAN>, <SPAN class="code-quote">&quot;connect,accept,resolve&quot;</SPAN>;
+  permission java.io.FilePermission <SPAN class="code-quote">&quot;&lt;&lt;ALL FILES&gt;&gt;&quot;</SPAN>, <SPAN class="code-quote">&quot;read&quot;</SPAN>;
+  permission java.util.PropertyPermission <SPAN class="code-quote">&quot;*&quot;</SPAN>, <SPAN class="code-quote">&quot;read&quot;</SPAN>;  
+};
+</PRE>
+</DIV></DIV>
+<P>Grant this access when you are developing in Eclipse. When you are ready to deploy and run these application in the real world, read the next section as to how to run on popular application servers.</P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-SecurityTipsforPopularApplicationServers"></A>Security Tips for Popular Application Servers</H2>
+
+<P>When Tuscany is run by an application server (whether it be WebSphere, Geronimo, or other), the policy of the application server will form the starting point for Tuscany's security policy. This section gives an overview to the Java 2 security policies of several popular application servers.</P>
+
+<H4><A name="RunningTuscanywithJava2SecurityEnabled-WebSphereApplicationServer"></A>WebSphere Application Server</H4>
+
+<P>There are several different ways to run Tuscany applications on <B>IBM WebSphere Application Server</B>. In either case you may run your Tuscany application as a Java application or a Java Extended Edition applicaiton, depending on which container features you need. Obviously if you use web application features you should run in a web server container. If you are using servlet or persistence features you should run in an applicaiton server container. You may run your Tuscany application and include any Tuscany runtime prerequisite JARs in the package. Another way is to run your Tuscany application without internal runtime prereqs and use IBM's Service Oriented Architecture Feature Pack (SOA FeP) to provide an SCA runtime. In any case running your application with security enabled will be the same.</P>
+
+<P>WAS provides security policy information in a number of places. First there are three locations that provide static security plicy info that may be changed by a system administrator when installing or configuring a server:</P>
+<UL>
+	<LI>app_server_root/java/jre/lib/security/java.policy</LI>
+	<LI>app_server_root/properties/server.policy</LI>
+	<LI>profile_root/config/cells/cell_name/nodes/node_name/app.policy</LI>
+</UL>
+
+
+<P>The first of these files will permanently change security policy by all users of the system JVM. The second of these files will change the security policy for all servers in this installation. The third file app.policy includes policy that applies to all enterprise applications on the node to which the app.policy file belongs. All of these policy files are static and used for general system-wide infrastructure. It is suggested that you use these files with care.</P>
+
+<P>For instance, let's say wish to allow certain JARs to read system properties on WAS. This would be the entry to add to app.policy.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grant codeBase <SPAN class="code-quote">&quot;file:${application}&quot;</SPAN> {
+ permission java.utilPropertyPermission <SPAN class="code-quote">&quot;${was.install.root}${/}profiles${/}AppSrv01${/}installedAssets${/}vtestService.jar${/}1.0${/}vtestService.jar&quot;</SPAN>, <SPAN class="code-quote">&quot;read&quot;</SPAN>;
+};
+</PRE>
+</DIV></DIV>
+
+<P>A final location to provide Java 2 Security is in the was.policy file of the JAR, WAR, or EAR file that you are deploying. This location provides the fine-grained application-level security control, but the permission needs to be granted in each was.policy file for each application deployed on WAS. Additional details on WebSphere security are provided at the <BR>
+<A href="http://publib.boulder.ibm.com/infocenter/wasinfo/v6r1/index.jsp?topic=%2Fcom.ibm.websphere.base.doc%2Finfo%2Faes%2Fae%2Fcsec_rsecmgr2.html" class="external-link" rel="nofollow">WAS Info Center</A>.</P>
+
+<H4><A name="RunningTuscanywithJava2SecurityEnabled-ApacheGeronimo"></A>Apache Geronimo</H4>
+
+<P>Running on <B>Apache Geronimo</B> has similar considerations to running on other application servers. A user may choose to run the SCA application as a standalone SCA application with no container requirements, a web application with dependencies on a web server container, or a full blown JEE application with a need for servlets, JSPs, and other application server requirements.</P>
+
+<P>There is a <B>Geronimo</B> plugin that will help with deploying and running a Tuscany application. Additional details are provided in a<BR>
+<A href="http://cwiki.apache.org/TUSCANYWIKI/tuscany-geronimo-integration.html" class="external-link" rel="nofollow">Tuscany Geronimo Integration</A> article.</P>
+
+<H2><A name="RunningTuscanywithJava2SecurityEnabled-Conclusion"></A>Conclusion</H2>
+
+<P>This article provides a number of tips when running Java 2 Security with Tuscany in different environments. Feel free to contact the author or add your own environment tips to this articles. Comments and corrections are appreciated.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sandbox-for-website.html b/site/trunk/site-publish/sandbox-for-website.html
new file mode 100644
index 0000000000..65b50d727c
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-for-website.html
@@ -0,0 +1,127 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Sandbox for website : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45888">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Sandbox for website">Sandbox for website</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>Welcome</B> to the open source Apache Tuscany project!  The Tuscany community is working together to create a robust infrastructure that aims to simplify the development of service oriented (SOA) systems. </P>
+
+<P>Tuscany is based on open standards defined by the <SPAN class="nobr"><A href="http://osoa.org/" title="Visit page outside Confluence" rel="nofollow">Open SOA Collaboration<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and is comprised of independent technologies designed to work well together based on:</P>
+
+<P>Apache Tuscany is based on independent technologies that together provide following:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> enables composition of service networks through assembly of existing and new services. As an example, a service can be implemented as JAX-WS service, Spring Bean or EJB and exposed as a web service. Tuscany SCA allows services to be implemented in variety of languages such as Java, JavaScript and C&#43;&#43;. The Tuscany SCA runtime is implemented in Java and C&#43;&#43; and can easily be extended to support any communication transport, qualities of service or programming model and can be used in conjunction with other technologies such as Spring, Axis and Celtix.</LI>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C+&#43; implementations for SDO.</LI>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS.</LI>
+</UL>
+
+
+
+<P>Please join us to develop this innovative infrastructure and/or provide feedback based on your experiences.  With your help Apache Tuscany will become a first class solution for simplifying the development of SOA-based systems.</P>
+</TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The <SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">Apache Software Foundation (ASF)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sandbox-implementation-of-sca-event-processing.html b/site/trunk/site-publish/sandbox-implementation-of-sca-event-processing.html
new file mode 100644
index 0000000000..9b88962b1a
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-implementation-of-sca-event-processing.html
@@ -0,0 +1,189 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Sandbox Implementation of SCA Event Processing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99686">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-event-processing.html" title="SCA Java Event Processing">SCA Java Event Processing</A>&nbsp;&gt;&nbsp;<A href="" title="Sandbox Implementation of SCA Event Processing">Sandbox Implementation of SCA Event Processing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page describes the implementation of the SCA Event Processing Model which is contained in the sandbox/event directory of Tuscany.</P>
+
+<P>The principle followed in the implementation is to reuse as much as possible of the existing Tuscany SCA Java infrastructure to produce a working prototype at minimal effort.  It is unlikely that this implementation would be used for a full-blown implementation of Event Processing.</P>
+
+<H2><A name="SandboxImplementationofSCAEventProcessing-ImplementingProducers%2CConsumersandtheirLinksintheAssemblyLayer"></A>Implementing Producers, Consumers and their Links in the Assembly Layer</H2>
+
+
+<H2><A name="SandboxImplementationofSCAEventProcessing-ImplementingProducers%2CConsumersintheJavaPOJOimplementationtype"></A>Implementing Producers, Consumers in the Java POJO implementation type</H2>
+
+
+<H3><A name="SandboxImplementationofSCAEventProcessing-WorkItems"></A>Work Items</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Responsible </TH>
+<TH class="confluenceTh"> Status <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Create Consumer annotation <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Rajini Sivaram <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Done - 21/10/2008 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Create Producer annotation <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Rajini Sivaram <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Done - 21/10/2008 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Create EventType annotation </TD>
+<TD class="confluenceTd"> Rajini Sivaram <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Done - 21/10/2008 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Create EventTypes annotation <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Mike Edwards <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Done - 28/10/2008 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Create @eventType attribute for &lt;consumer/&gt; &amp; &lt;producer/&gt;<BR class="atl-forced-newline">
+ elements in the sca-core.xsd<BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Mike Edwards <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> New - 27/10/2008 <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.pdf b/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.pdf
new file mode 100644
index 0000000000..aa2f5ffe41
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.pdf
diff --git a/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.ppt b/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.ppt
new file mode 100644
index 0000000000..22ec4831cb
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sca-java.data/TuscanyJAVASCA.ppt
diff --git a/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG b/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG
new file mode 100644
index 0000000000..31ac89a4c1
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG
diff --git a/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG.jpeg b/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG.jpeg
new file mode 100644
index 0000000000..df0eb4aacd
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sca-java.data/highleveloverview.PNG.jpeg
diff --git a/site/trunk/site-publish/sandbox-sca-java.html b/site/trunk/site-publish/sandbox-sca-java.html
new file mode 100644
index 0000000000..4e25f24cb6
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sca-java.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Sandbox SCA Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47512">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="sca-overview-sandbox.html" title="SCA Overview - sandbox">SCA Overview - sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="Sandbox SCA Java">Sandbox SCA Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Tuscany SCA Java provides an implementation for the SCA specifications made available at Open SOA. This Java implementation provides an SCA runtime that is itself built as an assembly of SCA components. It is modularized into a core and a set of SPIs that provides the flexibility of varying parts or whole of the runtime implementation.</P>
+
+<P>Tuscany SCA Java provides a number of useful extensions (implementation type containers and transport / protocol extension bindings) that can be used to quickly assemble solutions around components implemented over different technologies. Here is a diagram showing the extensions available with SCA Java.</P>
+
+
+
+<P>&lt; we can list all the component implementations, data bindings, etc. here.&gt;</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sandbox-sdo-java.html b/site/trunk/site-publish/sandbox-sdo-java.html
new file mode 100644
index 0000000000..2275849c91
--- /dev/null
+++ b/site/trunk/site-publish/sandbox-sdo-java.html
@@ -0,0 +1,483 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Sandbox - SDO Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48471">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="Sandbox - SDO Java">Sandbox - SDO Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="20%">
+
+<H4><A name="Sandbox-SDOJava-TuscanySDOJava"></A>Tuscany SDO Java</H4>
+
+<P><A href="sdo-java.html" title="SDO Java">Overview</A><BR>
+<A href="http://incubator.apache.org/tuscany/sdo_downloads.html" class="external-link" rel="nofollow">Downloads</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQs</A></P>
+
+<H4><A name="Sandbox-SDOJava-SDOCTS"></A>SDO CTS</H4>
+
+<P><A href="sdo-cts.html" title="SDO CTS">Overview</A><BR>
+<A href="obtaining-the-sdo-21-cts.html" title="Obtaining the SDO 2.1 CTS">Getting the SDO CTS</A><BR>
+<A href="contributing-to-the-sdo-cts.html" title="Contributing to the SDO CTS">Contributing</A></P></TD>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>The Tuscany SDO Java Project</P>
+
+<P>The SDO Java project is a subproject of the Apache Tuscany incubator project and is intended to provide a Java implementation of the SDO 2.1 specification.</P>
+
+<H3><A name="Sandbox-SDOJava-Documents"></A>Documents</H3>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.osoa.org&linkCreation=true&fromPageId=48471" class="createlink">SDO Specification 2.1 for Java</A> describes the data programming interface for Java language.</P>
+
+<P>SDO White Paper	A white paper that explains the SDO programming model</P>
+
+<P><A href="http://java.sys-con.com/read/313547.htm" class="external-link" rel="nofollow">A quick view of What is SDO</A> can be found in this article.</P>
+
+<H3><A name="Sandbox-SDOJava-SDOJavaGettingStarted"></A>SDO Java Getting Started</H3>
+
+<P>To get started with Java SDO, <A href="http://incubator.apache.org/tuscany/sca_downloads.html" class="external-link" rel="nofollow">download</A> binary or source distribution. If you are working from a source distribution, you can follow the general instructions for building the whole of the Tuscany java projects, or you can follow the intructions within the SDO Java overview to build and explore just SDO java.</P>
+
+<H3><A name="Sandbox-SDOJava-Overview"></A>Overview</H3>
+
+<P>The SDO Java project is a subproject of the Apache Tuscany incubator project is intended to provide a Java implementation of the SDO 2.1 specification.</P>
+
+<P>The project's code base includes the following:</P>
+<UL>
+	<LI>Dynamic data object support</LI>
+	<LI>Basic static code generation (generator patterns still subject to change)</LI>
+	<LI>Most Helper classes either partially or fully implemented (XMLHelper, XSDHelper, DataFactory, CopyHelper, EqualityHelper)</LI>
+	<LI>Minimal ChangeSummary support (only in DataGraph context)</LI>
+	<LI>Limited example programs</LI>
+</UL>
+
+
+<P>The Tuscany wiki contains an area for raw thoughts and clarifications on SDO that will eventually make it into well crafted documentation.</P>
+
+<H3><A name="Sandbox-SDOJava-HowtoBuild"></A>How to Build</H3>
+
+<P>There are two motivations for building SDO from source and two well tested approches to doing so. You may be wanting to build a binary release distribution from source code. Alternatively you may be wishing to establish a development environment in order to futher the development of the code. The two tested approaches are either to use maven 2 commandline builds or to java source code create projects in the Eclipse SDK.</P>
+
+<P>If you simply want to create a source code distribution, then even if you are an Eclipse user its best to just follow the instructions in the BUILDING.txt file at the top of the source code distribution and run a maven command line build (since the route to establishing an Eclipse environment requires installing maven anyway). Note that SDO for Java is distributed as two source code distributions. You'll need to download two archives, one for the SDO API, and one for the Tuscany implementation of that API.</P>
+
+<P>If you want to work with the SDO projects alone, without the rest of Tuscany, proceed with the following steps.</P>
+
+<P>Set up your environment using the instructions for building the whole of Tuscany, but only download and install Java 5, Maven and Svn (note that only one file, Interface2JavaGenerator.java, has a Java 5 dependency, if you want to work with Java 1.4.2 then just delete this file before building).</P>
+
+<P>Make sure 'mvn' and 'svn' commands are in your PATH environment variable.</P>
+
+<P>Check out the SDO open source projects from Apache.</P>
+
+<P><FONT color="gray">md &lt;local tuscany dir&gt;</FONT><BR>
+<FONT color="gray">cd &lt;local tuscany dir&gt;</FONT><BR>
+<FONT color="gray">svn co &#45;N</FONT> <FONT color="gray"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java</A></FONT><BR>
+<FONT color="gray">cd java</FONT><BR>
+<FONT color="gray">svn up sdo</FONT><BR>
+<FONT color="gray">svn up &#45;N spec</FONT><BR>
+<FONT color="gray">cd spec</FONT><BR>
+<FONT color="gray">svn up sdo-api</FONT></P>
+
+<P>Run &quot;mvn&quot; under &lt;local tuscany dir&gt;/java directory to install POM files from the root project to the local repository</P>
+
+
+<P><FONT color="gray">cd &lt;local tuscany dir&gt;/java</FONT><BR>
+<FONT color="gray">mvn &#45;N</FONT><BR>
+<FONT color="gray">cd spec</FONT><BR>
+<FONT color="gray">mvn &#45;N</FONT><BR>
+<FONT color="gray">cd ../sdo</FONT><BR>
+<FONT color="gray">mvn &#45;N (alternatively, run without the &#45;N option - see Note below)</FONT></P>
+
+<P>You can now build SDO project as a whole or build the individual SDO subprojects.</P>
+
+<H3><A name="Sandbox-SDOJava-BuildSDOproject"></A>Build SDO project</H3>
+
+<P>This step builds all subprojects in the source tree at once</P>
+
+<P><FONT color="gray">mvn in &lt;local tuscany dir&gt;/java/sdo</FONT></P>
+
+<P>If the mvn command completed successfully, you will see BUILD SUCCESSFUL in the output and the results of compilation will be available in jar files created under directories named &quot;target&quot; directly under the root directories of the projects. These jar files are also installed into your local maven repository ($HOME/.m2/repository) and are available as inputs to later build operations.</P>
+
+<P><EM>Maven fetches external resources required for a build process from the internet. These resources are at times unavailable. It may be necessary to run &quot;mvn&quot; again at a later time.</EM></P>
+
+<P><EM>If you are taking time to reply to firewall prompts, this can cause some requests to time out. Set up the firewall to permit the action without prompting.</EM></P>
+
+<H3><A name="Sandbox-SDOJava-BuildsubprojectsofSDOindividually"></A>Build sub projects of SDO individually</H3>
+
+<P><B>Build sdo.spec project</B></P>
+
+
+<P><FONT color="gray">cd &lt;local tuscany dir&gt;/java/spec/sdo-api</FONT><BR>
+<FONT color="gray">mvn</FONT><BR>
+<FONT color="gray">mvn &#45;Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.)</FONT></P>
+
+<P><B>Build sdo.impl project</B></P>
+
+<P><FONT color="gray">cd &lt;local tuscany dir&gt;/java/sdo/impl</FONT><BR>
+<FONT color="gray">mvn</FONT><BR>
+<FONT color="gray">mvn &#45;Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.)</FONT></P>
+
+<P><B>Build sdo.tools project</B></P>
+
+<P><FONT color="gray">cd &lt;local tuscany dir&gt;/java/sdo/tools</FONT><BR>
+<FONT color="gray">mvn</FONT><BR>
+<FONT color="gray">mvn &#45;Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.)</FONT></P>
+
+<P><B>Build sdo.samples project</B></P>
+
+<P><FONT color="gray">cd &lt;local tuscany dir&gt;/java/sdo/sample</FONT><BR>
+<FONT color="gray">mvn</FONT><BR>
+<FONT color="gray">mvn &#45;Peclipse eclipse:eclipse (optional: Run this command if you are using Eclipse for development.)</FONT></P>
+
+<H3><A name="Sandbox-SDOJava-SDOProjectCodeStructure"></A>SDO Project Code Structure</H3>
+
+<P>The SDO project is divided into five parts:</P>
+<UL>
+	<LI>sdo.spec contains the SDO (commonj) interfaces defined and provided by the SDO 2 specification.</LI>
+	<LI>sdo.impl provides the runtime implementation of the SDO interfaces.</LI>
+	<LI>sdo.tools contains import and generator tools.</LI>
+	<LI>sdo.sample contains sample sdo code.</LI>
+	<LI>sdo.plugin contains code to configure the way in which SDO is build by maven.</LI>
+</UL>
+
+
+<P>The main source code in each of these subprojects is located in the directory src/main/java, and if applicable, test (example) classes are located in src/test/java. The directory src/test/resources contains any data files needed by the test programs.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/spec/sdo-api" class="external-link" rel="nofollow">sdo.spec</A></P>
+
+<P>This project contains the interfaces provided with the SDO 2 specification. It is essentially an unzipped copy of the SDO Java API sources zip file available at <A href="http://ftpna2.bea.com/pub/downloads/SDO_20_Source.zip" class="external-link" rel="nofollow">http://ftpna2.bea.com/pub/downloads/SDO_20_Source.zip</A>, but with some errata corrections and a Tuscany-specific implementation of class HelperProvider.</P>
+
+<P>The abstract class, HelperProvider, is used to obtain specific default helpers and other implementation-specific objects used by the Java implementation of SDO. In the Tuscany implementation of this class, there are two ways to specify the implementation of the HelperProvider class.</P>
+
+<P>Set a System Property named &quot;commonj.sdo.impl.HelperProvider&quot; equal to the fully qualified class name of the implementation class (e.g. &quot;commonj.sdo.impl.HelperProvider=org.apache.tuscany.sdo.help.HelperProviderImpl&quot;).</P>
+
+<P>In your own jar file, create a text file called &quot;META-INF/services/commonj.sdo.impl.HelperProvider&quot;. In this text file, specify the fully qualified custom HelperProvider implementation class (e.g. org.apache.tuscany.sdo.help.HelperProviderImpl).</P>
+
+<P>In the event that both 1 and 2 are specified, the System Property will take precedence over the text file.</P>
+
+<P>The Tuscany default helper provider implementation class is org.apache.tuscany.sdo.helper.HelperProviderImpl (in the sdo.impl project) and is registered using the second technique (services file), as described in the following section.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/impl" class="external-link" rel="nofollow">sdo.impl</A></P>
+
+<P>The sdo.impl subproject contains a test package under src/test/java (see the section below entitled Static Code Generator for details) and the following implementation packages under src/main/java:</P>
+
+<P><B>package org.apache.tuscany.sdo</B></P>
+
+<P>Contains a few interfaces used by some of the implementation classes in org.apache.tuscany.sdo.impl. (Note: this package is subject to further cleanup.)</P>
+
+<P><B>package org.apache.tuscany.sdo.helper</B></P>
+
+<P>This package contains implementations of the &quot;helper&quot; interfaces defined in the commonj.sdo.helper package (in the sdo.spec project). Each helper interface in commonj.sdo.helper has a corresponding implementation class in this package. The name of each helper class is the same as the corresponding interface, only with the suffix &quot;Impl&quot; appended. For example class org.apache.tuscany.sdo.helper.TypeHelperImpl implements the interface commonj.sdo.TypeHelper.</P>
+
+<P>The implementation class org.apache.tuscany.sdo.helper.HelperProviderImpl is used to bootstrap an implementation of the default INSTANCEs of the SDO helper (see class commonj.sdo.impl.HelperProvider in sdo.spec). This implementation creates instances of the other helper implementation classes in this package and is registered using the services file src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider.</P>
+
+<P><B>package org.apache.tuscany.sdo.impl</B></P>
+
+<P>This package contains the majority of the SDO runtime implementation code. This includes implementations of all of the commonj.sdo interfaces (see sdo.spec), including several implementations of the DataObject interface. The design and implementation of the most important classes in this package are described below).</P>
+
+<P><B>package org.apache.tuscany.sdo.util</B></P>
+
+<P>Contains some utility classes used by the implementation. One class, SDOUtil, is particularly important. It provides some useful static utility functions which are not included in the SDO specification itself. Although these are not &quot;standard&quot; APIs, use of them is recommended, as opposed to resorting to low-level implementation-specific APIs. The intent of this class is to encapsulate, in a relatively clean way, common functions that are needed, and can potentially be proposed for addition to the specification in a future version of SDO.</P>
+
+<P><B>sdo.tools</B></P>
+
+<P>This project will contain (command line) tools, such as SDO model importers and generators (Java code, XML schema, etc.). Currently however, there is only a single tool, a Java code generator implemented in class org.apache.tuscany.sdo.generate.XSD2JavaGenerator. This generator can be used to generate static SDO data objects and is described in more detail in below.</P>
+
+<P>The sdo.tools project also contains a test program and sample generated model located in src/test/java and src/test/resources respectively (see the tests section below for more details).</P>
+
+<P><B>Dependent Jars</B></P>
+
+<P>The sdo.impl project requires the following EMF (Eclipse Modeling Framework - www.eclipse.org/emf) runtime jars to build:</P>
+
+<P>emf-common-2.2.1-SNAPSHOT.jar - some common framework utility and base classes<BR>
+emf-ecore-2.2.1-SNAPSHOT.jar - the EMF core runtime implementation classes (the Ecore metamodel)<BR>
+emf-ecore-change-2.2.1-SNAPSHOT.jar - the EMF change recorder and framework<BR>
+emf-ecore-xmi-2.2.1-SNAPSHOT.jar - EMF's default XML (and XMI) serializer and loader<BR>
+xsd-2.2.1-SNAPSHOT.jar - the XML Schema model</P>
+
+<P>The sdo.tools project also requires the EMF code generator framework jars:</P>
+
+<P>emf-codegen-2.2.1-SNAPSHOT.jar - template-based codegen framework (JET - Java Emitter Templates)<BR>
+emf-codegen-ecore-2.2.1-SNAPSHOT.jar - the EMF code generator<BR>
+emf-common-2.2.1-SNAPSHOT.jar - some common framework utility and base classes<BR>
+emf-ecore-2.2.1-SNAPSHOT.jar - the EMF core runtime implementation classes (the Ecore metamodel)<BR>
+emf-ecore-change-2.2.1-SNAPSHOT.jar - the EMF change recorder and framework<BR>
+emf-ecore-xmi-2.2.1-SNAPSHOT.jar - EMF's default XML (and XMI) serializer and loader<BR>
+xsd-2.2.1-SNAPSHOT.jar - the XML Schema model</P>
+
+<P>These are simply Maven-friendly versions of corresponding jar files/plugins obtained from Eclipse. SNAPSHOT maps to an EMF weekly integration build (for example, I200602160000). Note that if you are building SDO for a released source code distribution then the dependency jars will not be snapshot jars, but will instead themselves be released versions of the dependencies.</P>
+
+<P><B>Runtime Implementation</B></P>
+
+<P>The primary SDO runtime implementation classes are located in the package org.apache.tuscany.sdo.impl and consist of the following:</P>
+<UL>
+	<LI>DataObject implementation classes</LI>
+	<LI>Implementation of the SDO metamodel interfaces: Type and Property</LI>
+	<LI>ChangeSummary and DataGraph implementations</LI>
+</UL>
+
+
+<P>The implementation of the SDO runtime is based on and leverages the EMF runtime model (i.e., EObject and the Ecore metamodel - refer to documentation at www.eclipse.org/emf). It subclasses and specializes the Ecore metamodel, and provides its own DataObject-tuned implementation(s) of the EObject interface. The design is described in more detail in the following sections.</P>
+
+<P><B>DataObject implementation classes</B></P>
+
+<P>SDO provides several DataObject implementation classes as shown in the following diagram:</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (do_uml.png) not found.</SPAN></P>
+
+<P>Class DataObjectImpl is the most important. It provides a complete base implementation of the SDO DataObject interface. It extends from the EMF base class BasicEObjectImpl, which provides the &quot;scaffolding&quot; needed to easily implement an EObject, but without allocating any storage itself.</P>
+
+<P>DataObjectImpl provides the DataObject implementation while allocating only the minimum storage overhead needed to be a data object (e.g., container pointer and feature, change recorder). It does not, however, allocate any storage for the actual properties of the data object. It instead requires subclasses for this purpose. For example, statically generated SDOs (see the generator section below) directly or indirectly extend from this class, providing their own storage in generated instance variables.</P>
+
+<P>The subclass, DynamicDataObjectImpl serves as a concrete implementation class for dynamic data objects. It is the default implementation class used when creating dynamic data objects using the DataFactory.create() method, for example. DynamicDataObjectImpl provides efficient data storage using a dynamically allocated settings array.</P>
+
+<P>StoreDataObjectImpl and DynamicStoreDataObjectImpl provide a delegating implementations for DataObjects that implement their own storage management using a store (see EMF's EStore interface) implementation class. StoreDataObjectImpl is used in conjuction with the &quot;-storePattern&quot; generator option (see section 4), while DynamicStoreDataObjectImpl, as its name implies, is used for dynamic store-based instances.</P>
+
+<P><B>Type and Property implementation classes</B></P>
+
+<P>The SDO implementation provides three implementations of the interface Type, one for each of the following three kinds of types: classes, simple data types, and enumerations.</P>
+<UL>
+	<LI>class ClassImpl extends EClassImpl implements Type</LI>
+	<LI>class DataTypeImpl extends EDataTypeImpl implements Type</LI>
+	<LI>class EnumImpl extends EEnumImpl implements Type</LI>
+</UL>
+
+
+<P>For example, class org.apache.tuscany.sdo.impl.ClassImpl extends form the corresponding Ecore class, EClassImpl, and mixes in the SDO interface commonj.sdo.Type. All the Type methods are implemented by calls to super.</P>
+
+<P>With this approach, a data object's Type, returned from DataObjectImpl.getType(), and its EClass, returned by DataObjectImpl.eClass(), are the same underlying meta object. This allows the SDO implementation to leverage any appropriate base functionality without any performance overhead. The arrangement is shown in the following diagram:</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (meta.png) not found.</SPAN></P>
+
+<P>The implementation of the SDO Property interface follows a similar pattern. Two implementation classes, subclasses of corresponding Ecore classes, mix in the Property interface:</P>
+<UL>
+	<LI>class AttributeImpl extends EAttributeImpl implements Property</LI>
+	<LI>class ReferenceImpl extends EReferenceImpl implements Property</LI>
+</UL>
+
+
+<P>As with the Type implementation classes, these classes call methods on super to implement the mixed-in Property methods.</P>
+
+<P>The following diagram illustrates the design:</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (meta2.png) not found.</SPAN></P>
+
+<P>As shown, the getProperties() method in ClassImpl (i.e., of the SDO Type interface) returns a set of properties whose implementation classes also implement EAttribute or EReference, and since ClassImpl, extends EClassImpl (as shown in the previous diagram), these are in fact the same objects as those returned by the EClass.getEAllStructuralFeatures() method. The two metamodels are one and the same, making the implementation of many of the SDO APIs trivial calls to the base class.</P>
+
+<P>ChangeSummary and DataGraph implementation classes</P>
+
+<P>TBD.</P>
+
+<P><B>Static Code Generator</B></P>
+
+<P>The SDO static code generator is a command line tool for generating Java source code (static SDOs) for DataObjects defined in an XML Schema. It is implemented by the class org.apache.tuscany.sdo.generate.XSD2JavaGenerator in the sdo.tools project. The generator is used as follows:</P>
+
+<P><FONT color="gray">Usage arguments:</FONT></P>
+
+<P> <FONT color="gray">[ &#45;targetDirectory &lt;target-root-directory&gt; ]</FONT><BR>
+ <FONT color="gray">[ &#45;javaPackage &lt;base-package-name&gt; ]</FONT><BR>
+ <FONT color="gray">[ &#45;prefix &lt;prefix-string&gt; ]</FONT><BR>
+ <FONT color="gray">[ &#45;sparsePattern &#124; &#45;storePattern ]</FONT><BR>
+ <FONT color="gray">[ &#45;noInterfaces ] [ &#45;noContainment ] [ &#45;noNotification ] [ &#45;arrayAccessors ] [ &#45;noUnsettable ]</FONT> <FONT color="gray"><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=-noEMF&linkCreation=true&fromPageId=48471" class="createlink">&#45;noEMF</A></FONT><BR>
+ <FONT color="gray">&lt;xsd-file&gt; &#124; &lt;wsdl-file&gt;</FONT><BR>
+For example:</P>
+
+<P><FONT color="gray">java XSD2JavaGenerator somedir/somefile.xsd</FONT></P>
+
+<P>Options:</P>
+
+<P>&#45;targetDirectory Generates the Java source code in the specified directory. By default, the code is generated in the same directory as the input xsd or wsdl file.</P>
+
+<P>&#45;javaPackage Overrides the Java package for the generated classes. If not specified, a default package or one specified with an sdoJava:package annotation on the &lt;schema&gt; element in the xsd file (see SDO specification for details) is used for the java package.</P>
+
+<P>&#45;prefix Specifies the prefix string to use for naming the generated factory. For example &quot;-prefix Foo&quot; will result in a factory interface with the name &quot;FooFactory&quot;.</P>
+
+<P>&#45;sparsePattern For SDO metamodels that have classes with many properties of which only a few are typically set at runtime, this option can be used to produce a space-optimized implementation (at the expense of speed).</P>
+
+<P>&#45;storePattern This option can be used to generate static classes that work with a Store-based DataObject implementation. It changes the generator pattern to generate accessors which delegate to the reflective methods (as opposed to the other way around) and changes the DataObject base class to org.apache.tuscany.sdo.impl.StoreDataObjectImpl. Note that this option generates classes that require a Store implementation to be provided before they can be run.</P>
+
+<P>&#45;noInterfaces By default, each DataObject generates both a Java interface and a corresponding implementation class. If an SDO metamodel does not use multiple inheritance (which is always the case for XML Schema derived models), then this option can be used to eliminate the interface and to generate only an implementation class.</P>
+
+<P>&#45;noNotification This option eliminates all change notification overhead in the generated classes. Changes to DataObjects generated using this option cannot be recorded, and consequently the classes cannot be used with an SDO ChangeSummary or DataGraph.</P>
+
+<P>&#45;noContainment Turns off container management for containment properties. DataObject.getContainer() will always return null for data objects generated with this option, even if a containment reference is set. Setting a containment reference will also not automatically remove the target object from its previous container, if it had one, so it will need to be explicitly removed by the client. Use of this option is only recommended for scenarios where this kind of container movement/management is not necessary.</P>
+
+<P>&#45;arrayAccessors Generates Java array getters/setters for multiplicity-many properties. With this option, the set of &quot;standard&quot; JavaBean array accessor methods (e.g., Foo[] getFoo(), Foo getFoo(int), int getFooLength(), setFoo(Foo[]), and void setFoo(int, Foo)) are generated. The normal List-returning accessor is renamed with the suffix &quot;List&quot; (e.g., List getFooList()). The array returned by the generated method is not a copy, but instead a pointer to the underlying storage array, so directly modifying it can have undesirable consequences and should be avoided.</P>
+
+<P>&#45;noUnsettable By default, some XML constructs result in SDO property implementations that maintain additional state information to record when the property has been set to the &quot;default value&quot;, as opposed to being truly unset (see DataObject.isSet() and DataObject.unset()). The SDO specification allows an implementation to choose to provide this behavior or not. With this option, all generated properties will not record their unset state. The generated isSet() methods simply returns whether the current value is equal to the property's &quot;default value&quot;.</P>
+
+<P>&#45;noEMF By default, the generated java implementation source files directly import the Eclipse EMF classes which they depend upon. This can lead to a discrepancy in EMF library level dependencies between the generated classes and the environment into which they are deployed. The &#45;noEmf option provides an early level of function to avoid this situation. Classes generated using this option access EMF function indirectly via inherited behaviour, thereby allowing packaging of these generated classes into jar files which do not directly depend on EMF.</P>
+
+<P>This early implementation of this option is limited in the subset of XML Schema it is known to handle, and is subject to change. The generator is known to be able to deal with Complex content (including content models which map to SDO Sequence), and Mixed content for example .</P>
+
+<P> &lt;xsd:complexType mixed=&quot;true&quot; name=&quot;Sequence&quot;&gt;<BR>
+ &lt;xsd:sequence&gt;<BR>
+ &lt;xsd:choice maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;&gt;<BR>
+ &lt;xsd:element name=&quot;a&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+ &lt;xsd:element name=&quot;b&quot; type=&quot;xsd:int&quot; /&gt;<BR>
+ &lt;/xsd:choice&gt;<BR>
+ &lt;xsd:element name=&quot;split&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+ &lt;xsd:choice maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;&gt;<BR>
+ &lt;xsd:element name=&quot;y&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+ &lt;xsd:element name=&quot;z&quot; type=&quot;xsd:int&quot; /&gt;<BR>
+ &lt;/xsd:choice&gt;<BR>
+ &lt;/xsd:sequence&gt;<BR>
+ &lt;/xsd:complexType&gt;<BR>
+Generator Patterns</P>
+
+<P>The DataObject interface generation pattern is as described in the SDO specification (see Java Interface Specification section). The SDO specification does not define a factory pattern for efficient construction of static SDOs, which is however provided by the Tuscany implementation. The generated SDO Factory interface conforms to the following pattern:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>public interface &lt;prefix&gt;Factory {
+  &lt;Type1&gt; create&lt;Type1&gt;();
+  &lt;Type2&gt; create&lt;Type2&gt;();
+  ...
+  &lt;prefix&gt;Factory INSTANCE = &lt;default_factory_impl&gt;;
+}
+</PRE>
+</DIV></DIV>
+
+<P>A generated factory corresponds to an SDO Type namespace uri (see commonj.sdo.Type.getURI) with one create() method for each SDO Type in the namespace. The &lt;prefix&gt; of the factory name is derived from the uri. An instance of the factory is available using the INSTANCE field in the interface.</P>
+
+<P>Using the static factory, a DataObject might be created as follows:</P>
+
+<P>Quote aQuote = StockFactory.INSTANCE.createQuote();<BR>
+... // do something with aQuote<BR>
+The generated implementation of each create() method simply constructs an instance of the corresponding type like this:</P>
+
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>public Quote createQuote() {
+    QuoteImpl quote = new QuoteImpl();
+    return quote;
+  }
+</PRE>
+</DIV></DIV>
+<P>In addition to these generated type-specific create&lt;Type&gt;() methods, the generated factory implementation class also includes a generated reflective create() method that, given an SDO Type, efficiently dispatches to the correct type-specific create() method. The reflective create() method is called by the implementation of the SDO commonj.sdo.helper.DataFactory interface.</P>
+
+<P><B>Test/Example Programs</B></P>
+
+<P>The SDO project does not include any proper sample programs at this time (any volunteers?) but it does include a number of JUnit test cases, some of which serve as good examples of how to use SDO APIs to perform various tasks.</P>
+
+<P>The following tests are particularly good SDO examples included in the sdo.impl project:</P>
+
+<P>SimpleDynamicTestCase This program uses the SDO XSDHelper.define() method to register a simple XML Schema based model (simple.xsd). It then instantiates a DataObject instance (type Quote), initializes several of its properties, and then serializes the instance to an XML stream.</P>
+
+<P>MixedTypeTestCase This program shows how to uses the Sequence API to create an XML instance which mixes arbitrary text within the DataObject's XML structure. It uses the XML schema complexType (MixedQuote) in mixed.xsd to define the SDO model.</P>
+
+<P>OpenTypeTestCase Uses an XML Schema complexType with a wildcard (xsd:any) to illustrate how to work with and manipulate an SDO open type. The type OpenQuote in open.xsd is used for this example.</P>
+
+<P>SimpleCopyTestCase Uses the SDO CopyHelper to create shallow and deep copies of the simple Quote model from SimpleDynamicTest.</P>
+
+<P>SimpleEqualityTestCase Uses the SDO EqualityHelper to perform deep and shallow equality checks.</P>
+
+<P>ChangeSummaryTestCase Creates a data graph with an instance of type Quote (in simple.xsd) as the root object. It then turns on change logging and makes a number of changes to the graph. Finally, it turns off change logging and serializes the data graph.</P>
+
+<P>XSDHelperTestCase This program shows how the XSDHelper.define() method can be called multiple times with the same schema. The second (and subsequent) call simply returns an empty list since no new types are defined.</P>
+
+<P>The following is in the sdo.tools project:</P>
+
+<P>SimpleStaticTestCase - This test performs the same function as SimpleDynamicTestCase, above, only using a generated version of the simple.xsd model. The generated model has been pre-generated (with default options) in the directory src/test, but it can be regenerated using the XSD2JavaGenerator, possibly with different generator options (e.g., &#45;noInterfaces or &#45;sparsePattern), if desired.</P>
+
+<P>StaticSequenceNoEmfTest This test exercises the &#45;noEMF generator option with a set of complex types, focussing on Sequenced behaviour in the generated classes. The generated model has been pre-generated (with options &#45;noEMF &#45;javaPackage com.example.noemf.sequences) in the directory src/test, but it can be regenerated using the XSD2JavaGenerator, possibly with different generator options (e.g., &#45;noInterfaces or &#45;sparsePattern), if desired.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-c-faq.html b/site/trunk/site-publish/sca-c-faq.html
new file mode 100644
index 0000000000..e55302ccb6
--- /dev/null
+++ b/site/trunk/site-publish/sca-c-faq.html
@@ -0,0 +1,84 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>SCA C++ FAQ : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50983">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-cpp.html" title="SCA CPP">SCA CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SCA C++ FAQ">SCA C++ FAQ</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P><B>This page contains frequently asked questions for SCA native project.</B><BR>
+Please follow use the following template to enhance this page.</P>
+
+<H4><A name="SCAC%2B%2BFAQ-Questiontext"></A>Question text</H4>
+<P>Answer text</P>
+
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-cpp-bindings-rest.html b/site/trunk/site-publish/sca-cpp-bindings-rest.html
new file mode 100644
index 0000000000..216639907c
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp-bindings-rest.html
@@ -0,0 +1,160 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA CPP Bindings REST</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46552">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-work-in-progress.html" title="SCA Native Work-in-progress">SCA Native Work-in-progress</A>&nbsp;&gt;&nbsp;<A href="sca-cpp-users.html" title="SCA CPP Users">SCA CPP Users</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP Bindings REST">SCA CPP Bindings REST</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="SCACPPBindingsREST-RESTResourcePatterns"></A>REST Resource Patterns</H2>
+
+<P>If the service/reference uses an &lt;interface.rest&gt; interface, we map CRUD<BR>
+methods to HTTP verbs to access resource representations as follows:</P>
+
+<P>resource = retrieve()<BR>
+-&gt; GET &lt;binding-uri&gt;<BR>
+&lt;- an XML element representing the REST resource</P>
+
+<P>resource = retrieve(uri, parm-value-1, parm-value-n)<BR>
+-&gt; GET uri/parm-value-1/parm-value-n <BR>
+or if uri ends with a '?'<BR>
+-&gt; GET uri?parm-name-1=parm-value1&amp;parm-name-n=parm-value-n<BR>
+&lt;- an XML element representing the REST resource</P>
+
+<P>uri = create(resource)<BR>
+-&gt; POST &lt;binding-uri&gt; + an XML element representing the resource to create<BR>
+&lt;- Location header containing the uri of the created resource</P>
+
+<P>update(resource)<BR>
+-&gt; PUT &lt;binding-uri&gt; + an XML element representing the updated resource</P>
+
+<P>update(uri, parm-1, parm-n, resource)<BR>
+-&gt; PUT uri/parm-value-1/parm-value-n + an XML element representing the updated resource<BR>
+or if uri ends with a '?'<BR>
+-&gt; PUT uri?parm-name-1=parm-value1&amp;parm-name-n=parm-value-n + an XML element representing the updated resource</P>
+
+<P>delete()<BR>
+-&gt; DELETE &lt;binding-uri&gt;</P>
+
+<P>delete(uri, parm-1, parm-n)<BR>
+-&gt; DELETE uri/parm-value-1/parm-value-n<BR>
+or if uri ends with a '?'<BR>
+-&gt; DELETE uri?parm-name-1=parm-value1&amp;parm-name-n=parm-value-n</P>
+
+<P>In this mode, HTTP return codes are used almost as described in the Atom spec. Also GET returns etags with the retrieved resource representations to help caching by clients.</P>
+
+<H2><A name="SCACPPBindingsREST-RESTRPCPatterns"></A>REST RPC Patterns</H2>
+<P>If the service/reference does not use an &lt;interface.rest&gt; interface, then this is not a real REST pattern, we simply flow method calls over XML / HTTP as follows:</P>
+
+<P>result = method-abc(parm-1, parm-n)</P>
+
+<P>if single input parameter of complex type<BR>
+-&gt; POST &lt;binding-uri&gt;/method-abc + XML element representing the complex parameter or if multiple parameters including parameters of complex types<BR>
+-&gt; POST &lt;binding-uri&gt;/method-abc + Mime multipart/form-data body containing one parameter per part or if multiple parameters all of simple types<BR>
+-&gt; GET<BR>
+&lt;binding-uri&gt;/method-abc?parm-1-name=parm-1-value&amp;parm-n-name=parm-n-value</P>
+
+<P>&lt;- an XML element representing the result</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-cpp-dependencies.html b/site/trunk/site-publish/sca-cpp-dependencies.html
new file mode 100644
index 0000000000..58cc4e36d4
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp-dependencies.html
@@ -0,0 +1,231 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA CPP Dependencies</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45207">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-work-in-progress.html" title="SCA Native Work-in-progress">SCA Native Work-in-progress</A>&nbsp;&gt;&nbsp;<A href="sca-cpp-users.html" title="SCA CPP Users">SCA CPP Users</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP Dependencies">SCA CPP Dependencies</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Package</TH>
+<TH class="confluenceTh">Version</TH>
+<TH class="confluenceTh">Where To Get It</TH>
+<TH class="confluenceTh">Windows Config</TH>
+<TH class="confluenceTh">Linux Config</TH>
+<TH class="confluenceTh">Description</TH>
+</TR>
+<TR>
+<TD class="confluenceTd">ant</TD>
+<TD class="confluenceTd">1.6.1</TD>
+<TD class="confluenceTd">http://ant.apache.org/</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Used by scagen</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">java</TD>
+<TD class="confluenceTd">5</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">JAVA_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Used by scagen</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">axis2c</TD>
+<TD class="confluenceTd">0.96</TD>
+<TD class="confluenceTd">http://ws.apache.org/axis2/c/</TD>
+<TD class="confluenceTd">AXIS2C_HOME</TD>
+<TD class="confluenceTd">AXIS2C_HOME</TD>
+<TD class="confluenceTd">The engine for web service bindings</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">libxml2</TD>
+<TD class="confluenceTd">2.6.26</TD>
+<TD class="confluenceTd">http://xmlsoft.org/?</TD>
+<TD class="confluenceTd">LIBXML2_HOME</TD>
+<TD class="confluenceTd">LIBXML2_LIB<BR>
+LIBXML2_INCLUDE</TD>
+<TD class="confluenceTd">XML parser support for SDO</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">iconv</TD>
+<TD class="confluenceTd">1.9.2</TD>
+<TD class="confluenceTd">http://www.gnu.org/software/libiconv/</TD>
+<TD class="confluenceTd">ICONV_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Required by libxml2 to provide internation text coding conversions</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">zlib</TD>
+<TD class="confluenceTd">1.2.3</TD>
+<TD class="confluenceTd">http://www.zlib.net/</TD>
+<TD class="confluenceTd">ZLIB_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Required by libxml2 to provide compression support</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">apache httpd</TD>
+<TD class="confluenceTd">2.0.55</TD>
+<TD class="confluenceTd">http://httpd.apache.org/</TD>
+<TD class="confluenceTd">HTTPD_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">An http server. The REST extension provides a plubing module for Apache</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">libcurl</TD>
+<TD class="confluenceTd">7.15.4</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">LIBCURL_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">Required by the rest binding. Beware that libcurl.lib sometimes comes named differently depending on version, e.g. I've seen libcurl_impl.lib</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">python</TD>
+<TD class="confluenceTd">2.5</TD>
+<TD class="confluenceTd">http://www.python.org/</TD>
+<TD class="confluenceTd">PYTHON_HOME</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">The Python script interpreter required when using the Python extension</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">ruby</TD>
+<TD class="confluenceTd">1.8.5-p21</TD>
+<TD class="confluenceTd">http://www.ruby-lang.org/en/</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">?</TD>
+<TD class="confluenceTd">The Ruby script interpreter required when using the Ruby extension</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">php</TD>
+<TD class="confluenceTd">5.2.0</TD>
+<TD class="confluenceTd">http://www.php.net/downloads.php</TD>
+<TD class="confluenceTd">PHP_HOME</TD>
+<TD class="confluenceTd">PHP_LIB<BR>
+PHP_INCLUDE</TD>
+<TD class="confluenceTd">The PHP script interpreted required when using the PHP extension</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">sca_sdo</TD>
+<TD class="confluenceTd">1.1.2</TD>
+<TD class="confluenceTd">http://pecl.php.net/package/sca_sdo</TD>
+<TD class="confluenceTd">PHP_SCA_SDO_HOME</TD>
+<TD class="confluenceTd">PHP_SCA_SDO_INCLUDE<BR>
+PHP_SCA_SDO_LIB</TD>
+<TD class="confluenceTd">The PHP SCA_SDO PECL pacakge reqiured when using the PHP extension</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">tuscany cpp sdo</TD>
+<TD class="confluenceTd">latest</TD>
+<TD class="confluenceTd">http://incubator.apache.org/tuscany/sdo_downloads.html</TD>
+<TD class="confluenceTd">TUSCANY_SDOCPP</TD>
+<TD class="confluenceTd">TUSCANY_SDOCPP</TD>
+<TD class="confluenceTd">Service Data Objects support used for passing handling complex types</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-cpp-developers.html b/site/trunk/site-publish/sca-cpp-developers.html
new file mode 100644
index 0000000000..6f964366e7
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp-developers.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA CPP Developers : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45205">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP Developers">SCA CPP Developers</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-cpp-environment-settings.html b/site/trunk/site-publish/sca-cpp-environment-settings.html
new file mode 100644
index 0000000000..ae51688d7a
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp-environment-settings.html
@@ -0,0 +1,143 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA CPP Environment Settings</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45209">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-work-in-progress.html" title="SCA Native Work-in-progress">SCA Native Work-in-progress</A>&nbsp;&gt;&nbsp;<A href="sca-cpp-users.html" title="SCA CPP Users">SCA CPP Users</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP Environment Settings">SCA CPP Environment Settings</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>TODO</P>
+
+<H2><A name="SCACPPEnvironmentSettings-Windows"></A>Windows</H2>
+
+<P>set LIBXML2_HOME=c:\libxml2-2.6.26.win32<BR>
+set ICONV_HOME=c:\iconv-1.9.2.win32<BR>
+set ZLIB_HOME=c:\zlib-1.2.3.win32<BR>
+set HTTPD_HOME=c:\apache2.0.55\Apache2<BR>
+set LIBCURL_HOME=c:\libcurl-7.15.4-nossl<BR>
+set PHP_HOME=c:\php-5.2.0<BR>
+set PHP_SCA_SDO_HOME=c:\pecl\sdo<BR>
+set PYTHON_HOME=c:\python25<BR>
+set PYTHONPATH=c:\sca\deploy\extensions\python\bin<BR>
+set TUSCANY_SCACPP=c:\sca\deploy<BR>
+set TUSCANY_SCACPP_LOGGING=9<BR>
+set TUSCANY_SDOCPP=c:\sdo\deploy<BR>
+set TUSCANY_SDOCPP_LOGGING=0</P>
+
+
+<H2><A name="SCACPPEnvironmentSettings-Linux"></A>Linux</H2>
+
+<P>export AXIS2C_HOME=/usr/local/axis2c-bin-0.96-linux<BR>
+export LIBXML2_LIB=/usr/lib<BR>
+export LIBXML2_INCLUDE=/usr/include/libxml2<BR>
+export PHP_LIB=/usr/local/lib<BR>
+export PHP_INCLUDE=/usr/local/include/php<BR>
+export PHP_SCA_SDO_INCLUDE=/home/slaws/phpbuild-5-2/pecl/SDO<BR>
+export PHP_SCA_SDO_LIB=$PHP_LIB/php/extensions/no-debug-zts-20060613/<BR>
+export TUSCANY_SDOCPP=/sdo/deploy<BR>
+export TUSCANY_SDOCPP_LOGGING=0<BR>
+export TUSCANY_SCACPP=/usr/local/tuscany/cpp/sca/deploy<BR>
+export TUSCANY_SCACPP_LOGGIN=9</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-cpp-users.html b/site/trunk/site-publish/sca-cpp-users.html
new file mode 100644
index 0000000000..00fa699412
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp-users.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA CPP Users</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45204">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-work-in-progress.html" title="SCA Native Work-in-progress">SCA Native Work-in-progress</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP Users">SCA CPP Users</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="SCACPPUsers-Dependencies"></A>Dependencies</H2>
+<P><A href="sca-cpp-dependencies.html" title="SCA CPP Dependencies">Dependency List</A></P>
+<H2><A name="SCACPPUsers-EnvironmentSetting"></A>Environment Setting</H2>
+<P><A href="sca-cpp-environment-settings.html" title="SCA CPP Environment Settings">Environment Setting List</A></P>
+<H2><A name="SCACPPUsers-Bindings"></A>Bindings</H2>
+<P><A href="sca-cpp-bindings-rest.html" title="SCA CPP Bindings REST">REST</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-cpp.html b/site/trunk/site-publish/sca-cpp.html
new file mode 100644
index 0000000000..c0185d421f
--- /dev/null
+++ b/site/trunk/site-publish/sca-cpp.html
@@ -0,0 +1,133 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA CPP : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45202">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA CPP">SCA CPP</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java</A><BR>
+<A href="" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforCpp_V0.95.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">User Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/GettingStarted.html" title="Visit page outside Confluence" rel="nofollow">Getting Started<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="error">&#91;Architecture Guide|&#93;</SPAN><BR>
+<SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/cpp-projects.html" title="Visit page outside Confluence" rel="nofollow">Developer Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="error">&#91;Extension Developer Guide|&#93;</SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-c-faq.html" title="SCA C++ FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/cpp-projects.html" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+
+<H4><A name="SCACPP-TuscanySCANative"></A>Tuscany SCA Native</H4>
+
+<P>Tuscany SCA native is an extesible SCA runtime implementation written in C++ that supports component implementations written in:</P>
+<UL>
+	<LI>C++ (as defined in the <SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforCpp_V0.95.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">Service Component Architecture specification for C++ developers<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>)</LI>
+	<LI>Ruby</LI>
+	<LI>Python</LI>
+	<LI>PHP (under development)</LI>
+</UL>
+
+
+<P><B>Bindings - used for services and references</B><BR>
+Apache SOAP/Axis2c<BR>
+REST</P>
+
+<P><B>Data Bindings - for handling data</B><BR>
+SDO<BR>
+Axiom</P>
+
+
+<P>To try it out, we recommend using the latest SCA Native Milestone release available from our <A href="sca-downloads.html" title="SCA Downloads">downloads page</A>.  </P>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-developer-guide.data/component.png b/site/trunk/site-publish/sca-developer-guide.data/component.png
new file mode 100644
index 0000000000..72b9d1b4d2
--- /dev/null
+++ b/site/trunk/site-publish/sca-developer-guide.data/component.png
diff --git a/site/trunk/site-publish/sca-developer-guide.data/component.png.jpeg b/site/trunk/site-publish/sca-developer-guide.data/component.png.jpeg
new file mode 100644
index 0000000000..6ab7db30aa
--- /dev/null
+++ b/site/trunk/site-publish/sca-developer-guide.data/component.png.jpeg
diff --git a/site/trunk/site-publish/sca-developer-guide.data/component.svg b/site/trunk/site-publish/sca-developer-guide.data/component.svg
new file mode 100644
index 0000000000..4de33edb54
--- /dev/null
+++ b/site/trunk/site-publish/sca-developer-guide.data/component.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300.6687"
+   height="122.19577"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   version="1.0"
+   sodipodi:docbase="/Users/jboynes"
+   sodipodi:docname="component.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.92365554"
+     inkscape:cx="375"
+     inkscape:cy="130.24431"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="1052.3622px"
+     height="744.09448px"
+     showborder="false"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1435"
+     inkscape:window-height="1255"
+     inkscape:window-x="882"
+     inkscape:window-y="149" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-26.546207,-185.20959)">
+    <g
+       id="g9423"
+       transform="matrix(0.2941487,0,0,0.3361663,58.563052,101.23705)">
+      <rect
+         ry="45.714287"
+         rx="45.714287"
+         y="335.21933"
+         x="168.57143"
+         height="245.71428"
+         width="448.57144"
+         id="rect2160"
+         style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="rect7442"
+         d="M 125.38134,380.60067 L 185.63561,380.60067 L 214.61869,408.07647 L 185.63561,435.55228 L 125.38134,435.55228 L 155.12712,408.07647 L 125.38134,380.60067 z "
+         style="fill:#4bad2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#4bad2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 125.38134,474.88638 L 185.63561,474.88638 L 214.61869,502.36218 L 185.63561,529.83799 L 125.38134,529.83799 L 155.12712,502.36218 L 125.38134,474.88638 z "
+         id="path8414"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#c839c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 572.51773,381.1874 L 632.772,381.1874 L 661.75508,408.6632 L 632.772,436.13901 L 572.51773,436.13901 L 602.26351,408.6632 L 572.51773,381.1874 z "
+         id="path8416"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path9387"
+         d="M 572.51773,471.1874 L 632.772,471.1874 L 661.75508,498.6632 L 632.772,526.13901 L 572.51773,526.13901 L 602.26351,498.6632 L 572.51773,471.1874 z "
+         style="fill:#c839c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="320.48761"
+         x="319.15961"
+         height="40.058224"
+         width="41.140877"
+         id="rect9389"
+         style="fill:#800000;fill-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         y="320.48761"
+         x="437.15961"
+         height="40.058224"
+         width="41.140877"
+         id="rect9393"
+         style="fill:#800000;fill-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="149.40634"
+       y="193.81702"
+       id="text9419"><tspan
+         sodipodi:role="line"
+         id="tspan9421"
+         x="149.40634"
+         y="193.81702">Properties</tspan></text>
+    <text
+       id="text9432"
+       y="256.61099"
+       x="25.983707"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       xml:space="preserve"><tspan
+         y="256.61099"
+         x="25.983707"
+         id="tspan9434"
+         sodipodi:role="line">Services</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="260.24225"
+       y="256.77631"
+       id="text9436"><tspan
+         sodipodi:role="line"
+         id="tspan9438"
+         x="260.24225"
+         y="256.77631">References</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="136.15839"
+       y="255.19771"
+       id="text9440"><tspan
+         sodipodi:role="line"
+         id="tspan9442"
+         x="136.15839"
+         y="255.19771">Implementation</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica"
+       x="157.40636"
+       y="307.16513"
+       id="text10413"><tspan
+         sodipodi:role="line"
+         id="tspan10415"
+         x="157.40636"
+         y="307.16513">Intents</tspan></text>
+  </g>
+</svg>
diff --git a/site/trunk/site-publish/sca-developer-guide.html b/site/trunk/site-publish/sca-developer-guide.html
new file mode 100644
index 0000000000..d8dab31142
--- /dev/null
+++ b/site/trunk/site-publish/sca-developer-guide.html
@@ -0,0 +1,161 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Developer Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46583">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="sca-java-documentation.html" title="SCA Java Documentation">SCA Java Documentation</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Developer Guide">SCA Developer Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="events.html" title="Events">Events </A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">ASF <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>There's nothing to it.</B> Really. Seriously, one of the main goals of Tuscany and SCA is to avoid imposing rules and requirements on how people write applications. We want to let people write application code the way they want without being concerned about the environment in which it will be used. After all, writing code to handle plumbing just gets in the way of writing the interesting stuff. So basically, you write the code for interesting bits, and Tuscany provides the environment that lets it run.</P>
+
+<P>As a result of that, this guide does not actually contain a lot of gory details on how to write an application for SCA. What it does contain is a description of the information that Tuscany uses to figure out how to run your code, the things that it can handle, and the things that it can't. As part of that it provides guidelines and best practices that you can use to make your code easier for others to use or that allow it to run in more places. This guide also describes the different environments that Tuscany supports (such as command line clients or web applications) and how to package up applications to run in them.</P>
+
+<H2><A name="SCADeveloperGuide-Components"></A>Components</H2>
+
+<P>The basic building block for SCA is a component. When you're writing code for SCA, you are typically writing code that will either be the implementation of a component or will be used by such an implementation.</P>
+
+<P>An SCA component follows the <SPAN class="nobr"><A href="http://www.google.com/search?q=Inversion%20of%20Control" title="Visit page outside Confluence" rel="nofollow">Inversion of Control<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> design pattern with Tuscany providing the controlling framework. A typical component can be illustrated as:<BR>
+<DIV align="center"><IMG src="sca-developer-guide.data/component.png" border="0"></DIV><BR>
+where</P>
+<UL>
+	<LI>Services describe the function this type of component provides</LI>
+	<LI>References are dependencies this type of component has in order to function</LI>
+	<LI>Properties define configuration parameters for this type of component</LI>
+	<LI>Intents describe assumptions this type of component has on how it will be used</LI>
+	<LI>and Implementation is some code that actually does the work (i.e. what a developer writes)</LI>
+</UL>
+
+
+<P>Although the Tuscany runtime is written in Java, the implementation of a component can be in other languages some of which may be more suitable to the form of implementation than Java code (for example, BPEL for business processes or XSL-T for transformations). How the services, references, properties and intents are defined for an implementation is specific to that particular implementation type; Tuscany provides several including:</P>
+
+<UL>
+	<LI><A href="java-implementation.html" title="Java Implementation">Java</A> for POJO style components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JUnit%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: JUnit Implementation" class="createlink">JUnit<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integration testing of SCA components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Spring%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: Spring Implementation" class="createlink">Spring<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for integrating Spring components</LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=JavaScript%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: JavaScript Implementation" class="createlink">JavaScript<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for components written in JavaScript</LI>
+</UL>
+
+
+<P>Please see each sub-section for detailed information on implementing components in any of these languages.</P>
+
+<H2><A name="SCADeveloperGuide-Composites"></A>Composites</H2>
+<P>Individual components like those above can be used on their own, or they can be grouped together to form composite components. A composite is a type of component whose implementation is not code but an aggregation of other components co-operating to provide Services as a whole. A composite provides Services, has References to other dependencies, and can be configured using Properties in just the same way as individual components can.</P>
+
+<P>The typical implementation of a composite is described using XML defined by the SCA Assembly Specification (known as SCA Component Definition Language or SCDL). For information on how this is used in Tuscany, please see:</P>
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Composite%20Implementation&linkCreation=true&fromPageId=46583" title="Create Page: Composite Implementation" class="createlink">Composite<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+<P>&gt;&gt; Comment: Is this a good place to talk about wires? We talk about wires in the next section for the first time and it is out of context</P>
+
+<H2><A name="SCADeveloperGuide-DomainAssemblies"></A>Domain Assemblies</H2>
+
+<P>The implementations of components above, either individual or composite, all form reusable units that can be run multiple times in different environments (in much the same way as you have multiple instances of a Java class). A component becomes instantiated when it is actually used in an SCA environment. This is done by using it as part of the assembly of an SCA Domain.</P>
+
+<P>SCA Domains can vary in size from the very small to the very large:</P>
+<UL>
+	<LI>a very small domain could be one within a test environment inside an IDE</LI>
+	<LI>a medium sized domain could be a single server or small cluster supporting a single application</LI>
+	<LI>a large domain could describe all the services within a department or company</LI>
+</UL>
+
+
+<P>A domain is self-defining - it is what it is. It is really just a coherent grouping of components that are working together, connected to each other using SCA wiring. In a large domain there may be all sorts of policies about where components can run and how they connect to each other or to external services but during development the goal is to make that <B>Someone Else's Problem</B> as all that baggage really just gets in the way of writing code.</P>
+
+<P>Making it <B>Someone Else's Problem</B> though does mean that at some point you need to hand them the implementations that you have been developing. This generally goes better if the code being handed over has been well tested and packaged up nicely (sometimes with a bow on it). Tuscany provides some build-time tools to help with this:</P>
+<UL>
+	<LI>A <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-itest-plugin" title="Visit page outside Confluence" rel="nofollow">itest Maven plugin<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> to support integration testing</LI>
+	<LI>A <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/plugins/tuscany-war-plugin" title="Visit page outside Confluence" rel="nofollow">war Maven plugin<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> to package a self contained web application</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-downloads-remove-after-upgrade-to-new-format.html b/site/trunk/site-publish/sca-downloads-remove-after-upgrade-to-new-format.html
new file mode 100644
index 0000000000..ab918a0971
--- /dev/null
+++ b/site/trunk/site-publish/sca-downloads-remove-after-upgrade-to-new-format.html
@@ -0,0 +1,491 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Downloads-remove after upgrade to new format : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50770">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Downloads-remove after upgrade to new format">SCA Downloads-remove after upgrade to new format</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+
+<TABLE border="0" width="100%">
+    <TBODY>
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SCA Java 
+        Releases</FONT></B></TD>
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left" width="100%"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M2 (Nov 14th, 2006)</B></FONT></I></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+
+        <TD align="center" width="100%">
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%">
+
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz">tuscany-sca-1.0--incubator-M2-bin.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz">tuscany-sca-1.0--incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA Samples</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz">tuscany-sca-1.0--incubator-M2-samples.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz.asc">PGP</A></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz">tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz">tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip">tuscany-sca-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip">tuscany-sca-1.0-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA Samples</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip">tuscany-sca-1.0--incubator-M2-samples.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip">tuscany-spec-commonj-1.1-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip">tuscany-spec-sca-r0.95-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60" valign="middle"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany M2 SCA Javadocs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip">tuscany-sca-1.0-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip">tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip">tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+                </TR>
+    </TBODY>
+
+            </TABLE>
+        </TD>
+
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt; SCA Java Incubating-M1 
+        (June 7th, 2006)--- This is a single package release containing SDO and DAS 
+        besides SCA. </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz">tuscany-incubating-M1-src.tar.gz</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip">tuscany-incubating-M1.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip">tuscany-incubating-M1-src.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5">MD5</A></TD>
+
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SCA Native Releases</FONT></B></TD>
+    </TR>
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;SCA Native Incubator-M3 
+        (May, 2007) </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux and <BR> Mac OS X
+                        <BR>Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Source Release for linux and Mac Os X</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz">tuscany_sca_native-1.0-incubator-M3-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Binary Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip">tuscany_sca_native-1.0-incubator-M3-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Source Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip">tuscany_sca_native-1.0-incubator-M3-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+
+            </TABLE>
+        </TD>
+    </TR>
+
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M2 (Nov 3rd, 
+        2006) </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz">tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz">tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip">tuscany_sca_cpp-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip">tuscany_sca_cpp-1.0-incubator-M2-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+
+            </TABLE>
+        </TD>
+    </TR>
+    </TBODY>
+</TABLE>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-downloads.html b/site/trunk/site-publish/sca-downloads.html
new file mode 100644
index 0000000000..6ac2a1c1df
--- /dev/null
+++ b/site/trunk/site-publish/sca-downloads.html
@@ -0,0 +1,489 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Downloads : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50770">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Downloads">SCA Downloads</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+
+<TABLE border="0" width="100%">
+    <TBODY>
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SCA Java 
+        Releases</FONT></B></TD>
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left" width="100%"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M2 (Nov 14th, 2006)</B></FONT></I></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+
+        <TD align="center" width="100%">
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%">
+
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz">tuscany-sca-1.0--incubator-M2-bin.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz">tuscany-sca-1.0--incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA Samples</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz">tuscany-sca-1.0--incubator-M2-samples.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz.asc">PGP</A></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz">tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz">tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip">tuscany-sca-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip">tuscany-sca-1.0-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M2 SCA Samples</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip">tuscany-sca-1.0--incubator-M2-samples.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip">tuscany-spec-commonj-1.1-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip">tuscany-spec-sca-r0.95-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60" valign="middle"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany M2 SCA Javadocs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip">tuscany-sca-1.0-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+                    <TD align="center" width="287">Tuscany Commonj Specs</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip">tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">JavaDocs
+                        <BR>
+                        Archive</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Specs.r.0.95</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip">tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip</A></TD>
+                    <TD align="center" width="66">
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip.asc">PGP</A></TD>
+
+                </TR>
+    </TBODY>
+
+            </TABLE>
+        </TD>
+
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt; SCA Java Incubating-M1 
+        (June 7th, 2006)--- This is a single package release containing SDO and DAS 
+        besides SCA. </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz">tuscany-incubating-M1-src.tar.gz</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip">tuscany-incubating-M1.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany M1 SCA</TD>
+                    <TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip">tuscany-incubating-M1-src.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5">MD5</A></TD>
+
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SCA Native Releases</FONT></B></TD>
+    </TR>
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;SCA Native Incubator-M3 
+        (May, 2007) </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux and <BR> Mac OS X
+                        <BR>Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Source Release for linux and Mac Os X</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz">tuscany_sca_native-1.0-incubator-M3-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Binary Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip">tuscany_sca_native-1.0-incubator-M3-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA Native M3 
+                        Source Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip">tuscany_sca_native-1.0-incubator-M3-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+
+            </TABLE>
+        </TD>
+    </TR>
+
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M2 (Nov 3rd, 
+        2006) </B></FONT></I><BR>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz">tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz">tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip">tuscany_sca_cpp-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SCA C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip">tuscany_sca_cpp-1.0-incubator-M2-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+
+            </TABLE>
+        </TD>
+    </TR>
+    </TBODY>
+</TABLE>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-general-menu.html b/site/trunk/site-publish/sca-general-menu.html
new file mode 100644
index 0000000000..0212d86936
--- /dev/null
+++ b/site/trunk/site-publish/sca-general-menu.html
@@ -0,0 +1,119 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA General Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54960">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="SCA General Menu">SCA General Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-get-involved.html b/site/trunk/site-publish/sca-get-involved.html
new file mode 100644
index 0000000000..24b568035c
--- /dev/null
+++ b/site/trunk/site-publish/sca-get-involved.html
@@ -0,0 +1,109 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Get Involved : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55918">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Subproject</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Get Involved">SCA Get Involved</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SCAGetInvolved-GettingInvolved"></A>Getting Involved</H3>
+
+<P>A successful project requires many people to play many roles, for example write code, documentation, test, provide suggestions or feedback. If you would like to become involved, join the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</P>
+
+<P><B>Here are some suggestions for getting started and welcome to the project.</B></P>
+
+<P>Read the overview pages for each <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subproject</A> and decide where you'd like to get involved.</P>
+
+<UL>
+	<LI>Contribute new ideas for improving Tuscany <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>.</LI>
+	<LI>Answer questions posted to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</LI>
+	<LI>Contribute to the FAQ under each subproject or to the wiki website.</LI>
+	<LI>Contribute to the user or developer documentation for each subproject on the wiki.</LI>
+	<LI>Investigate <A href="issue-tracking.html" title="Issue Tracking">bugs</A> that have been reported and provide patches.</LI>
+	<LI>Help with development for the next release of Apache Tuscany subprojects.</LI>
+</UL>
+
+
+<P>If in doubt about where to start, send a note to the mailing list and mention your area of interest. </P>
+
+<P>Please note that a single mailing list is used for all the subprojects.</P>
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <SPAN class="nobr"><A href="http://www.apache.org/foundation/how-it-works.html" title="Visit page outside Confluence" rel="nofollow">this link<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-090-incubating.html b/site/trunk/site-publish/sca-java-090-incubating.html
new file mode 100644
index 0000000000..1f3edcd177
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-090-incubating.html
@@ -0,0 +1,167 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 0.90-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56016">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 0.90-incubating">SCA Java 0.90-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava0.90-incubating-SCAJava0.90incubating"></A>SCA Java 0.90-incubating</H3>
+
+<P>SCA Java 0.90-incubating was released in June 2007.</P>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release is now very old, the latest release can be found <A href="http://incubator.apache.org/tuscany/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<P>This release represents a significant milestone on the road to Apache Tuscany SCA 1.0 release. It is based on the final 1.0 versions of the SCA specifications and it includes a substantial redesign of parts of the runtime which has significantly improved usability compared with previous releases, as well as stable SPIs for extension development.</P>
+
+<P>For full detail about the release see the <A href="https://svn.apache.org/repos/asf/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="https://svn.apache.org/repos/asf/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava0.90-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.90-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.90-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava0.90-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.90-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.90-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.90-incubating/apache-tuscany-sca-0.90-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-091-incubating-release-summary.html b/site/trunk/site-publish/sca-java-091-incubating-release-summary.html
new file mode 100644
index 0000000000..636fe08e69
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-091-incubating-release-summary.html
@@ -0,0 +1,132 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 0.91-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62785">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="sca-java-091-incubating.html" title="SCA Java 0.91-incubating">SCA Java 0.91-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 0.91-incubating Release Summary">SCA Java 0.91-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava0.91-incubatingReleaseSummary-SCAJava0.91incubating%28ReleasedinJuly2007%29"></A>SCA Java 0.91-incubating (Released in July 2007)</H3>
+
+<TD class="confluenceTd" valign="top" width="70%">
+<P>This release represents some interesting additions to the previous release in terms of extensions, samples and demos.&nbsp; Here is a summary of the additions:</P>
+<UL>
+	<LI>Implementation Extenstions: Spring and WebResource</LI>
+	<LI>Binding Extensions: AJAX, EJB, RSS/ATOM Feeds</LI>
+	<LI>Demos that demonstrate the use of a mix of extensions: altert-aggregator, bigbank-account, bigbank-calculator and bigbank-stockquote</LI>
+	<LI>New Samples: Spring, Resource, AJAX</LI>
+</UL>
+
+
+<P>For full detail about the release see the <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.91-rc3-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.91-rc3-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD>
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/download/attachments/55774/onlineStore.pdf?version=1" class="external-link" rel="nofollow">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-091-incubating.html b/site/trunk/site-publish/sca-java-091-incubating.html
new file mode 100644
index 0000000000..0b21bb82e4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-091-incubating.html
@@ -0,0 +1,180 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 0.91-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62165">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 0.91-incubating">SCA Java 0.91-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava0.91-incubating-SCAJava0.91incubating%28ReleasedinJuly2007%29"></A>SCA Java 0.91-incubating (Released in July 2007)</H3>
+
+<TD class="confluenceTd" valign="top" width="70%">
+<P>This release represents some interesting additions to the previous release in terms of extensions, samples and demos.&nbsp; Here is a summary of the additions:</P>
+<UL>
+	<LI>Implementation Extenstions: Spring and WebResource</LI>
+	<LI>Binding Extensions: AJAX, EJB, RSS/ATOM Feeds</LI>
+	<LI>Demos that demonstrate the use of a mix of extensions: altert-aggregator, bigbank-account, bigbank-calculator and bigbank-stockquote</LI>
+	<LI>New Samples: Spring, Resource, AJAX</LI>
+</UL>
+
+
+<P>For full detail about the release see the <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.91-rc3-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.91-rc3-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD>
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/download/attachments/55774/onlineStore.pdf?version=1" class="external-link" rel="nofollow">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release is now very old, the latest release can be found <A href="http://incubator.apache.org/tuscany/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJava0.91-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.91-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.91-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava0.91-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.91-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.91-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.91-incubating/apache-tuscany-sca-0.91-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_099_06.pdf b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_099_06.pdf
new file mode 100644
index 0000000000..afab69100b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_099_06.pdf
diff --git a/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest-099_07pdf.pdf b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest-099_07pdf.pdf
new file mode 100644
index 0000000000..3a628e1d6e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest-099_07pdf.pdf
diff --git a/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest_099_07.pdf b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest_099_07.pdf
new file mode 100644
index 0000000000..3a628e1d6e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-099-incubating-release-summary.data/getting_started_Rest_099_07.pdf
diff --git a/site/trunk/site-publish/sca-java-099-incubating-release-summary.html b/site/trunk/site-publish/sca-java-099-incubating-release-summary.html
new file mode 100644
index 0000000000..a9ff192145
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-099-incubating-release-summary.html
@@ -0,0 +1,123 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 0.99-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65077">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="sca-java-099-incubating.html" title="SCA Java 0.99-incubating">SCA Java 0.99-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 0.99-incubating Release Summary">SCA Java 0.99-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava0.99-incubatingReleaseSummary-SCAJava0.99incubating%28ReleasedinAugust2007%29"></A>SCA Java 0.99-incubating (Released in August 2007)</H3>
+<TD class="confluenceTd" valign="top" width="70%">
+<P>This release of Apache Tuscany SCA builds on the stability and modularity established with the previous releases and includes more complete implementation of SCA specifications, support for distributed SCA domains, SCA policy, OSGi implementation types, and pub/sub support with notification components. Start up time and memory footprint of the runtime has been reduced and there have been numerous bug fixes. This is expected to be the last point release before the 1.0 final release.</P>
+
+<P>For full detail about the release see the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.99-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.99-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD><TD class="confluenceTd" valign="top" width="30%"><P></P>
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="sca-java-099-incubating-release-summary.data/getting_started_Rest_099_07.pdf">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top"></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-099-incubating.html b/site/trunk/site-publish/sca-java-099-incubating.html
new file mode 100644
index 0000000000..f25d6c3d0a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-099-incubating.html
@@ -0,0 +1,171 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 0.99-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65075">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 0.99-incubating">SCA Java 0.99-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava0.99-incubating-SCAJava0.99incubating%28ReleasedinAugust2007%29"></A>SCA Java 0.99-incubating (Released in August 2007)</H3>
+<TD class="confluenceTd" valign="top" width="70%">
+<P>This release of Apache Tuscany SCA builds on the stability and modularity established with the previous releases and includes more complete implementation of SCA specifications, support for distributed SCA domains, SCA policy, OSGi implementation types, and pub/sub support with notification components. Start up time and memory footprint of the runtime has been reduced and there have been numerous bug fixes. This is expected to be the last point release before the 1.0 final release.</P>
+
+<P>For full detail about the release see the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.99-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.99-incubating/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD><TD class="confluenceTd" valign="top" width="30%"><P></P>
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="sca-java-099-incubating-release-summary.data/getting_started_Rest_099_07.pdf">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top"></TD></TR></TBODY></TABLE>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release has been superseded, the latest release can be found <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJava0.99-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.99-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-0.99-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava0.99-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.99-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-0.99-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/0.99-incubating/apache-tuscany-sca-0.99-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf b/site/trunk/site-publish/sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf
new file mode 100644
index 0000000000..950e4b12cd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf
diff --git a/site/trunk/site-publish/sca-java-10-incubating-release-summary.html b/site/trunk/site-publish/sca-java-10-incubating-release-summary.html
new file mode 100644
index 0000000000..a6c6f637d4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-10-incubating-release-summary.html
@@ -0,0 +1,125 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.0-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66650">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating">SCA JAVA 1.0-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.0-incubating Release Summary">SCA Java 1.0-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava1.0-incubatingReleaseSummary-SCAJava1.0incubating%28ReleasedinSeptember2007%29"></A>SCA Java 1.0-incubating (Released in September 2007)</H3>
+
+<TD class="confluenceTd" valign="top" width="70%">
+<P>The Apache Tuscany SCA 1.0 release represents a significant milestone being the first 1.0 implementation of the core SCA specifications. It includes SCA assembly and policy along with support for many binding and component type implementations and a lightweight modular runtime with several host deployment options.</P>
+
+<P>For full detail about the release please see the <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.0/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A><BR>
+ and <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.0/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD><TD class="confluenceTd" valign="top" width="30%"><P></P>
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top"></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-10-incubating.html b/site/trunk/site-publish/sca-java-10-incubating.html
new file mode 100644
index 0000000000..62f3642caf
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-10-incubating.html
@@ -0,0 +1,173 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA JAVA 1.0-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66647">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA JAVA 1.0-incubating">SCA JAVA 1.0-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJAVA1.0-incubating-SCAJava1.0incubating%28ReleasedinSeptember2007%29"></A>SCA Java 1.0-incubating (Released in September 2007)</H3>
+
+<TD class="confluenceTd" valign="top" width="70%">
+<P>The Apache Tuscany SCA 1.0 release represents a significant milestone being the first 1.0 implementation of the core SCA specifications. It includes SCA assembly and policy along with support for many binding and component type implementations and a lightweight modular runtime with several host deployment options.</P>
+
+<P>For full detail about the release please see the <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.0/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A><BR>
+ and <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.0/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TD><TD class="confluenceTd" valign="top" width="30%"><P></P>
+<DIV class="panel" style="background-color: #ffff00;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;background-color: #BEBFD6;"><B>Create Online Store in 10 minutes <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00;">
+<UL>
+	<LI><A href="sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf">Online Store SCA Composite </A></LI>
+</UL>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top"></TD></TR></TBODY></TABLE>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release been superseded, the latest release can be found <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJAVA1.0-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.0-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.0-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJAVA1.0-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.0-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.0-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-101-incubating-release-summary.html b/site/trunk/site-publish/sca-java-101-incubating-release-summary.html
new file mode 100644
index 0000000000..75d5acc11e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-101-incubating-release-summary.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.0.1-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71227">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="sca-java-101-incubating.html" title="SCA Java 1.0.1-incubating">SCA Java 1.0.1-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.0.1-incubating Release Summary">SCA Java 1.0.1-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava1.0.1-incubatingReleaseSummary-SCAJava1.0.1incubating%28ReleasedinNovember2007%29"></A>SCA Java 1.0.1-incubating (Released in November 2007)</H3>
+<TD class="confluenceTd" valign="top" width="70%"></TD>
+<P>The Apache Tuscany SCA 1.0.1 release is a bug-fix release for <A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating">Tuscany SCA Java 1.0</A>.</P>
+
+<P>For full detail about the release please see the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0.1/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0.1/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-101-incubating-release.html b/site/trunk/site-publish/sca-java-101-incubating-release.html
new file mode 100644
index 0000000000..4c838e2c8a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-101-incubating-release.html
@@ -0,0 +1,132 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java 1.0.1-incubating Release : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=71225">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.0.1-incubating Release">SCA Java 1.0.1-incubating Release</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava1.0.1-incubatingRelease-SCAJava1.0incubating%28ReleasedinSeptember2007%29"></A>SCA Java 1.0-incubating (Released in September 2007)</H3>
+
+<TD class="confluenceTd" valign="top" width="70%">
+<P>The Apache Tuscany SCA 1.0 release represents a significant milestone being the first 1.0 implementation of the core SCA specifications. It includes SCA assembly and policy along with support for many binding and component type implementations and a lightweight modular runtime with several host deployment options.</P>
+
+<P>For full detail about the release please see the <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">RELEASE_NOTES<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0/distribution/src/main/release/CHANGES" title="Visit page outside Confluence" rel="nofollow">CHANGES<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> files.</P></TD><TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel"><DIV class="panelHeader" style="background-color: #BEBFD6; "><B>Create Online Store in 10 minutes <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></B></DIV><DIV class="panelContent" style="background-color: #ffff00; ">
+<UL>
+	<LI><SPAN class="nobr"><A href="sca-java-10-incubating-release-summary.data/getting-started-1.0.pdf" title="getting-started-1.0.pdf attached to SCA Java 1.0-incubating Release Summary">Online Store SCA Composite <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top"></TD></TR></TBODY></TABLE>
+
+<H3><A name="SCAJava1.0.1-incubatingRelease-Windows"></A>Windows</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-1.0-incubating.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.zip.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-1.0-incubating-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.zip.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="SCAJava1.0.1-incubatingRelease-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-1.0-incubating.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-1.0-incubating-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sca/1.0-incubating/apache-tuscany-sca-1.0-incubating-src.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-101-incubating.html b/site/trunk/site-publish/sca-java-101-incubating.html
new file mode 100644
index 0000000000..b2a96e08a3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-101-incubating.html
@@ -0,0 +1,166 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.0.1-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71225">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.0.1-incubating">SCA Java 1.0.1-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+
+<H3><A name="SCAJava1.0.1-incubating-SCAJava1.0.1incubating%28ReleasedinNovember2007%29"></A>SCA Java 1.0.1-incubating (Released in November 2007)</H3>
+<TD class="confluenceTd" valign="top" width="70%"></TD>
+<P>The Apache Tuscany SCA 1.0.1 release is a bug-fix release for <A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating">Tuscany SCA Java 1.0</A>.</P>
+
+<P>For full detail about the release please see the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0.1/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/1.0.1/distribution/src/main/release/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P></TR></TBODY></TABLE>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release been superseded, the latest release can be found <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJava1.0.1-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.0.1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.0.1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.0.1-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.0.1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.0.1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0.1-incubating/apache-tuscany-sca-1.0.1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-11-incubating.html b/site/trunk/site-publish/sca-java-11-incubating.html
new file mode 100644
index 0000000000..26a670adb4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-11-incubating.html
@@ -0,0 +1,212 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.1-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75554">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.1-incubating">SCA Java 1.1-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.1-incubating-SCAJava1.1incubating%28January2008%29"></A>SCA Java 1.1-incubating (January 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.1-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.1-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.1-incubating/apache-tuscany-sca-1.1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.1-incubating-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. You <B>must</B> verify the integrity of the downloaded files using signatures downloaded from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.1-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.1-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/incubator/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;script type="text/javascript"&gt;<br/>
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");<br/>
+document.write(unescape("%3Cscript src='" + gaJsHost + "google- analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));<br/>
+&lt;/script&gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+var pageTracker = _gat._getTracker("UA- 1174707- 5");<br/>
+pageTracker._initData();<br/>
+pageTracker._trackPageview();<br/>
+&lt;/script&gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-12-incubating.html b/site/trunk/site-publish/sca-java-12-incubating.html
new file mode 100644
index 0000000000..bc3296c256
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-12-incubating.html
@@ -0,0 +1,227 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.2-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84318">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.2-incubating">SCA Java 1.2-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.2-incubating-SCAJava1.2incubating%28April2008%29"></A>SCA Java 1.2-incubating (April 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://archive.apache.org/dist/incubator/tuscany/java/1.2-incubating/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://archive.apache.org/dist/incubator/tuscany/java/1.2-incubating/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.2-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Eclipse Tools </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating-updatesite.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.2-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Eclipse Tools </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2-incubating-updatesite.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/apache-tuscany-sca-1.2-incubating-updatesite.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.2-incubating-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.2-incubating-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. You <B>must</B> verify the integrity of the downloaded files using signatures downloaded from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.2-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.2-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/incubator/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.2-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.2-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.2-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-121-incubating.html b/site/trunk/site-publish/sca-java-121-incubating.html
new file mode 100644
index 0000000000..f3ae98e746
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-121-incubating.html
@@ -0,0 +1,227 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.2.1-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=87757">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.2.1-incubating">SCA Java 1.2.1-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.2.1-incubating-SCAJava1.2.1incubating%28June2008%29"></A>SCA Java 1.2.1-incubating (June 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.2.1-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Eclipse Tools </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating-updatesite.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.2.1-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Eclipse Tools </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.2.1-incubating-updatesite.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/apache-tuscany-sca-1.2.1-incubating-updatesite.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.2.1-incubating-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2.1-incubating/updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.2.1-incubating-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. You <B>must</B> verify the integrity of the downloaded files using signatures downloaded from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.2.1-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.2.1-incubating.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/incubator/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/incubator/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.2.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.2.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.2.1-incubating.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-13.html b/site/trunk/site-publish/sca-java-13.html
new file mode 100644
index 0000000000..96c2075fdd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-13.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=92077">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.3">SCA Java 1.3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.3-SCAJava1.3%28August2008%29"></A>SCA Java 1.3 (August 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.3-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/apache-tuscany-sca-1.3-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3/tuscany-sca-1.3-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.3-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.3.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.3.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-131.html b/site/trunk/site-publish/sca-java-131.html
new file mode 100644
index 0000000000..fe91dbae42
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-131.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.3.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=96046">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.3.1">SCA Java 1.3.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.3.1-SCAJava1.3.1%28August2008%29"></A>SCA Java 1.3.1 (August 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.3.1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3.1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/apache-tuscany-sca-1.3.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3.1-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://archive.apache.org/dist/tuscany/java/sca/1.3.1/tuscany-sca-1.3.1-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.3.1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.3.1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.3.1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.3.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.3.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.3.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-132.html b/site/trunk/site-publish/sca-java-132.html
new file mode 100644
index 0000000000..5f569e9afd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-132.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.3.2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=98979">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.3.2">SCA Java 1.3.2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.3.2-SCAJava1.3.2%28October2008%29"></A>SCA Java 1.3.2 (October 2008)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.3.2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.2.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3.2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.2.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.3.2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/apache-tuscany-sca-1.3.2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.3.2-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://www.apache.org/dist/tuscany/java/sca/1.3.2/tuscany-sca-1.3.2-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.3.2-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.3.2.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.3.2.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.3.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.3.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.3.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-14.html b/site/trunk/site-publish/sca-java-14.html
new file mode 100644
index 0000000000..0543dd8b07
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-14.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.4</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=107344">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.4">SCA Java 1.4</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.4-SCAJava1.4%28January2009%29"></A>SCA Java 1.4 (January 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.4-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.4.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.4-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.4-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.4.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.4-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/apache-tuscany-sca-1.4-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.4-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://www.apache.org/dist/tuscany/java/sca/1.4/tuscany-sca-1.4-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.4-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.4.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.4.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-15.html b/site/trunk/site-publish/sca-java-15.html
new file mode 100644
index 0000000000..97d787bf0c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-15.html
@@ -0,0 +1,213 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.5</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=119000">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.5">SCA Java 1.5</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.5-SCAJava1.5%28May%2C2009%29"></A>SCA Java 1.5 (May, 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.5-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.5-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.5-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.5-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5/apache-tuscany-sca-1.5-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.5-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.5.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.5.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-151.html b/site/trunk/site-publish/sca-java-151.html
new file mode 100644
index 0000000000..9ab78bf36c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-151.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.5.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=4587785">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.5.1">SCA Java 1.5.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.5.1-SCAJava1.5.1%28October%2C2009%29"></A>SCA Java 1.5.1 (October, 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.5.1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.5.1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.5.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/apache-tuscany-sca-1.5.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.5.1-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.5.1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.5.1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.5.1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-16.html b/site/trunk/site-publish/sca-java-16.html
new file mode 100644
index 0000000000..b5bc0e52f8
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-16.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.6</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13271702">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.6">SCA Java 1.6</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.6-SCAJava1.6%28February%2C2010%29"></A>SCA Java 1.6 (February, 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.6-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/apache-tuscany-sca-1.6-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6-TuscanyEclipseToolsUpdatesite"></A>Tuscany Eclipse Tools Updatesite</H3>
+
+<P>Use the following <A href="http://www.apache.org/dist/tuscany/java/sca/1.6/tuscany-sca-1.6-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Updatesite</A> to install the Tuscany plugins in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.6-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.6.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.6.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.6.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.6.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.6.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-161.html b/site/trunk/site-publish/sca-java-161.html
new file mode 100644
index 0000000000..1aa0e6dcf8
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-161.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.6.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24187437">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.6.1">SCA Java 1.6.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.6.1-SCAJava1.6.1%28November2010%29"></A>SCA Java 1.6.1 (November 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.6.1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6.1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/apache-tuscany-sca-1.6.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6.1-TuscanyEclipseToolsUpdateSite"></A>Tuscany Eclipse Tools Update Site</H3>
+
+<P>Use the following <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.1/tuscany-sca-1.6.1-updatesite/" class="external-link" rel="nofollow">Eclipse Tools Update Site</A> to install the Tuscany feature and plugin in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.6.1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.6.1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.6.1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.6.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.6.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.6.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-162.html b/site/trunk/site-publish/sca-java-162.html
new file mode 100644
index 0000000000..eb5289f0f1
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-162.html
@@ -0,0 +1,217 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.6.2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26118209">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.6.2">SCA Java 1.6.2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava1.6.2-SCAJava1.6.2%28April2011%29"></A>SCA Java 1.6.2 (April 2011)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.6.2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6.2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.6.2-TuscanyEclipseToolsUpdateSite"></A>Tuscany Eclipse Tools Update Site</H3>
+
+<P>Use the following <A href="http://tuscany.apache.org/updatesite/1.6.2/" class="external-link" rel="nofollow">Eclipse Tools Update Site</A> to install the Tuscany feature and plugin in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.6.2-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.6.2.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.6.2.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-1x-releases.html b/site/trunk/site-publish/sca-java-1x-releases.html
new file mode 100644
index 0000000000..6995993f7c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-1x-releases.html
@@ -0,0 +1,320 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 1.x Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2328968">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 1.x Releases">SCA Java 1.x Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJava1.xReleases-LatestRelease"></A>Latest Release</H2>
+
+<H3><A name="SCAJava1.xReleases-SCAJava1.6.2%28April2011%29"></A>SCA Java 1.6.2 (April 2011)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava1.xReleases-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.xReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-1.6.2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/1.6.2/apache-tuscany-sca-1.6.2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava1.xReleases-TuscanyEclipseToolsUpdateSite"></A>Tuscany Eclipse Tools Update Site</H3>
+
+<P>Use the following <A href="http://tuscany.apache.org/updatesite/1.6.2/" class="external-link" rel="nofollow">Eclipse Tools Update Site</A> to install the Tuscany feature and plugin in your Eclipse IDE.</P>
+
+<H3><A name="SCAJava1.xReleases-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-1.6.2.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-1.6.2.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-1.6.2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+
+<H2><A name="SCAJava1.xReleases-PreviousReleases"></A>Previous Releases</H2>
+
+<P>Below is a complete list of all Apache Tuscany SCA Java downloads. </P>
+
+<P><B>It is strongly recommended that you download the latest release instead of any of the previous releases since it is closer to the latest code in the trunk.</B></P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-161.html" title="SCA Java 1.6.1"><B>SCA Java 1.6.1</B> <EM>(November 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-16.html" title="SCA Java 1.6"><B>SCA Java 1.6</B> <EM>(February, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-151.html" title="SCA Java 1.5.1"><B>SCA Java 1.5.1</B> <EM>(October, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-15.html" title="SCA Java 1.5"><B>SCA Java 1.5</B> <EM>(May, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-14.html" title="SCA Java 1.4"><B>SCA Java 1.4</B> <EM>(January, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-132.html" title="SCA Java 1.3.2"><B>SCA Java 1.3.2</B> <EM>(October, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-131.html" title="SCA Java 1.3.1"><B>SCA Java 1.3.1</B> <EM>(August, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-13.html" title="SCA Java 1.3"><B>SCA Java 1.3</B> <EM>(August, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-121-incubating.html" title="SCA Java 1.2.1-incubating"><B>SCA Java 1.2.1-incubating</B> <EM>(June, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-12-incubating.html" title="SCA Java 1.2-incubating"><B>SCA Java 1.2-incubating</B> <EM>(April, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-11-incubating.html" title="SCA Java 1.1-incubating"><B>SCA Java 1.1-incubating</B> <EM>(January, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-101-incubating.html" title="SCA Java 1.0.1-incubating"><B>SCA Java 1.0.1-incubating</B> <EM>(November, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating"><B>SCA Java 1.0-incubating</B> <EM>(September, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-099-incubating.html" title="SCA Java 0.99-incubating"><B>SCA Java 0.99-incubating</B> <EM>(August, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-091-incubating.html" title="SCA Java 0.91-incubating"><B>SCA Java 0.91-incubating</B> <EM>(July, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-090-incubating.html" title="SCA Java 0.90-incubating"><B>SCA Java 0.90-incubating</B> <EM>(June, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-incubator-m2.html" title="SCA Java Incubator-M2"><B>SCA Java Incubator-M2</B> <EM>(November, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-incubating-m1.html" title="SCA Java Incubating-M1"><B>SCA Java Incubating-M1</B> <EM>(June, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-beta1.html b/site/trunk/site-publish/sca-java-20-beta1.html
new file mode 100644
index 0000000000..4247693b93
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-beta1.html
@@ -0,0 +1,215 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-Beta1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24187427">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-Beta1">SCA Java 2.0-Beta1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-Beta1-SCAJava2.0Beta1%28November%2C2010%29"></A>SCA Java 2.0-Beta1 (November, 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-Beta1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta1/apache-tuscany-sca-all-2.0-Beta1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-Beta1-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-Beta1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-Beta1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-Beta1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-Beta1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-Beta1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-beta2.html b/site/trunk/site-publish/sca-java-20-beta2.html
new file mode 100644
index 0000000000..e8d6ff9161
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-beta2.html
@@ -0,0 +1,215 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-Beta2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=25202643">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-Beta2">SCA Java 2.0-Beta2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-Beta2-SCAJava2.0Beta2%28February%2C2011%29"></A>SCA Java 2.0-Beta2 (February, 2011)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-Beta2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta2.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta2.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta2/apache-tuscany-sca-all-2.0-Beta2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta2-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-Beta2-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-Beta2.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-Beta2.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-Beta2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-Beta2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-Beta2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-beta3.html b/site/trunk/site-publish/sca-java-20-beta3.html
new file mode 100644
index 0000000000..588eb5b925
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-beta3.html
@@ -0,0 +1,225 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-Beta3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27823676">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-Beta3">SCA Java 2.0-Beta3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-Beta3-SCAJava2.0Beta3%28July%2C2011%29"></A>SCA Java 2.0-Beta3 (July, 2011)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-Beta3-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta3.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta3-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.zip" class="external-link" rel="nofollow">tuscany-samples-2.0-Beta3.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta3-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta3.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-Beta3-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/apache-tuscany-sca-all-2.0-Beta3-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.tar.gz" class="external-link" rel="nofollow">tuscany-samples-2.0-Beta3.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-Beta3/tuscany-samples-2.0-Beta3.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Beta3-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-Beta3-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-Beta3.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-Beta3.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-Beta3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-Beta3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-Beta3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m1.html b/site/trunk/site-publish/sca-java-20-m1.html
new file mode 100644
index 0000000000..b3aeca5d85
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m1.html
@@ -0,0 +1,213 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=110484">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M1">SCA Java 2.0-M1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M1-SCAJava2.0M1%28February2009%29"></A>SCA Java 2.0-M1 (February 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M1/apache-tuscany-sca-all-2.0-M1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-M1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-M1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m2.html b/site/trunk/site-publish/sca-java-20-m2.html
new file mode 100644
index 0000000000..10a5eb96eb
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m2.html
@@ -0,0 +1,213 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114913">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M2">SCA Java 2.0-M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M2-SCAJava2.0M2%28April2009%29"></A>SCA Java 2.0-M2 (April 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M2.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M2-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M2.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M2/apache-tuscany-sca-all-2.0-M2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M2-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-M2.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-M2.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M2.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m3.html b/site/trunk/site-publish/sca-java-20-m3.html
new file mode 100644
index 0000000000..b81be68024
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m3.html
@@ -0,0 +1,229 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2327988">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M3">SCA Java 2.0-M3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M3-SCAJava2.0M3%28July2009%29"></A>SCA Java 2.0-M3 (July 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M3-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M3.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M3-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M3-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M3.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M3-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/apache-tuscany-sca-all-2.0-M3-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M3-TomcatRuntime"></A>Tomcat Runtime</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M3/tuscany.war" class="external-link" rel="nofollow">tuscany.war</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/tuscany.war.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M3/tuscany.war.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M3-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-M3.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-M3.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M3.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m4.html b/site/trunk/site-publish/sca-java-20-m4.html
new file mode 100644
index 0000000000..e282781d7a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m4.html
@@ -0,0 +1,229 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M4</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964250">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M4">SCA Java 2.0-M4</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M4-SCAJava2.0M4%28November%2C2009%29"></A>SCA Java 2.0-M4 (November, 2009)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M4-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M4.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M4-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M4-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M4.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M4-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/apache-tuscany-sca-all-2.0-M4-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M4-TomcatRuntime"></A>Tomcat Runtime</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M4/tuscany.war" class="external-link" rel="nofollow">tuscany.war</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/tuscany.war.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M4/tuscany.war.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M4-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-M4.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-M4.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M4.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m5.html b/site/trunk/site-publish/sca-java-20-m5.html
new file mode 100644
index 0000000000..97f8316340
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m5.html
@@ -0,0 +1,210 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M5</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=22315106">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M5">SCA Java 2.0-M5</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M5-SCAJava2.0M5%28June%2C2010%29"></A>SCA Java 2.0-M5 (June, 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M5-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M5-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5/apache-tuscany-sca-all-2.0-M5-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M5-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-M5-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">openssl md5 apache-tuscany-sca-all-2.0-M5.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">md5sum apache-tuscany-sca-all-2.0-M5.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M5.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20-m51.html b/site/trunk/site-publish/sca-java-20-m51.html
new file mode 100644
index 0000000000..c32d790be5
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20-m51.html
@@ -0,0 +1,215 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0-M5.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24183299">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0-M5.1">SCA Java 2.0-M5.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-M5.1-SCAJava2.0M5.1%28October%2C2010%29"></A>SCA Java 2.0-M5.1 (October, 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-M5.1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M5.1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sca-all-2.0-M5.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0-M5.1/apache-tuscany-sca-all-2.0-M5.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-M5.1-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-M5.1-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-sca-all-2.0-M5.1.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-sca-all-2.0-M5.1.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-sca-all-2.0-M5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-sca-all-2.0-M5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-sca-all-2.0-M5.1.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-20.html b/site/trunk/site-publish/sca-java-20.html
new file mode 100644
index 0000000000..c426a221ba
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-20.html
@@ -0,0 +1,225 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.0</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30751949">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.0">SCA Java 2.0</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJava2.0-SCAJava2.0%28July%2C2012%29"></A>SCA Java 2.0 (July, 2012)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.0-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip" class="external-link" rel="nofollow">tuscany-distribution-all-2.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip" class="external-link" rel="nofollow">tuscany-distribution-all-2.0-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-samples-2.0.zip" class="external-link" rel="nofollow">tuscany-samples-2.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz" class="external-link" rel="nofollow">tuscany-distribution-all-2.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz" class="external-link" rel="nofollow">tuscany-distribution-all-2.0-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz" class="external-link" rel="nofollow">tuscany-samples-2.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.0-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.0-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 tuscany-distribution-all-2.0.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum tuscany-distribution-all-2.0.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-2x-development-guide.html b/site/trunk/site-publish/sca-java-2x-development-guide.html
new file mode 100644
index 0000000000..a206cf1268
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-development-guide.html
@@ -0,0 +1,533 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java 2.x Development Guide : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=100579">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.x Development Guide">SCA Java 2.x Development Guide</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>How to get involved in development of Java SCA?</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P>This document is the development guideline for SCA Java project.</P>
+<UL>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-GeneralGuide" title="#General Guide">General Guide\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-GettingSource" title="#Getting Source">Getting Source code\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-Setup" title="#Setup">Setting up your development environment\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-IDE" title="#IDE">Importing SCA modules into your Development IDE\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-CodingGuidelines" title="#Coding Guidelines">Coding Guidelines\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-Testing" title="#Testing">Testing\</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-ClientApplications">Client Applications</A></LI>
+	<LI><A href="#SCAJava2.xDevelopmentGuide-MavenBuildStructure" title="#Maven Build Structure">Maven Build Structure\</A></LI>
+	<LI><B>Development Hints</B>
+	<UL>
+		<LI><A href="#SCAJava2.xDevelopmentGuide-WebappinEclipse" title="#Webapp in Eclipse">Generating Eclipse WTP Web Projects for Webapp samples\</A></LI>
+		<LI><A href="#SCAJava2.xDevelopmentGuide-Ant" title="#Ant">Generating Dependencies for Ant in Samples\</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-OSGiOverviewandApproach"></A>OSGi Overview and Approach</H3>
+
+<P><A href="http://people.apache.org/~lresende/presentations/felix%20goes%20to%20tuscany.pdf" rel="nofollow">OSGI &amp; Tuscany</A></P>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-GeneralGuide"></A><A name="SCAJava2.xDevelopmentGuide-GeneralGuide"></A> General Guide</H3>
+
+<P>Welcome to the Tuscany SCA Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA.</LI>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>The Java SCA infrastructure should provide flexibility and choice. It should not dictate programming models but support many.</LI>
+	<LI>The Java SCA infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="SCAJava2.xDevelopmentGuide-Prerequisites"></A><A name="SCAJava2.xDevelopmentGuide-Prerequisites"></A> Prerequisites</H3>
+
+<P>Java SCA requires the following:</P>
+<UL>
+	<LI><A href="http://java.sun.com/j2se/1.5.0" rel="nofollow">JDK 5.0&#43; (J2SE 1.5.0+)</A></LI>
+	<LI><A href="http://maven.apache.org/" rel="nofollow">Apache Maven (2.0.9+)</A></LI>
+	<LI><A href="http://subversion.tigris.org/" rel="nofollow">Subversion (1.5+)</A> or <A href="http://tortoisesvn.tigris.org/" rel="nofollow">TortoiseSVN (1.5.x+)</A></LI>
+	<LI><A href="http://www.eclipse.org/downloads" rel="nofollow">Eclipse PDE (Ganymede ) </A></LI>
+</UL>
+
+
+<H4><A name="SCAJava2.xDevelopmentGuide-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/java/sca</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-SettingupyourDevelopmentEnvironment"></A><A name="SCAJava2.xDevelopmentGuide-Setup"></A> Setting up your Development Environment</H3>
+
+<H4><A name="SCAJava2.xDevelopmentGuide-topdownbuild%28recommendedapproach%29"></A>top-down build (recommended approach)</H4>
+
+<P>Check out all of the java source code.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/java/sca</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Building the SCA source code :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Psetup clean install
+mvn -fae clean install
+cd  distribution
+mvn -fae clean install
+</PRE>
+</DIV></DIV>
+<P>It should work even if you start with an empty Maven local repository, and it should always work, however when you are building for Tuscany for the first time there are a lot of dependencies which must be downloaded so the first build can take a long time and it may fail with problems retrieving the dependencies.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The trunk code sometimes has SNAPSHOT dependencies which can get out of date in your local repository so if you see odd build failures try updating the SNAPSHOT jars by using the &quot;-U&quot; parameter in the mvn command.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Once you have done a top-down build, and your local maven repository is populated, you can start using the maven off line option to speed up the build process by using the &quot;-o&quot; parameter in the mvn command.</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><P> The SCA build consumes a good amount of memory, in case you are seeing issues during the build, set a MAVEN_OPTS environment variable to allocate more memory for the build process.</P>
+
+<P> Windows : SET MAVEN_OPTS=-Xmx512m<BR>
+ Unix    : export MAVEN_OPTS=-Xmx512m</P></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-ImportingSCAmodulesintoyourDevelopmentIDE"></A><A name="SCAJava2.xDevelopmentGuide-IDE"></A>Importing SCA modules into your Development IDE</H3>
+
+
+<H4><A name="SCAJava2.xDevelopmentGuide-UsingEclipse"></A>Using Eclipse</H4>
+
+
+<P>If this is the first time you are using your workspace with maven m2 local repository, you will need to tell your Eclipse workspace the location of the directory, and you can do this with the following command :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Declipse.workspace=[path-to-eclipse-workspace] eclipse:add-maven-repo
+</PRE>
+</DIV></DIV>
+<P>In order to generate the necessary project files to import the SCA modules to Eclipse, you can use the maven eclipse plugin</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -fae -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+
+
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the project from SCA Modules into your Eclipse Workspace.</P>
+
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the &quot;PDE Target&quot; project (from distribution/pdetarget) into your Eclipse Workspace.</P>
+
+<UL>
+	<LI>Import distribution/pdetarget</LI>
+	<LI>Inside eclipse, open tuscany-distribution-pdetarget project
+	<UL>
+		<LI>open target/tuscany-distribution-pdetarget.target</LI>
+		<LI>click &quot;Set as target platform&quot; on the upper-right side of the overview window that opened</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>There are some Tuscany Eclipse code templates available:<BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codestyle.xml" rel="nofollow">Eclipse Style Formatter </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codetemplates.xml" rel="nofollow">Eclipse Templates </A></P>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-CodingGuidelines"></A><A name="SCAJava2.xDevelopmentGuide-CodingGuidelines"></A> Coding Guidelines</H3>
+
+<P>There are a few simple guidelines when developing for JAVA SCA:</P>
+<UL>
+	<LI>The basic coding style used is the described at <A href="http://java.sun.com/docs/codeconv/" rel="nofollow">Sun Java coding standards</A> but the main thing is to be consistent with the existing code you're updating, so for example, if you're updating a method that uses the braces on the same line style don't add code with the hanging braces style.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files (both source code files and resource files such as xml documents)</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<P>While Tuscany does not yet have an official style or template, here are some templates that folks have been using and have been checked into the build which are stored at <A href="https://svn.apache.org/repos/asf/tuscany/java/etc/" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/java/etc/</A></P>
+
+<H4><A name="SCAJava2.xDevelopmentGuide-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, java/sca/module/implementation-java would be in package structure org.apache.tuscany.implementation.java.&#42;</P>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-Testing"></A><A name="SCAJava2.xDevelopmentGuide-Testing"></A> Testing</H3>
+
+<P>Tuscany uses plain junit test cases to perform unit and integration testing, below is an example that can also be used as a template for writing new test cases; it demonstrates how to bootstrap the Tuscany SCA runtime in your test case, and because they are based on junit, you can run it from your IDE of choice or from Maven.</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><P>Note that we are using JUnit 4.2 code style in OSGI development stream</P></TD></TR></TABLE></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * Description of your test <SPAN class="code-keyword">case</SPAN> and necessary details you find necessary
+ */
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorTestCase {
+
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> CalculatorService calculatorService;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> NodeLauncher launcher;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Node node;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        CalculatorTestCase.calculatorService = calculatorService;
+    }
+    
+    
+    @BeforeClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void setUpBeforeClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        launcher = NodeLauncher.newInstance();
+        <SPAN class="code-object">String</SPAN> location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        node = launcher.createNode(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;test&quot;</SPAN>, location));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA Node API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + node.getClass().getClassLoader());
+        node.start();
+    }
+
+    @AfterClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void tearDownAfterClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-keyword">if</SPAN> (node != <SPAN class="code-keyword">null</SPAN>) {
+            node.stop();
+            node.destroy();
+        }
+        <SPAN class="code-keyword">if</SPAN> (launcher != <SPAN class="code-keyword">null</SPAN>) {
+            launcher.destroy();
+        }
+    }
+
+    @Test
+    <SPAN class="code-keyword">public</SPAN> void testCalculator() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-comment">// Calculate
+</SPAN>        assertEquals(calculatorService.add(3, 2), 5.0);
+        assertEquals(calculatorService.subtract(3, 2), 1.0);
+        assertEquals(calculatorService.multiply(3, 2), 6.0);
+        assertEquals(calculatorService.divide(3, 2), 1.5);
+    }
+}
+</PRE>
+</DIV></DIV>
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a &#42;*/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-ClientApplicationsasSCAComponents"></A><A name="SCAJava2.xDevelopmentGuide-ClientApplications"></A> Client Applications as SCA Components</H3>
+
+<P>Below is how you can build client applications as an SCA component.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    
+    <SPAN class="code-keyword">private</SPAN> CalculatorService calculatorService;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        <SPAN class="code-keyword">this</SPAN>.calculatorService = calculatorService;
+    }
+    
+    @Init
+    <SPAN class="code-keyword">public</SPAN> void calculate() {
+
+        <SPAN class="code-comment">// Calculate
+</SPAN>        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + print(Reference.class.getClassLoader()));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 - 2=&quot;</SPAN> + calculatorService.subtract(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 * 2=&quot;</SPAN> + calculatorService.multiply(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 / 2=&quot;</SPAN> + calculatorService.divide(3, 2));
+    }
+    
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> <SPAN class="code-object">String</SPAN> print(<SPAN class="code-object">ClassLoader</SPAN> cl) {
+        <SPAN class="code-object">StringBuffer</SPAN> buf = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">StringBuffer</SPAN>();
+        <SPAN class="code-keyword">for</SPAN> (; cl != <SPAN class="code-keyword">null</SPAN>;) {
+            buf.append(cl.toString());
+            buf.append(' ');
+            cl = cl.getParent();
+        }
+        <SPAN class="code-keyword">return</SPAN> buf.toString();
+    }
+
+}
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-MavenBuildStructure"></A><A name="SCAJava2.xDevelopmentGuide-MavenBuildStructure"></A> Maven Build Structure</H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.sca</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn &#45;Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H4><A name="SCAJava2.xDevelopmentGuide-Addinganewmoduleandnotreadytointegrate%3F"></A>Adding a new module and not ready to integrate?</H4>
+
+<P>'work-in-progress' modules can be worked on in the same source tree and yet not break the top-down build. You can do this by not listing your module(s) in java/sca/modules/pom.xml.</P>
+
+<H2><A name="SCAJava2.xDevelopmentGuide-DevelopmentHints"></A>Development Hints</H2>
+
+<H3><A name="SCAJava2.xDevelopmentGuide-GeneratingEclipseWTPWebProjectsforWebappsamples"></A><A name="SCAJava2.xDevelopmentGuide-WebappinEclipse"></A> Generating Eclipse WTP Web Projects for Webapp samples</H3>
+
+<P>If you're using Eclipse WTP and want to get WTP Web Projects generated<BR>
+for our Webapp samples you can simply pass a &#45;Dwtpversion=1.5 option to<BR>
+the usual mvn eclipse:eclipse command, like this:<BR>
+mvn &#45;Dwtpversion=1.5 &#45;Peclipse eclipse:eclipse</P>
+
+<P>The magic &#45;Dwtpversion=1.5 option will add the WTP Web project nature to<BR>
+all the Eclipse projects with &lt;packaging&gt;war&lt;/packaging&gt; in their Maven<BR>
+pom.xml. You'll then be able to add these projects to a WTP Tomcat or<BR>
+Geronimo Server configuration, to publish and run them straight from<BR>
+your Eclipse workspace.</P>
+
+<P>h3:<A name="SCAJava2.xDevelopmentGuide-Ant"></A> Generating Dependencies for Ant in Samples</P>
+
+<P>Figuring out the package dependency to include in Ant build.xml can be a pain. Here is a quick<BR>
+script which works in Linux environment for war files.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+jar tvf sample-feed-aggregator-webapp.war | grep .jar | awk '{ printf <SPAN class="code-quote">&quot;%s\n&quot;</SPAN>, $8 }' | sed -e <SPAN class="code-quote">&quot;s/WEB-INF\/lib\<SPAN class="code-comment">///&quot;</SPAN> | awk '{ printf <SPAN class="code-quote">&quot;&lt;include name=\&quot;</SPAN>%s\<SPAN class="code-quote">&quot;/&gt;\n&quot;</SPAN>, $1 }' | grep -v tuscany</SPAN>
+</PRE>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-2x-previous-releases.html b/site/trunk/site-publish/sca-java-2x-previous-releases.html
new file mode 100644
index 0000000000..da9b84a10f
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-previous-releases.html
@@ -0,0 +1,156 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.x Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56048">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.x Previous Releases">SCA Java 2.x Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta3.html" title="SCA Java 2.0-Beta3"><B>SCA Java 2.0-Beta3</B> <EM>(July, 2011)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta2.html" title="SCA Java 2.0-Beta2"><B>SCA Java 2.0-Beta2</B> <EM>(Feburary, 2011)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>3.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta1.html" title="SCA Java 2.0-Beta1"><B>SCA Java 2.0-Beta1</B> <EM>(November, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>4.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m51.html" title="SCA Java 2.0-M5.1"><B>SCA Java 2.0-M5.1</B> <EM>(October, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>5.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m5.html" title="SCA Java 2.0-M5"><B>SCA Java 2.0-M5</B> <EM>(June, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>6.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m4.html" title="SCA Java 2.0-M4"><B>SCA Java 2.0-M4</B> <EM>(November, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>7.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m3.html" title="SCA Java 2.0-M3"><B>SCA Java 2.0-M3</B> <EM>(July, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>8.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m2.html" title="SCA Java 2.0-M2"><B>SCA Java 2.0-M2</B> <EM>(April, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>9.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m1.html" title="SCA Java 2.0-M1"><B>SCA Java 2.0-M1</B> <EM>(February, 2009)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-2x-releases.data/getting-started-1.0.pdf b/site/trunk/site-publish/sca-java-2x-releases.data/getting-started-1.0.pdf
new file mode 100644
index 0000000000..950e4b12cd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-releases.data/getting-started-1.0.pdf
diff --git a/site/trunk/site-publish/sca-java-2x-releases.data/getting_started_06.pdf b/site/trunk/site-publish/sca-java-2x-releases.data/getting_started_06.pdf
new file mode 100644
index 0000000000..f1d93a0034
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-releases.data/getting_started_06.pdf
diff --git a/site/trunk/site-publish/sca-java-2x-releases.data/onlineStore.pdf b/site/trunk/site-publish/sca-java-2x-releases.data/onlineStore.pdf
new file mode 100644
index 0000000000..f1d93a0034
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-releases.data/onlineStore.pdf
diff --git a/site/trunk/site-publish/sca-java-2x-releases.html b/site/trunk/site-publish/sca-java-2x-releases.html
new file mode 100644
index 0000000000..6c80efe571
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x-releases.html
@@ -0,0 +1,311 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.x Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=110488">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.x Releases">SCA Java 2.x Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJava2.xReleases-LatestRelease"></A>Latest Release</H2>
+
+<H3><A name="SCAJava2.xReleases-SCAJava2.0%28July%2C2012%29"></A>SCA Java 2.0 (July, 2012)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJava2.xReleases-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip" class="external-link" rel="nofollow">tuscany-distribution-all-2.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip" class="external-link" rel="nofollow">tuscany-distribution-all-2.0-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-samples-2.0.zip" class="external-link" rel="nofollow">tuscany-samples-2.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.xReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz" class="external-link" rel="nofollow">tuscany-distribution-all-2.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz" class="external-link" rel="nofollow">tuscany-distribution-all-2.0-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-distribution-all-2.0-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Samples </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz" class="external-link" rel="nofollow">tuscany-samples-2.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/2.0/tuscany-samples-2.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJava2.xReleases-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<H3><A name="SCAJava2.xReleases-"></A></H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors.</P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 tuscany-distribution-all-2.0.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum tuscany-distribution-all-2.0.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify tuscany-distribution-all-2.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080;<br/>
+sc_invisible=1;<br/>
+sc_partition=43;<br/>
+sc_security="1478460e";<br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+
+<H2><A name="SCAJava2.xReleases-PreviousReleases"></A>Previous Releases</H2>
+
+<P>Below is a complete list of all Apache Tuscany SCA Java downloads.</P>
+
+<P><B>It is strongly recommended that you download the latest release instead of any of the previous releases since it is closer to the latest code in the trunk.</B></P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta3.html" title="SCA Java 2.0-Beta3"><B>SCA Java 2.0-Beta3</B> <EM>(July, 2011)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>2.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta2.html" title="SCA Java 2.0-Beta2"><B>SCA Java 2.0-Beta2</B> <EM>(Feburary, 2011)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>3.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-beta1.html" title="SCA Java 2.0-Beta1"><B>SCA Java 2.0-Beta1</B> <EM>(November, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>4.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m51.html" title="SCA Java 2.0-M5.1"><B>SCA Java 2.0-M5.1</B> <EM>(October, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>5.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m5.html" title="SCA Java 2.0-M5"><B>SCA Java 2.0-M5</B> <EM>(June, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>6.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m4.html" title="SCA Java 2.0-M4"><B>SCA Java 2.0-M4</B> <EM>(November, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>7.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m3.html" title="SCA Java 2.0-M3"><B>SCA Java 2.0-M3</B> <EM>(July, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>8.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m2.html" title="SCA Java 2.0-M2"><B>SCA Java 2.0-M2</B> <EM>(April, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>9.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-java-20-m1.html" title="SCA Java 2.0-M1"><B>SCA Java 2.0-M1</B> <EM>(February, 2009)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png
new file mode 100644
index 0000000000..3fa9fab7ab
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png
diff --git a/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png.jpeg b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png.jpeg
new file mode 100644
index 0000000000..4806f70f66
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract smallest.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png
new file mode 100644
index 0000000000..170d590f16
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png
diff --git a/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png.jpeg b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png.jpeg
new file mode 100644
index 0000000000..f66f7625c4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/distributed-abstract.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-2x.data/getting_started_Rest_099_07.pdf b/site/trunk/site-publish/sca-java-2x.data/getting_started_Rest_099_07.pdf
new file mode 100644
index 0000000000..3a628e1d6e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/getting_started_Rest_099_07.pdf
diff --git a/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg b/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg
new file mode 100644
index 0000000000..78cad38be3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg
diff --git a/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg.jpeg b/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg.jpeg
new file mode 100644
index 0000000000..cea158aeec
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/javasca smaller.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg b/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg
new file mode 100644
index 0000000000..6498d08553
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg
diff --git a/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg.jpeg b/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg.jpeg
new file mode 100644
index 0000000000..51b6935845
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/javascaSmall2.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg b/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg
new file mode 100644
index 0000000000..2c7a85b0c2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg
diff --git a/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg.jpeg b/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg.jpeg
new file mode 100644
index 0000000000..bf56a9fcb0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.data/tuscanylogo.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-2x.html b/site/trunk/site-publish/sca-java-2x.html
new file mode 100644
index 0000000000..3f005688ef
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-2x.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java 2.x</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=110487">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java 2.x">SCA Java 2.x</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.doc b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.doc
new file mode 100644
index 0000000000..1cacd85b62
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.doc
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg
new file mode 100644
index 0000000000..ecaa4e3cff
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg.jpeg
new file mode 100644
index 0000000000..6877188a48
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/architectureOverview.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg
new file mode 100644
index 0000000000..1e1b1631ca
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg.jpeg
new file mode 100644
index 0000000000..75e7e12e3b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/assembly.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg
new file mode 100644
index 0000000000..6b4ef2a0e2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg.jpeg
new file mode 100644
index 0000000000..bdaf3f1277
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg
new file mode 100644
index 0000000000..f222230cf4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg.jpeg
new file mode 100644
index 0000000000..c5b7fb2288
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/bootstrap_seq.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg
new file mode 100644
index 0000000000..7316751a9a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg.jpeg
new file mode 100644
index 0000000000..680b96a1c4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/contribution_overview.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg
new file mode 100644
index 0000000000..513e452c86
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg.jpeg
new file mode 100644
index 0000000000..b637b46349
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/invokers.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg
new file mode 100644
index 0000000000..4a54a8c577
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg.jpeg
new file mode 100644
index 0000000000..99999c7a20
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-model.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg
new file mode 100644
index 0000000000..1a4b48cd35
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg.jpeg
new file mode 100644
index 0000000000..6ecf8ef3cd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/runtime-wire.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg b/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg
new file mode 100644
index 0000000000..fd1f8d4318
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg b/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
new file mode 100644
index 0000000000..a4e3e2b1e3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-architecture-guide.html b/site/trunk/site-publish/sca-java-architecture-guide.html
new file mode 100644
index 0000000000..75bf4ef88f
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture-guide.html
@@ -0,0 +1,414 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Architecture Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Architecture Guide">SCA Java Architecture Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ffffff;border-color: #ECF4D1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #ECF4D1;background-color: #ECF4D1;"><B>Apache Tuscany SCA Java Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<UL>
+	<LI><A href="#SCAJavaArchitectureGuide-Overview">Overview</A>
+	<UL>
+		<LI><A href="#SCAJavaArchitectureGuide-CoreDefinition">Core</A></LI>
+		<LI><A href="#SCAJavaArchitectureGuide-ExtensionDefinition">Extension</A></LI>
+		<LI><A href="#SCAJavaArchitectureGuide-RuntimeDefinition">Runtime</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaArchitectureGuide-InternalsHighLevelView">Internals High Level View</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-Bootstrap">Bootstrap</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-AssemblyModel">Assembly Model</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-Contribution">Contribution</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-BindingExtension">Binding Extension</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-ImplementationExtension">Component Implementation Extension</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-DataBindingExtension">Data Binding Extension</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-CompositeActivation">Composite Activation</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-LoadingSCAassemblies">Loading SCA assemblies</A></LI>
+	<LI><A href="#SCAJavaArchitectureGuide-SpringIntegration">Spring Integration</A>
+	<UL>
+		<LI><A href="#SCAJavaArchitectureGuide-Springascomponentimplementation">Spring as component implementation</A></LI>
+		<LI><A href="#SCAJavaArchitectureGuide-SpringasIOCcontainer">Spring as IOC container</A></LI>
+	</UL>
+	</LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="SCAJavaArchitectureGuide-Overview"></A><A name="SCAJavaArchitectureGuide-Overview"></A>Overview</H3>
+
+<P>The SCA Java runtime is composed of core and extensions. The core is essentially a multi-VM wiring engine that connects components together using the principles of <A href="http://en.wikipedia.org/wiki/Dependency_injection" class="external-link" rel="nofollow">Dependency Injection</A>, or <A href="http://en.wikipedia.org/wiki/Inversion_of_control" class="external-link" rel="nofollow">Inversion of Control</A>.</P>
+
+<H4><A name="SCAJavaArchitectureGuide-Core"></A><A name="SCAJavaArchitectureGuide-CoreDefinition"></A> Core</H4>
+
+<P>The Core is designed to be simple and limited in its capabilities. It wires functional units together and provides SPIs that extensions can interact with. Capabilities such as service discovery, reliability, support for transport protocols, etc. are provided through extensions.</P>
+
+<H4><A name="SCAJavaArchitectureGuide-Extension"></A><A name="SCAJavaArchitectureGuide-ExtensionDefinition"></A> Extension</H4>
+
+<P>Extensions enhance SCA runtime functionality. Extension types are not fixed and core is designed to be as flexible as possible by providing an open-ended extension model. However, there are a number of known extension types defined including:</P>
+<UL>
+	<LI><B>Component implementation types</B>, e.g. Spring, Groovy, and JavaScript</LI>
+	<LI><B>Binding types</B>, e.g. Axis, CXF, AMQP, ActiveMQ, JXTA</LI>
+	<LI><B>DataBinding types</B>, e.g. JAXB, SDO, XmlBeans</LI>
+	<LI><B>Interface Binding types</B>, e.g. WSDL, Java</LI>
+</UL>
+
+
+<P>Details of how to implement an extension can be can be found in the <A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extensions Guide</A>.</P>
+
+<H4><A name="SCAJavaArchitectureGuide-Runtime"></A><A name="SCAJavaArchitectureGuide-RuntimeDefinition"></A> Runtime</H4>
+
+<P>The core is designed to be embedded in, or provisioned to, a number of different host environments. For example, the core may be provisioned to an OSGi container, a standalone runtime, a servlet engine, or J2EE application server. Runtime capabilities may vary based on the host environment.</P>
+
+<P></P>
+
+<H4><A name="SCAJavaArchitectureGuide-HighleveloverviewofJavaSCAruntime"></A>High level overview of Java SCA runtime</H4>
+
+<P>The diagram shown below is a high level view of the SCA runtime which consists of the following key modules/packages:</P>
+<OL>
+	<LI>SCA Spec API: The APIs defined by the SCA Java Client and Implementation Spec</LI>
+	<LI>API: Tuscany APIs which extend the SCA Spec APIs</LI>
+	<LI>Core: The runtime implementation and the SPIs to extend it</LI>
+	<LI>Extensions:
+	<OL>
+		<LI>Container implementation - For extending language support, for example BPEL, Python, C++, Ruby,..</LI>
+		<LI>Binding - for extending protocol support, for example Axis2, CXF,..</LI>
+		<LI>Interface Binding - for extending types of service definition, for example WSDL, Java, ...</LI>
+		<LI>Databinding - for extending data support, for example SDO, JAXB, ...</LI>
+	</OL>
+	</LI>
+	<LI>Host Platforms: The environments that host the Tuscany runtime.</LI>
+</OL>
+
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-architecture-guide.data/architectureOverview.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="SCAJavaArchitectureGuide-InternalsHighLevelView"></A><A name="SCAJavaArchitectureGuide-InternalsHighLevelView"></A>Internals High Level View</H3>
+
+<P>[Note: Do we want to link to <A href="java-sca-modulization-design-discussions.html" title="Java SCA Modulization Design Discussions">Kernel-Structure</A>]?</P>
+
+<H3><A name="SCAJavaArchitectureGuide-Bootsrap"></A><A name="SCAJavaArchitectureGuide-Bootstrap"></A>Bootsrap</H3>
+
+<P>Bootstrap process is controlled by Host environment. The default process is implemented in DefaultBootstrapper.<BR>
+The runtime processes service assemblies serialized using SCA Assembly XML which can take other forms.</P>
+<UL>
+	<LI>The load phase processes SCDL and creates an in-memory model and produces corresponding runtime artifacts (e.g. components, services, references)</LI>
+	<LI>The connect/wire phase wires references to services</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-architecture-guide.data/bootstrap.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="SCAJavaArchitectureGuide-AssemblyModel"></A><A name="SCAJavaArchitectureGuide-AssemblyModel"></A>Assembly Model</H3>
+
+<P>The SCA assembly model is represented as a set of interfaces in Tuscany. The following are some key elements.</P>
+<UL>
+	<LI>SCA <B>components</B> are configured instances of SCA implementations, which provide and consume&nbsp;services.</LI>
+	<LI>SCA <B>services</B> are used to declare the externally accessible services of an implementation.</LI>
+	<LI>SCA <B>references</B> represent a dependency that an implementation has on a service that is supplied&nbsp;by some other implementation, where the service to be used is specified through configuration.</LI>
+	<LI>An <B>implementation</B> is concept that is used to describe a piece of software technology such as a Java&nbsp;class, BPEL process, XSLT transform, or C+&#43; class that is used to implement one or more services in&nbsp;a service-oriented application. An SCA composite is also an implementation.&nbsp;</LI>
+	<LI><B>ComponentType</B> refers to the configurable aspects of an implementation.</LI>
+	<LI><B>Interfaces</B> define one or more business functions. These business functions are provided by Services and are used by components through References. Services are defined by the Interface&nbsp;they implement. SCA currently supports two interface type systems:
+	<UL>
+		<LI>Java interfaces</LI>
+		<LI>WSDL portTypes</LI>
+	</UL>
+	</LI>
+	<LI>An SCA <B>composite</B> is the basic unit of composition within an SCA Domain. An <B><EM>SCA Composite</EM></B> is an&nbsp;assembly of Components, Services, References, and the Wires that interconnect them.</LI>
+	<LI><EM>SCA</EM> <B><EM>wires</EM></B> connect <B><EM>service references</EM></B> to <B><EM>services</EM></B>.</LI>
+	<LI><B><EM>Bindings</EM></B> are used by services and references. References use bindings to describe the access mechanism used to call the service to which they are wired. Services use bindings to describe the access mechanism(s) that clients should use to call the service.</LI>
+	<LI><B>Properties</B> allow for the configuration of an implementation with externally set data values. The data value is provided through a Component, possibly sourced from the property of a containing composite.</LI>
+</UL>
+
+
+<UL>
+	<LI><SPAN class="image-wrap" style=""><IMG src="sca-java-architecture-guide.data/assembly.jpg" style="border: 0px solid black"></SPAN></LI>
+</UL>
+
+
+<H3><A name="SCAJavaArchitectureGuide-Contribution"></A><A name="SCAJavaArchitectureGuide-Contribution"></A>Contribution</H3>
+
+<P>The Tuscany runtime provides a framework to support SCA contributions. The framework can be extended against the following two extension points:</P>
+
+<P>PackageProcessorExtensionPoint: It accepts extensions that can handle&nbsp;different packaging&nbsp;format/archives such as a directory, a JAR, an OSGi bundle, an EAR, a WAR and a ZIP.&nbsp;</P>
+
+<P>ArtifactProcessorExtensionPoint: It accepts extensions that can handle specific types of artifacts such as WSDL, XSD, composite, java class, BPEL.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-architecture-guide.data/contribution_overview.jpg" style="border: 0px solid black"></SPAN></P>
+<UL>
+	<LI>Package processors scans the contribution being installed and generate a list of artifacts that needs to be processed. Currently there is support for folder/file system and jar contribution packages. In order to be available to the contribution service, a package processors needs to register itself with the package processor extension.</LI>
+</UL>
+
+
+<UL>
+	<LI>Artifact processors are used to process each artifact available on the contribution. In order to be available to the contribution service, a artifact processor needs to register itself with the artifact processor extension. An artifact processor will be called for each artifact in two phases :</LI>
+</UL>
+
+
+<UL>
+	<LI>
+	<UL>
+		<LI>read phase : This is where you read an artifact (a document, an XML element, classes etc.), populate a model representing the artifact and return it. The SCA contribution service calls ArtifactProcessor.read() on all artifacts that have an ArtifactProcessor registered for them. If your model points to other models, instead of trying to load these other models right away, you should just keep the information representing that reference, which you'll turn into a pointer to the referenced model in the resolve() phase. Note that you don't necessarily need to fully read and populate your model at this point, you can choose to complete it later.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>
+	<UL>
+		<LI>resolve phase : This phase gives you the opportunity to resolve references to other models (a WSDL, a class, another composite, a componentType). At this point, all models representing the artifacts in your SCA contribution have been read, registered in the contribution's ArtifactResolver, and are ready to be resolved.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>All deployable composites should be now ready to get deployed to the SCA Domain</LI>
+</UL>
+
+
+<H3><A name="SCAJavaArchitectureGuide-ImplementationExtension"></A><A name="SCAJavaArchitectureGuide-ImplementationExtension"></A>Implementation Extension</H3>
+
+<P>Implementation extension is responsible for supporting an implementation type, such as Java, Script, and BPEL</P>
+
+<H3><A name="SCAJavaArchitectureGuide-BindingExtension"></A><A name="SCAJavaArchitectureGuide-BindingExtension"></A>Binding Extension</H3>
+
+<P>Binding extension is responsible for supporting a binding type such as Web Service, JMS,&nbsp;&nbsp;JSON-RPC and RMI</P>
+
+<H3><A name="SCAJavaArchitectureGuide-InterfaceExtension"></A><A name="SCAJavaArchitectureGuide-InterfaceExtension"></A>Interface Extension</H3>
+
+<P>Interface extension is responsible for supporting an interface type such as Java interface and WSDL 1.1 portType</P>
+
+<H3><A name="SCAJavaArchitectureGuide-DataBindingExtension"></A><A name="SCAJavaArchitectureGuide-DataBindingExtension"></A>Data Binding Extension</H3>
+
+<P>Please refer to:&nbsp;<A href="tuscany-databinding-guide.html" title="Tuscany Databinding Guide">Tuscany Databinding Guide</A></P>
+
+<H3><A name="SCAJavaArchitectureGuide-CompositeActivation"></A><A name="SCAJavaArchitectureGuide-CompositeActivation"></A>Composite Activation</H3>
+
+<P>After a composite is fully configured, it can be activated in the SCA domain. The Tuscany runtime activates a composite in the following steps:</P>
+<OL>
+	<LI><B>Build the composite</B>: In this phase, the composite model is further normalized to facilitate the runtime interactions. The metadata is consolidated following the service/reference promotions. With the flattened model, we can get all the information at component level.</LI>
+	<LI><B>Configure the composite</B>: In this phase, the composite hierarchy is navigated to configure the component implementation, reference binding and service binding with provider factories which&nbsp;will be used in later steps to create runtime wires among components and&nbsp;external services.&nbsp;&nbsp;&nbsp;</LI>
+	<LI><B>Create the runtime wires</B>: In this phase, runtime wires are created for component references and component services over selected bindings. The runtime wire is a collection of invocation chains that are patitioned by operations. Each invocation chain consists of a set of invokers and interceptors s. Invokers provides the invocation logic to binding protocols and implementation technologies. Interceptors are speical kind of invokers that provide additional logic for the invocation, such as data transformation and transaction control. For a component reference, we create runtime wires to represent the outbound invocation over the selected binding. For a component service, we create runtime wires to represent the inbound invocation to the implementation type. Callback wires can be attached to component services to represent the callback invocations from the service.</LI>
+	<LI><B>Start the composite</B>: In this phase, the start() callback methods defined by the ImplementationProvider, ReferenceBindingProvider and ServiceBindingProvider will be invoked. As a result, components, component references and component services are initialized to serve the component interactions. Service listeners are started to accept inbound requests from the binding layer.<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-architecture-guide.data/runtime-wire.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-architecture-guide.data/invokers.jpg" style="border: 0px solid black"></SPAN></LI>
+</OL>
+
+
+<H4><A name="SCAJavaArchitectureGuide-InvocationOverview"></A>Invocation Overview</H4>
+
+<UL>
+	<LI>An invocation is dispatched to the WireInvocationHandler</LI>
+	<LI>The WireInvocationHandler looks up the correct InvocationChain</LI>
+	<LI>It then creates a message, sets the payload, sets the TargetInvoker, and passes the message down the chain</LI>
+	<LI>When the message reaches the end of the chain, the TargetInvoker is called, which in turn is responsible for dispatching to the target</LI>
+	<LI>Having the TargetInvoker stored on the outbound side allows it to cache the target instance when the wire source has a scope of equal or lesser value than the target (e.g. request--&gt;composite</LI>
+</UL>
+
+
+<P>The runtime provides components with InboundWires and OutboundWires. InvocationChains are held in component wires and are therefore stateless which allows for dynamic behavior such as introduction of new interceptors or re-wiring.</P>
+
+<H3><A name="SCAJavaArchitectureGuide-LoadingSCAassemblies"></A><A name="SCAJavaArchitectureGuide-LoadingSCAassemblies"></A>Loading SCA assemblies</H3>
+
+
+<H4><A name="SCAJavaArchitectureGuide-ArtifactProcessor"></A>Artifact Processor</H4>
+
+<P>Artifact processors are responsible for processing each artifact available in a contribution package, these processors are going to be invoked in two phases</P>
+<UL>
+	<LI>read phase : This is where you read an artifact (a document, an XML element, classes etc.), populate a model representing the artifact and return it. The SCA contribution service calls ArtifactProcessor.read() on all artifacts that have an ArtifactProcessor registered for them. If your model points to other models, instead of trying to load these other models right away, you should just keep the information representing that reference, which you'll turn into a pointer to the referenced model in the resolve() phase. Note that you don't necessarily need to fully read and populate your model at this point, you can choose to complete it later.</LI>
+</UL>
+
+
+<UL>
+	<LI>resolve phase : This phase gives you the opportunity to resolve references to other models (a WSDL, a class, another composite, a componentType). At this point, all models representing the artifacts in your SCA contribution have been read, registered in the contribution's ArtifactResolver, and are ready to be resolved.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaArchitectureGuide-LoadingJavaSCA"></A>Loading Java SCA</H3>
+
+<P>SCA service assemblies are deployed to the SCA domain in the format of SCDL files. Tuscany runtime artifact processor loads the SCDLs into model objects which are a set of java beans to hold the metadata.</P>
+
+<P>There are two types of loaders:</P>
+<UL>
+	<LI>StAXElementLoader: Load the XML element from the StAX events</LI>
+	<LI>ComponentTypeLoader: Load the Component Type for an implementation either by introspection or paring a side file</LI>
+</UL>
+
+
+<H3><A name="SCAJavaArchitectureGuide-LoadingComponentType"></A>Loading Component Type</H3>
+
+<P>Loads the component type definition for a specific implementation</P>
+<UL>
+	<LI>How it does this is implementation-specific</LI>
+	<LI>May load XML sidefile (location set by implementation)</LI>
+	<LI>May introspect an implementation artifact (e.g. Java annotations)</LI>
+	<LI>... or anything else</LI>
+</UL>
+
+
+<P>Loading Composite ComponentType Loader</P>
+<UL>
+	<LI>Load SCDL from supplied URL</LI>
+	<LI>Extract and load SCDL from composite package</LI>
+</UL>
+
+
+<P>POJO ComponentType Loader</P>
+<UL>
+	<LI>Introspect Java annotations</LI>
+	<LI>Uses a pluggable &quot;annotation processing&quot; framework to introspect Java classes</LI>
+</UL>
+
+
+<H3><A name="SCAJavaArchitectureGuide-Classdiagramfortheruntimeartifacts"></A>Class diagram for the runtime artifacts</H3>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-architecture-guide.data/runtime-model.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="SCAJavaArchitectureGuide-SpringIntegration"></A><A name="SCAJavaArchitectureGuide-SpringIntegration"></A>Spring Integration</H3>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-architecture.data/TuscanyJAVASCAM2.pdf b/site/trunk/site-publish/sca-java-architecture.data/TuscanyJAVASCAM2.pdf
new file mode 100644
index 0000000000..aa2f5ffe41
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture.data/TuscanyJAVASCAM2.pdf
diff --git a/site/trunk/site-publish/sca-java-architecture.html b/site/trunk/site-publish/sca-java-architecture.html
new file mode 100644
index 0000000000..817426e324
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-architecture.html
@@ -0,0 +1,145 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Architecture</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51356">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="delete-java-sca-architecture-overview.html" title="DELETE- Java SCA Architecture Overview">DELETE- Java SCA Architecture Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Architecture">SCA Java Architecture</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ffffff;border-color: #6699ff;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #6699ff;background-color: #D5EFFF;"><B>Apache Tuscany SCA Java Architecture</B></DIV><DIV class="panelContent" style="background-color: #ffffff;">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+At the moment we are pulling different pieces of information in one place until we decide how to orgnaize this.</P>
+<UL>
+	<LI><A href="#SCAJavaArchitecture-Structure">Java SCA Structure </A></LI>
+	<LI><A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Kernel Architecture Guide</A></LI>
+	<LI><A href="#SCAJavaArchitecture-Mediator">Data Binding </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/download/attachments/47512/TuscanyJAVASCA.pdf" class="external-link" rel="nofollow">How it looked in M2 release?</A>
+<BR class="atl-forced-newline">
+&nbsp;</LI>
+</UL>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="SCAJavaArchitecture-"></A><A name="SCAJavaArchitecture-Structure"></A><FONT color="#0099cc">Java SCA Structure</FONT></H3>
+
+<P>The following diagram is a high level view of the kernel structure.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> this diagram needs to be fine tuned an is under discussion, but gives you an idea of the main modules in kernel. For example, the diagram shows the whole Tuscany instead of just the Kernel. As an example, runime block should not be shown as part of the Kernel.</P>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Kernel%20Modulization%20Design%20Discussions" class="external-link" rel="nofollow">Kernel-Structure</A></P>
+
+<H3><A name="SCAJavaArchitecture-"></A><A name="SCAJavaArchitecture-mediator"></A><FONT color="#0099cc">Data Binding</FONT></H3>
+
+<P>Data provides transparent data mapping between different types of data that can be exchanged between caller of a service and the service itself given the format of the data that will be supplied by the client. Data Mediator will do this transformation given the following information:</P>
+<OL>
+	<LI>format of the data that can be consumed by the service</LI>
+	<LI>format of the data that will be sent by the client</LI>
+</OL>
+
+
+<P>You can find more detailed information about databinding at this <A href="http://cwiki.apache.org/confluence/display/~rfeng/Tuscany%20Databinding" class="external-link" rel="nofollow">link</A></P>
+
+<P></P>
+
+<H3><A name="SCAJavaArchitecture-"></A><A name="SCAJavaArchitecture-AboutModule1"></A><FONT color="#0099cc">Module 1</FONT></H3>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-binding-endpoints.html b/site/trunk/site-publish/sca-java-binding-endpoints.html
new file mode 100644
index 0000000000..ca3d2ef213
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-binding-endpoints.html
@@ -0,0 +1,199 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding endpoints</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63940">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding endpoints">SCA Java binding endpoints</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabindingendpoints-SCAbindingendpoints"></A>SCA binding endpoints</H3>
+
+<P>The value of the endpoint URI used by an SCA service or reference binding is defined in the varrious <A href="http://www.osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">SCA Specifications</A>. The Assembly specification, page 53, section 1.7.2 &quot;Form of the URI of a Deployed Binding&quot; defines the overall rules, and specific binding specifications may modify or add addtional rules, for example, the Web service binding specifiction on page 3, section 2.1.1 &quot;Endpoint URI resolution&quot; adds further web service related endpoint rules.</P>
+
+<P>The Tuscany runtime and binding implementations aim to all work consistently so that once you understand the basic endpoint URI rules and conventions it should be easy to determine an actual endpoint from reading the composite SCDL.  </P>
+
+<H4><A name="SCAJavabindingendpoints-Someexamples"></A>Some examples </H4>
+
+<P>The following composite fragment would result in the web service address of <A href="http://localhost:8080/MyService" class="external-link" rel="nofollow">http://localhost:8080/MyService</A></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;MyComposite&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;MyService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;SomeComponent&quot;</SPAN>&gt;
+       &lt;binding.ws/&gt;
+    &lt;/service&gt;
+
+    . . .
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The following composite fragment would result in the web service address of <A href="http://localhost:8080/MyComponent/MyService" class="external-link" rel="nofollow">http://localhost:8080/MyComponent/MyService</A></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;MyComposite&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;MyComponent&quot;</SPAN>&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;MyService&quot;</SPAN>&gt;
+           &lt;binding.ws/&gt;
+        &lt;/service&gt;
+        . . .
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-binding-jsonrpc.html b/site/trunk/site-publish/sca-java-binding-jsonrpc.html
new file mode 100644
index 0000000000..92870e46fb
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-binding-jsonrpc.html
@@ -0,0 +1,77 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java binding-jsonrpc : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54462">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-extension-guide.html" title="SCA Java Extension Guide">SCA Java Extension Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding-jsonrpc">SCA Java binding-jsonrpc</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H2><A name="SCAJavabinding-jsonrpc-Overview"></A>Overview</H2>
+
+<P>General description of this extenson</P>
+
+<H2><A name="SCAJavabinding-jsonrpc-UsingTheExtension"></A>Using The Extension</H2>
+
+<P>What does the SCDL look like</P>
+
+<H2><A name="SCAJavabinding-jsonrpc-Examples"></A>Examples</H2>
+
+<P>Some examples of how it can be used. </P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-bindingajax.html b/site/trunk/site-publish/sca-java-bindingajax.html
new file mode 100644
index 0000000000..66fce86da1
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingajax.html
@@ -0,0 +1,245 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.ajax</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56001">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ajax">SCA Java binding.ajax</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.ajax-%3Cbinding.ajax%3E"></A>&lt;binding.ajax&gt;</H3>
+
+<P>Tuscany supports web browser clients using <A href="http://en.wikipedia.org/wiki/Ajax_(programming)" class="external-link" rel="nofollow">AJAX</A> to communicate with with SCA components by using the &lt;binding.ajax&gt; SCDL extension. This enables remote web browser clients to easily make RPC style calls to server-side SCA components and for server-side SCA components to easily make <A href="http://en.wikipedia.org/wiki/Comet_(programming)" class="external-link" rel="nofollow">COMET</A> / <A href="http://en.wikipedia.org/wiki/Reverse_Ajax" class="external-link" rel="nofollow">Reverse Ajax</A> style requests to web browser clients.</P>
+
+<P>This binding has no attributes or elements so to include it on a SCA service or reference simply requires the following SCDL:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;binding.ajax/&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Also see <A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">&lt;binding.jsonrpc</A> which provides some similar function.</P>
+
+<P>In order for a web browser client to interact with SCA services and references which use &lt;binding.ajax&gt; it needs to included a Tuscany runtime scaDomain.js script which will initialize the SCA enviroment and provides control functions. This script is dynamically generated to include  </P>
+
+<P>A web browser client needs to include a Tuscany runtime system script in its HTML page before it can interact with SCA services and references which use &lt;binding.ajax&gt;. This is done by simply including the following script tag within the HTML page:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;SCA/SCADomain/scaDomain.js&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This creates proxy objects for the SCA services which can then be used make requests to the server-side components. For example, if there was a service named &quot;myService&quot; using &lt;binding.ajax&gt; which had operations &quot;aOnewayRequest&quot; and &quot;anRpcRequest&quot; the scripts in the HTML page could now invoke these opperations with the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+myService.aOnewayRequest(args);
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+myService.anRpcRequest(args, responseFunction);
+</PRE>
+</DIV></DIV>
+
+<P>In the that example 'responseFunction' is the name of a function which is called to process the response and which gets called asynchronously on another thread when the response is avaialble. RPC requests are done this way instead of the simpler &quot;answer = myService.anRpcRequest(args)&quot; to avoid hanging the browser while the (potentialy slow) request is being processed. An example of the responseFunction for the previous example is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+function responseFunction(answer){
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with answer
+</SPAN>}
+</PRE>
+</DIV></DIV>
+
+<P>For SCA references using &lt;binding.ajax&gt; a function needs to be written to handle each operation that may be called by the reference. The operations used by the reference cannot return any response but must be one-way style operations. As an example, if there is an SCA reference named &quot;myReference&quot; which has an operation named &quot;foo&quot; then the client side function required would be:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+myReference.foo = function(args) {
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with args
+</SPAN>}
+</PRE>
+</DIV></DIV>
+
+<P>SCA references using &lt;binding.ajax&gt; require a communication channel between the server-side Tuscany runtime and the remote web browser client. This channel can be explicitly opened and closed by the client, and it must be opened before any client side function assoicated with a SCA reference will be invoked. This is done with:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scaDomain.open();
+</PRE>
+</DIV></DIV>
+<P>and</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scaDomain.close();
+</PRE>
+</DIV></DIV>
+<P>The connection is automatically closed when the web page is closed so if the client does not need fine grain control the 'onLoad' of the HTML body element can be used to establish the connection, for example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;body onLoad=<SPAN class="code-quote">&quot;scaDomain.open()&quot;</SPAN>&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.ajax-Someexamples%3A"></A>Some examples:</H4>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/chat-webapp/" class="external-link" rel="nofollow">chat-webapp</A> sample in the Tuscany SCA samples folder for an example of using &lt;binding.ajax&gt;</P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Differences between &lt;binding.jsonrpc&gt; and &lt;binding.ajax&gt;</B><BR>The current Tuscany SCA runtime supports &lt;binding.jsonrpc&gt; and &lt;binding.ajax&gt; which provide similar functionality. The differences are:
+<UL>
+	<LI>&lt;binding.jsonrpc&gt; supports the SMD protocol enabling easy use with Dojo, &lt;binding.ajax&gt; does not support SMD</LI>
+	<LI>&lt;binding.ajax&gt; supports SCA references and using <A href="http://en.wikipedia.org/wiki/Comet_(programming)" class="external-link" rel="nofollow">COMET</A> style asynchronous operation, &lt;binding.jsonrpc&gt; does not</LI>
+	<LI>&lt;binding.jsonrpc&gt; uses the standard <A href="http://json-rpc.org/" class="external-link" rel="nofollow">JSON-RPC</A> protocol, &lt;binding.ajax&gt; uses a proprietry protocol using <A href="http://getahead.org/dwr/" class="external-link" rel="nofollow">DWR</A></LI>
+</UL>
+
+
+<P>These differences should be resolved by the Tuscany SCA 1.0 release.</P></TD></TR></TABLE></DIV>
+</TD></TR></TBODY></TABLE> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingatom.html b/site/trunk/site-publish/sca-java-bindingatom.html
new file mode 100644
index 0000000000..1a2596918d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingatom.html
@@ -0,0 +1,589 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.atom</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=98605">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.atom">SCA Java binding.atom</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.atom-%3Cbinding.atom%3EIntroduction"></A>&lt;binding.atom&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Atom using the &lt;binding.atom&gt; extension. Tuscany can communicate with services that provide or consume items described in the Atom Syndication Format and Atom Publishing Protocol. The Atom protcol is an additional conceptual layer that operates on top of the Hyper Text Transfer Protocol, so it is useful to understand that underlying protocol as well. Reference materials on these specifications is available here.</P>
+
+<UL>
+	<LI><A href="http://tools.ietf.org/html/rfc2616" class="external-link" rel="nofollow">Hyper Text Transfer Protocol</A>.</LI>
+	<LI><A href="http://tools.ietf.org/html/rfc4287" class="external-link" rel="nofollow">Atom Syndication Format</A>.</LI>
+	<LI><A href="http://tools.ietf.org/html/rfc5023" class="external-link" rel="nofollow">Atom Publishing Protocol</A>.</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Some of the function described here is included in the Tuscany 1.3.2 and 1.4 releases. The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A>.</P>
+
+
+<H3><A name="SCAJavabinding.atom-UsingtheTuscanyAtombinding"></A>Using the Tuscany Atom binding</H3>
+
+<P>The primary use of the Atom binding is to provide support for collections that can be shared in a distributed fashion. Examples of shared collections includes shopping carts, telephone directories, insurance forms, and blog sites. These collections of items can be added, retrieved, updated, and deleted using the 4 basic actions of the HTTP protocol:</P>
+<UL>
+	<LI>POST (create or add)</LI>
+	<LI>GET (retreive or query)</LI>
+	<LI>PUT (update)</LI>
+	<LI>DELETE (destroy or remove</LI>
+</UL>
+
+
+<P>The simplest way to use the Atom binding is to declare a collection as a service and provide an HTTP address where one can access the service. This service is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	&lt;service name=<SPAN class="code-quote">&quot;customer&quot;</SPAN> promote=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+		&lt;tuscany:binding.atom uri = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/customer&quot;</SPAN>/&gt;
+</SPAN>	&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The service can be implemented in Java or any of the the Tuscany implementation types. For example, here is a way to create an implmentation for the above CustomerCollection service in the Java type.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.atom.CustomerCollectionImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>A collection that uses the Atom binding usually implements the Collection interface given in the package org.apache.tuscany.sca.binding.atom.collection. This interface declares the basic access methods mentioned above (post, get, put, and delete), and the data types on the methods are expressed as Atom type objects Feed and Entry. In other words, one can view the collection as an Atom Feed, and manipulate items in the Feed as Atom Entries. This shows the basic methods of the Atom Collection intergface in Tuscany:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Collection {
+
+    Entry post(Entry entry);
+    Entry get(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+    void put(<SPAN class="code-object">String</SPAN> id, Entry entry) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+    void delete(<SPAN class="code-object">String</SPAN> id) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+
+    Feed getFeed();
+    Feed query(<SPAN class="code-object">String</SPAN> queryString);
+}
+</PRE>
+</DIV></DIV>
+
+<P>It is up to the developer or implementer of the shopping cart, telephone directory, or blog site to provide the code that implements the Collection interface. The developer or implementor also provides the code that translates from the business objects (shopping cart items, directory entries, insurance forms, blog articles) to the Atom model objects Feed and Entry.</P>
+
+<P>One of the features of using this binding is that your business objects (shopping cart items, directory entries, insurance forms, and blog articles) can now be easily published and shared by the many Atom supporting tools such as feed readers, web browsers, and syndication aggregation. In other words, people can access your collection most anywhere on any device.</P>
+
+<H3><A name="SCAJavabinding.atom-Example"></A>Example</H3>
+
+<P>Continuing with the CustomerCollection example shown above, let's see how one of the common access methods. In this case, let's look at the post method and how one would add a new item to the collection. When you declared your Atom binding in your SCA composite, you also provided a uri for your collection. Using a web browser or other device, a user performs an HTTP put request to this uri, with the body of the put containing the data. Tuscany SCA performs the task of invoking the correct service and finding the Java implementation for your collection and calling the correct method. </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    <SPAN class="code-keyword">public</SPAN> Entry post(Entry entry) {
+       <SPAN class="code-comment">// 1. Validate entry fields
+</SPAN>       <SPAN class="code-keyword">if</SPAN> (entry.getTitle() != <SPAN class="code-keyword">null</SPAN> ) {
+          entryID = <SPAN class="code-quote">&quot;tag:&quot;</SPAN> + site <SPAN class="code-quote">&quot;,&quot;</SPAN> + todaysDate + <SPAN class="code-quote">&quot;:&quot;</SPAN> + title;
+          entry.setID( entryID );
+       }
+       <SPAN class="code-comment">// 2. Provide any additional data.
+</SPAN>       entry.setUpdated( <SPAN class="code-keyword">new</SPAN> Date() );
+       <SPAN class="code-comment">// 3. Store data in local collection or data base.
+</SPAN>       entries.put(id, entry);
+       <SPAN class="code-comment">// 4. Return entry to poster.
+</SPAN>       <SPAN class="code-keyword">return</SPAN> entry;
+    }
+</PRE>
+</DIV></DIV>
+
+<P>Much of the code consists of converting from a Feed or Entry to a business data model and storing to a collection.</P>
+
+<P>Tuscany uses the Apache Abdera project to provide a model for Atom data. Please see <A href="http://incubator.apache.org/abdera/" class="external-link" rel="nofollow">Apache Abdera</A> for the Java method to access Atom Feeds and Entries, and how to easily convert these Java objects to and from XML.</P>
+
+<H3><A name="SCAJavabinding.atom-OtherFeaturesoftheTuscanyAtomBinding"></A>Other Features of the Tuscany Atom Binding</H3>
+
+<P>More advanced features of the Tuscany Atom binding are described below.</P>
+
+<H4><A name="SCAJavabinding.atom-DataCachingusingETags%2CLastModified%2CandotherHeaderCommands"></A>Data Caching using ETags, Last-Modified, and other Header Commands</H4>
+
+<P>Atom feeds and entries can often be very large pieces of data. Since Tuscany uses the Atom data binding as one of its supported bindings, there is the potential that many requests for data may have large pieces of data associated with a request.</P>
+
+<P>Hyper Text Transfer Protocol (HTTP), the basis of the web, has support to help limit or cache the amount of data shared between a client and server by adding tags to a resource reques. These header tags are the ETag and the Last-Modified tags. When used with a predicate tag such as If-Match, If-Not-Match, If-Modified-Since, If-Unmodified-Since, etc., the client and the server can avoid shipping large pieces of data when updated data is not needed. </P>
+
+<P>The following entry scenarios show how Tuscany supports this form of caching throught ETags, Last-Modified, and other Header Commands.</P>
+
+<UL>
+	<LI>Posting new entry data to a feed<BR>
+  (Show entry data post request, item does not exist on server, server response code 200, return entry data body)</LI>
+	<LI>Updating existing entry data in a feed<BR>
+  (Show data update put, If-Match precondition, item is newer and matching, matching return code 412)</LI>
+	<LI>Requesting existing entry data<BR>
+  (Show get via ETag, If-None-Match precondition, modified entry data item, matching entry body returned)	</LI>
+	<LI>Requesting stale entry data<BR>
+  (Show get via ETAG, If-None-Match precondition, unmodified entry data item, not modified return code 304)</LI>
+	<LI>Requesting up-to-date entry data<BR>
+  (Show request via last-modified date, entry data is unmodified, Not modified return code 304)</LI>
+	<LI>Requesting out-of-date entry data<BR>
+  (Show request via last-modified date, entry data is modified, updated data is returned)</LI>
+</UL>
+
+
+<P>Tuscany provides a test case ProviderEntryEntityTagsTest.java in module binding.atom.abdera that validates these Entry caching scenarios via JTest. Additionally, the following Feed scenarios are provided in the test case ProviderFeedEntityTagsTest.java.</P>
+
+<UL>
+	<LI>Test feed basics<BR>
+   (Request Atom feed. Check that feed is non-null, has Id, title, and updated values. Check for Etag and Last-Modified headers)</LI>
+	<LI>Test Unmodified If-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-Match predicate in request header. Expect status 200 and feed body.)</LI>
+	<LI>Test Unmodified If-None-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-None-Match predicate in request header. Expect status 304, item not modified, no feed body.)</LI>
+	<LI>Test Unmodified If-Unmodified-Since predicate<BR>
+   (Request feed based on very current Last-Modified. Use If-Unmodified-Since predicate in request header. Expect status 304, item not modified, no feed body.)</LI>
+	<LI>Test Unmodified If-Modified-Since predicate<BR>
+   (Request feed based on very old Last-Modified. Use If-Modified-Since predicate in request header. Expect status 200, feed in body.)</LI>
+	<LI>Test Modified If-None-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-None-Match predicate in request header. Expect status 200, feed in body.)</LI>
+	<LI>Test Modified If-Match predicate<BR>
+   (Request feed based on existing ETag. Use If-Match predicate in request header. Expect status 412, precondition failed, no feed in body.)</LI>
+	<LI>Test Modified If-UnModified-Since predicate<BR>
+   (Request feed based on very recent Last-Mod date. Use If-Unmodified-Since predicate in request header. Expect status 304, no feed in body.)</LI>
+	<LI>Test Modified If-Modified-Since predicate<BR>
+   (Request feed based on very old Last-Mod date. Use If-Modified-Since predicate in request header. Expect status 200, feed in body.)</LI>
+</UL>
+
+
+<P>Support of Web 2.0 data caching via ETags and Last-Modified fields allow the Tuscany user to save bandwidth and re-requests of data. Especially in the area of content feeds which can have very large data objects, the ability to cache improves server performance and reduces network bottlenecks. A full end-to-end demonstration of this network savings is being created via Jira TUSCANY-2537 which will show caching in the feed aggregator sample.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforNegotiatedContentTypes"></A>Support for Negotiated Content Types</H4>
+
+<P>Requests for data now respond with negotiated content types. In other words, the requester can now state which content types are preferred, and the responder can provide different content types. The data preference is expressed in the request header &quot;Accept&quot; parameter.</P>
+
+<P>These data binding types are supported:</P>
+<UL>
+	<LI>Atom XML format (Request header Accept=application/atom+xml)</LI>
+	<LI>Atom in JSON format (Request header Accept=application/atom+json)</LI>
+</UL>
+
+
+<P>The following content types are requestable in different data bindings</P>
+<UL>
+	<LI>Atom entry data (MIME type application/atom+xxx;type=entry where xxx=xml or json)</LI>
+	<LI>Atom feed data (MIME type application/atom+xxx;type=feed where xxx=xml or json)</LI>
+</UL>
+
+
+<P>For example, the requester asks for an Atom entry with no Accept header or Accept header value is application/atom+xml. The returned response body contains:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Atom Entry response body as XML</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version='1.0' encoding='UTF-8'?&gt;
+&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>  &lt;title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;customer Fred Farkle&lt;/title&gt;
+  &lt;updated&gt;2008-08-08T18:40:30.484Z&lt;/updated&gt;
+  &lt;author&gt;
+    &lt;name&gt;Apache Tuscany&lt;/name&gt;
+  &lt;/author&gt;
+  &lt;content type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;Fred Farkle&lt;/content&gt;
+  &lt;id&gt;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&lt;/id&gt;
+  &lt;link href=<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN> rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN> /&gt;
+  &lt;link href=<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN> rel=<SPAN class="code-quote">&quot;alternate&quot;</SPAN> /&gt;
+&lt;/entry&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>In contrast, the requester asks for an Atom entry with Accept header value is application/atom+json. The returned response body contains:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Atom Entry response body as JSON</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{
+ <SPAN class="code-quote">&quot;id&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;title&quot;</SPAN>:<SPAN class="code-quote">&quot;customer Fred Farkle&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;content&quot;</SPAN>:<SPAN class="code-quote">&quot;Fred Farkle&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;updated&quot;</SPAN>:<SPAN class="code-quote">&quot;2008-08-08T18:40:30.484Z&quot;</SPAN>,
+ <SPAN class="code-quote">&quot;authors&quot;</SPAN>:[{
+   <SPAN class="code-quote">&quot;name&quot;</SPAN>:<SPAN class="code-quote">&quot;Apache Tuscany&quot;</SPAN>
+  }
+ ],
+ <SPAN class="code-quote">&quot;links&quot;</SPAN>:[{
+   <SPAN class="code-quote">&quot;href&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+   <SPAN class="code-quote">&quot;rel&quot;</SPAN>:<SPAN class="code-quote">&quot;edit&quot;</SPAN>
+  },{
+   <SPAN class="code-quote">&quot;href&quot;</SPAN>:<SPAN class="code-quote">&quot;urn:uuid:customer-91d349b3-4b8b-4cfa-b9e9-d999f9937085&quot;</SPAN>,
+   <SPAN class="code-quote">&quot;rel&quot;</SPAN>:<SPAN class="code-quote">&quot;alternate&quot;</SPAN>
+  }
+ ]
+}
+</PRE>
+</DIV></DIV> 
+
+<P>The ability to  view entires and feeds in multiple data formats allows the Tuscany user extreme flexibility in parsing and processing data returned by a service or collection.</P>
+
+<H4><A name="SCAJavabinding.atom-ServiceandWorkspaceDocumentSupport%28application%2Fatomsvcxml%29"></A>Service and Workspace Document Support (application/atomsvc+xml)</H4>
+
+<P>Prior to this implementation, there was a dummy service document provided when you visited an Atom feed service address with an &quot;atomsvc&quot; extension. For example, running the the Atom service binding unit tests, one could visit <A href="http://localhost:8080/customer/atomsvc" class="external-link" rel="nofollow">http://localhost:8080/customer/atomsvc</A> and receive the following service document:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany Atom Binding Dummy Service document</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;?xml version='1.0' encoding='UTF-8'?&gt;
+   &lt;service xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2007/app&quot;</SPAN> xmlns:atom=<SPAN class="code-quote">&quot;http://www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>      &lt;workspace&gt;
+         &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;resource&lt;/atom:title&gt;
+         &lt;collection href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//luck.ibm.com:8084/customer&quot;</SPAN>&gt;
+</SPAN>            &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;collection&lt;/atom:title&gt;
+            &lt;accept&gt;application/atom+xml;type=entry&lt;/accept&gt;
+            &lt;categories /&gt;
+         &lt;/collection&gt;
+      &lt;/workspace&gt;
+   &lt;/service&gt;
+</PRE>
+</DIV></DIV>
+<P>This dummy implementation did not provide a true collection name, URL to the collection, accept MIME types or categories.</P>
+
+<P>Following the inclusion of TUSCANY-2597 and the new implentation, the Tuscany Atom binding  will correctly populate an atomsvc document with information from the feed and give correct information for discovery. Now , running the the Atom service binding unit tests, one could visit <A href="http://localhost:8080/customer/atomsvc" class="external-link" rel="nofollow">http://localhost:8080/customer/atomsvc</A> and receive the following service document:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany Atom Binding Service document</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version='1.0' encoding='UTF-8'?&gt;
+&lt;service xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2007/app&quot;</SPAN> xmlns:atom=<SPAN class="code-quote">&quot;http://www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>  &lt;workspace xml:base=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/&quot;</SPAN>&gt;
+</SPAN>    &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;workspace&lt;/atom:title&gt;
+    &lt;collection href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/customer&quot;</SPAN>&gt;
+</SPAN>      &lt;atom:title type=<SPAN class="code-quote">&quot;text&quot;</SPAN>&gt;customers&lt;/atom:title&gt;
+      &lt;accept&gt;application/atom+xml; type=feed&lt;/accept&gt;
+      &lt;accept&gt;application/json; type=feed&lt;/accept&gt;
+      &lt;accept&gt;application/atom+xml; type=entry&lt;/accept&gt;
+      &lt;accept&gt;application/json; type=entry&lt;/accept&gt;
+      &lt;categories /&gt;
+    &lt;/collection&gt;
+  &lt;/workspace&gt;
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The service document is now properly populated with URLs, titles, accept MIME types and categories. These are elements that are needed for collection discovery and visitatin.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforfullJavaScriptAtomclient."></A>Support for full JavaScript Atom client.</H4>
+<P><A name="SCAJavabinding.atom-JavaScriptAtomClient"></A><BR>
+After creating and publishing your SCA service, it can be tedious converting to and from Atom Feeds and Entries on the client side. Tuscany provides a full JavaScript object model for Atom Feeds, Entries, and other data objects. This benefits customers and client developers by providing an easy model to use in HTML, JSP, scripts, GUIs, and other client side technology.</P>
+
+<P>For example, prior to this feature, developers would have to develop code in XML to manipulate nodes in the XML document that represented the current page:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany client side XML Document Manipulation (old style)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> entries = feed.getElementsByTagName(<SPAN class="code-quote">&quot;entry&quot;</SPAN>);              
+   <SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+   <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+      <SPAN class="code-keyword">var</SPAN> item = entries[i].getElementsByTagName(<SPAN class="code-quote">&quot;content&quot;</SPAN>)[0].firstChild.nodeValue;
+      list += item + ' &lt;br&gt;';
+   }
+</PRE>
+</DIV></DIV>
+
+<P>Using the new JavaScript client object model, the code is greatly simplified and easier to understand:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany client side JavaScript Atom Object Model (new style)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> entries = feed.getEntries();              
+   <SPAN class="code-keyword">var</SPAN> list = &quot;&quot;;
+   <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-keyword">var</SPAN> i=0; i&lt;entries.length; i++) {
+      <SPAN class="code-keyword">var</SPAN> item = entries[i].getContent();
+      list += item + ' &lt;br&gt;';
+   }
+</PRE>
+</DIV></DIV>
+
+<P>Additionally, the Tuscany Atom JavaScript client provides full deserialization and serialization to and from the JavaScript Atom model and its XML format. In other words let's say you create an HTML page that scrapes a data base and wants to submit the data as an entry to a collection of blog articles. You can create the Entry data using the JavaScript Entry model:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+       <SPAN class="code-keyword">var</SPAN> entry = <SPAN class="code-keyword">new</SPAN> Entry();
+       entry.setNamespace( <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN> );
+</SPAN>       entry.setTitle( <SPAN class="code-quote">&quot;Atom-Powered Robots Run Amok&quot;</SPAN> );
+       entry.setId( <SPAN class="code-quote">&quot;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&quot;</SPAN> );
+       entry.setUpdated( <SPAN class="code-quote">&quot;2003-12-13T18:30:02Z&quot;</SPAN> );
+       entry.setContent( <SPAN class="code-quote">&quot;Some text.&quot;</SPAN> );
+       entry.addAuthor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;John Doe&quot;</SPAN> ) );
+       entry.addAuthor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Mark Pilgrim&quot;</SPAN>, <SPAN class="code-quote">&quot;f8dy@example.com&quot;</SPAN> ));
+       entry.addContributor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Sam Ruby&quot;</SPAN> ));
+       entry.addContributor( <SPAN class="code-keyword">new</SPAN> Person( <SPAN class="code-quote">&quot;Joe Gregorio&quot;</SPAN> ));
+       entry.addLink( <SPAN class="code-keyword">new</SPAN> Link( <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/edit/first-post.atom&quot;</SPAN>, <SPAN class="code-quote">&quot;edit&quot;</SPAN> ));</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Now to convert this code to XML and submit it to a site is easy using the Tuscany Atom JavaScript client:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+       <SPAN class="code-keyword">var</SPAN> text = entry.toXML();
+</PRE>
+</DIV></DIV>
+
+<P>The text string now contains the fully serialized XML format of the Entry object</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+      <SPAN class="code-quote">&quot;&lt;?xml version=&quot;</SPAN>1.0&quot;?&gt;
+      &lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>        &lt;title&gt;Atom-Powered Robots Run Amok&lt;/title&gt;
+        &lt;id&gt;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&lt;/id&gt;
+        &lt;updated&gt;2003-12-13T18:30:02Z&lt;/updated&gt;
+        &lt;author&gt;&lt;name&gt;John Doe&lt;/name&gt;&lt;/author&gt;
+        &lt;content&gt;Some text.&lt;/content&gt;
+        &lt;link rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN> href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/edit/first-post.atom&quot;</SPAN>/&gt;
+</SPAN>      &lt;/entry&gt;&quot;
+</PRE>
+</DIV></DIV>
+
+<P>Similarly the Tuscany Atom JavaScript client contains methods for deserializing from XML reperesentations to a JavaScript Atom model:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-keyword">var</SPAN> feed = <SPAN class="code-keyword">new</SPAN> Feed();
+   feed.readFromXML( xmlString );
+</PRE>
+</DIV></DIV>
+
+<P>A full example showing how to use this client model is given in implementation-widgets-runtime. The store.html page shows the older style of document XML manipulation. The storeJS.html page shows the newer style of JavaScript object manipulation.</P>
+
+<H4><A name="SCAJavabinding.atom-SupportforPostingandPuttingMediaItems"></A>Support for Posting and Putting Media Items</H4>
+<P>The Atom Publishing Protocol provides for a separate space for storage of media resources. The purpose of a separate space for these resources is to keep feeds and entries from growing too large with the contents of typically large items. Media resources can be any binary object that is supported by a MIME type, but typically media resources include video, image, and audio type files.</P>
+
+<P>Media resources are maintained by the collection implementor, and are given a dual identity. There is a location in the media respository, typically where one places the media files, and there is a location in the feed or entry space. This second reference is known as a media link entry.</P>
+
+<P>The Tuscany package at org.apache.tuscany.sca.binding.atom.collection (in tuscany-binding-atom-abdera package) has the following interface for MediaCollection:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Tuscany MediaCollection interface</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   /**
+     * Creates a <SPAN class="code-keyword">new</SPAN> media entry
+     * 
+     * @param title
+     * @param slug
+     * @param contentType
+     * @param media
+     */
+    Entry postMedia(<SPAN class="code-object">String</SPAN> title, <SPAN class="code-object">String</SPAN> slug, <SPAN class="code-object">String</SPAN> contentType, InputStream media);
+
+    /**
+     * Update a media entry.
+     * 
+     * @param id
+     * @param contentType
+     * @param media
+     * @<SPAN class="code-keyword">return</SPAN>
+     */
+    void putMedia(<SPAN class="code-object">String</SPAN> id, <SPAN class="code-object">String</SPAN> contentType, InputStream media) <SPAN class="code-keyword">throws</SPAN> NotFoundException;
+</PRE>
+</DIV></DIV>
+
+<P>These two methods are used to create (post) new media files, and update (put) new media information and edits. The media resources may be retrieved (get) or removed (delete) via the normal HTTP get and delete operations and the links returned by the post and get methods.</P>
+
+<P>For instance, when creating a media resource, one typically posts the following information via an HTTP post request:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Requesting New Media Creation (postMedia method invoke)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+POST /edit/ HTTP/1.1
+Host: media.example.org
+Content-Type: image/png
+Slug: The Beach
+Authorization: Basic ZGFmZnk6c2VjZXJldA==
+Content-Length: nnn
+...binary data...
+</PRE>
+</DIV></DIV>
+
+<P>In turn, the Tuscany invocation framework invokes the postMedia shown above on the media collection implementation. The media collection implementation may then take the binary data from the media InputStream and store it to a media repository. The media collection implemenation should construct a proper Entry item via XML construction or some Atom model framework such as Apache Abdera. The Entry should contain the required elements (title, id, updated, summary, content, edit link, edit-media link) in order to provide the proper Atom Pub Protocol return headers and Entry data as given here:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Affirming New Media Creation (postMedia method return)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+HTTP/1.1 201 Created
+Content-Length: nnn
+Content-Type: application/atom+xml;type=entry;charset=<SPAN class="code-quote">&quot;utf-8&quot;</SPAN>
+Location: http:<SPAN class="code-comment">//example.org/media/edit/the_beach.atom
+</SPAN>&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN>?&gt;
+&lt;entry xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2005/Atom&quot;</SPAN>&gt;
+</SPAN>   &lt;title&gt;The Beach&lt;/title&gt;
+   &lt;id&gt;urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a&lt;/id&gt;
+   &lt;updated&gt;2005-10-07T17:17:08Z&lt;/updated&gt;
+   &lt;author&gt;&lt;name&gt;Daffy&lt;/name&gt;&lt;/author&gt;
+   &lt;summary type=<SPAN class="code-quote">&quot;text&quot;</SPAN> /&gt;
+   &lt;content type=<SPAN class="code-quote">&quot;image/png&quot;</SPAN>
+      src=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//media.example.org/the_beach.png&quot;</SPAN>/&gt;
+</SPAN>   &lt;link rel=<SPAN class="code-quote">&quot;edit-media&quot;</SPAN>
+      href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//media.example.org/edit/the_beach.png&quot;</SPAN> /&gt;
+</SPAN>   &lt;link rel=<SPAN class="code-quote">&quot;edit&quot;</SPAN>
+      href=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//example.org/media/edit/the_beach.atom&quot;</SPAN> /&gt;
+</SPAN>&lt;/entry&gt; 
+</PRE>
+</DIV></DIV>
+
+<P>Note that the edit link provides the Atom Feed link to the media entry, and the edit-media link provides the media repository link to the media entry. Use these links to get and delete media.</P>
+
+<P>A special convention has been implemented to allow the media collection implementation to return properties in the response header. The summary element of the Entry returned may contain a set of key=value properties separated via commas. For example, in order to provide return Content-Type and Content-Length values in the response header, one can created this text in the postMedia Entry summary element: <TT>Content-Type=image/jpg,Content-Length=21642</TT>.</P>
+
+<P>The putMedia method acts in much the same way, but the URI to the item should contain an ID to the media being updated. For instance, if the usual post and get feed URI is <TT><A href="http://localhost:8084/receipt" class="external-link" rel="nofollow">http://localhost:8084/receipt</A></TT>, then to update the media given above one would put to the URI <TT><A href="http://localhost:8084/receipt/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" class="external-link" rel="nofollow">http://localhost:8084/receipt/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</A></TT>. Here is an example of a put request:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Requesting Media Update (putMedia method invoke)</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+PUT /edit/urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a HTTP/1.1
+Host: media.example.org
+Content-Type: image/png
+Authorization: Basic ZGFmZnk6c2VjZXJldA==
+Content-Length: nnn 
+...binary data...
+</PRE>
+</DIV></DIV>
+
+<P>After the above put request, the Atom binding will invoke the media collection implementation putMedia method. The media collection should update the media if the ID exists (and a 200 OK status code will return), or the media collection should throw a NotFoundException if the ID does not exist (and a 404 not found status code will return).</P>
+
+<P>The above scenarios are documents in the MediaCollectionTestCase unit test case in the binding-atom-abdera module in the Tuscany code base.</P>
+
+<H3><A name="SCAJavabinding.atom-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.atom-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.atom-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingcorba.html b/site/trunk/site-publish/sca-java-bindingcorba.html
new file mode 100644
index 0000000000..511ff7a69b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingcorba.html
@@ -0,0 +1,441 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.corba</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91234">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.corba">SCA Java binding.corba</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.corba-%3Cbinding.corba%3E"></A>&lt;binding.corba&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports CORBA using the &lt;binding.corba&gt; SCDL extension. New CORBA based service can be provided using a &lt;binding.corba&gt; element within a SCA &lt;service&gt;, existing CORBA object can be accessed using a &lt;binding.corba&gt; element within a SCA &lt;reference&gt;.</P>
+<UL>
+	<LI><A href="#SCAJavabinding.corba-Location"><B>Configuring CORBA service/reference</B></A></LI>
+	<LI><A href="#SCAJavabinding.corba-ProvidingInterface"><B>Providing interface</B></A></LI>
+	<LI><A href="#SCAJavabinding.corba-ArraysUnions"><B>CORBA arrays and unions mapping</B></A></LI>
+	<LI><A href="#SCAJavabinding.corba-MethodMapping"><B>Methods to operations mapping</B></A></LI>
+	<LI><A href="#SCAJavabinding.corba-IdAttribute"><B>Usage of additional &quot;id&quot; attribute in CORBA service bindings</B></A></LI>
+	<LI><A href="#SCAJavabinding.corba-Hosts"><B>Host environment types</B></A></LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.corba-UsingCORBAbinding"></A>Using CORBA binding</H3>
+
+<P><A name="SCAJavabinding.corba-Location"></A></P>
+
+<H4><A name="SCAJavabinding.corba-ConfiguringCORBAservice%2Freference"></A>Configuring CORBA service/reference</H4>
+
+<P>Location for both service and reference CORBA binding can be configured by:</P>
+
+<P>1. <B>Name</B>, <B>host</B>, <B>port</B> parameters, where <B>host</B> and <B>port</B> points to name service, and <B>name</B> points to object within name service.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example service declaration:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;service name=<SPAN class="code-quote">&quot;ScenarionOneServiceGenerated&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ScenarionOneServiceGenerated&quot;</SPAN>&gt;
+
+    &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations&quot;</SPAN>/&gt;
+
+    &lt;tuscany:binding.corba host=<SPAN class="code-quote">&quot;localhost&quot;</SPAN> port=<SPAN class="code-quote">&quot;5060&quot;</SPAN> name=<SPAN class="code-quote">&quot;ScenarioOne/TuscanyGenerated&quot;</SPAN>/&gt;
+
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+<P>2. Corbaname URI.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example reference declaration:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;reference name=<SPAN class="code-quote">&quot;scenarioOne&quot;</SPAN>&gt;
+
+    &lt;tuscany:binding.corba uri=<SPAN class="code-quote">&quot;corbaname::localhost:5060#NamedWithURI&quot;</SPAN>/&gt;
+
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+<P><A name="SCAJavabinding.corba-ProvidingInterface"></A></P>
+
+<H4><A name="SCAJavabinding.corba-Providinginterface"></A>Providing interface</H4>
+
+<P>For both service and reference side you can use one of two types of Java interface:</P>
+
+<P>1. Generated by idlj compiler from &#42;.idl file.</P>
+
+<P>2. Created by user according to rules for Java to CORBA mapping.</P>
+
+<P>In both cases interfaces are almost the same. Difference is that generated interfaces extends/implements CORBA types which are ignored by binding. Mapping rules are available under: <A href="http://www.omg.org/docs/formal/08-01-14.pdf" class="external-link" rel="nofollow">Java2IDL</A>, <A href="http://www.omg.org/docs/formal/08-01-11.pdf" class="external-link" rel="nofollow">IDL2Java</A>. Samples of CORBA bindings can be found in <B>sca/itest/corba</B> module.<BR>
+&nbsp;</P>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Overloading, case collisions</B><BR>When using Tuscany service/reference binding to communicate with traditional CORBA objects:
+
+<P>1. Don't overload method names in Java interface.</P>
+
+<P>2. Don't create methods with names which differs only by case, ie. you shouldn't declare both methods: caseSensitive() and CaseSensitive().</P>
+
+<P>You can ignore above rules if you are using Tuscany CORBA binding&nbsp; to communicate with other Tuscany CORBA binding. Those constraints results from differences between IDL and Java. More details can be found in <A href="#SCAJavabinding.corba-MethodMapping"><B>Method/operation mapping rules</B></A> section.</P></TD></TR></TABLE></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Declaring exceptions</B><BR>Exceptions declared by user should be named to match remote exception ID.
+
+<P>Example: if in reference binding remote object throws exception with ID &quot;IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0&quot; then you should declare exception class named &quot;org.apache.tuscany.sca.test.corba.generated.WrongColor&quot;.</P>
+
+<P>The same in service bindings. SCA component exception will be thrown with ID created from Java name.</P></TD></TR></TABLE></DIV>
+<P><A name="SCAJavabinding.corba-ArraysUnions"></A></P>
+
+<H4><A name="SCAJavabinding.corba-CORBAarraysandunionsmapping"></A>CORBA arrays and unions mapping</H4>
+
+<P>CORBA arrays and unions cannot be directly mapped so additional metadata should be used.</P>
+
+<P><B>1. Arrays mapping</B></P>
+
+<P>To declare CORBA array you should declare Java array and annotate it by <B>org.apache.tuscany.sca.binding.corba.meta.CorbaArray</B> annotation.</P>
+
+<P>Annotation <B>org.apache.tuscany.sca.binding.corba.meta.CorbaArray</B> has one default attribute (array of integers) which declares lengths of following array dimensions. Objects you can annotate are:</P>
+<UL>
+	<LI>binding interface methods arguments</LI>
+	<LI>binding interface methods, which will refer to return type</LI>
+	<LI>structure fields</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"><SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> SampleInterface {
+
+    @CorbaArray( {2, 2}) <SPAN class="code-comment">// <SPAN class="code-keyword">this</SPAN> annotation makes <SPAN class="code-keyword">return</SPAN> array to be CORBA array
+</SPAN>    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN>[][] passStringArray(@CorbaArray( {2, 2})<SPAN class="code-object">String</SPAN>[][] arg); <SPAN class="code-comment">// <SPAN class="code-keyword">this</SPAN> annotation makes mehods argument to be CORBA array
+</SPAN>
+}
+</PRE>
+</DIV></DIV>
+<P>&nbsp;You can also annotate fields in CORBA structures.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"><SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">final</SPAN> class SampleStruct {
+
+    @CorbaArray( {2, 2}) <SPAN class="code-comment">// following field is two dimensional CORBA array, which has 2 elements in both first and second dimension
+</SPAN>    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN>[][] stringArray;
+
+    <SPAN class="code-keyword">public</SPAN> SampleStruct() {
+
+    }
+
+    <SPAN class="code-keyword">public</SPAN> SampleStruct(<SPAN class="code-object">String</SPAN>[][] stringArray) {
+        <SPAN class="code-keyword">this</SPAN>.stringArray = stringArray;
+    }
+
+}
+</PRE>
+</DIV></DIV>
+<P><B>2. Unions mapping</B></P>
+
+<P>To declare CORBA union you should create final Java class which contains:</P>
+<UL>
+	<LI>private field for every union option</LI>
+	<LI>private field of int, which will be discriminator</LI>
+</UL>
+
+
+<P>Union options as well as discriminator should be annotated with <B>org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement</B>, which has two attributes:</P>
+<UL>
+	<LI>CorbaUnionElementType type(), which can take following values:
+	<UL>
+		<LI>CorbaUnionElementType.option for member, additional optionNumber attribute is required</LI>
+		<LI>CorbaUnionElementType.defaultOption for default union member</LI>
+		<LI>CorbaUnionElementType.discriminator for discriminator field</LI>
+	</UL>
+	</LI>
+	<LI>int optionNumber() - can be used only with CorbaUnionElementType.option</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example:</P>
+
+<P>Following IDL declaration:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">union SampleUnion <SPAN class="code-keyword">switch</SPAN> (<SPAN class="code-object">long</SPAN>) {
+    <SPAN class="code-keyword">case</SPAN> 1: <SPAN class="code-object">long</SPAN> x;
+    <SPAN class="code-keyword">case</SPAN> 2: <SPAN class="code-object">float</SPAN> y;
+    <SPAN class="code-keyword">default</SPAN>: string z;
+};
+</PRE>
+</DIV></DIV>
+<P>is equal to Tuscany CORBA binding declaration:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"><SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement;
+<SPAN class="code-keyword">import</SPAN> org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType;
+
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">final</SPAN> class SampleUnion {
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
+    <SPAN class="code-comment">// <SPAN class="code-keyword">this</SPAN> is union member, id = 1
+</SPAN>    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">int</SPAN> x;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
+    <SPAN class="code-comment">// <SPAN class="code-keyword">this</SPAN> is union member, id = 2
+</SPAN>    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">float</SPAN> y;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
+    <SPAN class="code-comment">// <SPAN class="code-keyword">this</SPAN> is <SPAN class="code-keyword">default</SPAN> union member
+</SPAN>    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> z;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">int</SPAN> discriminator;
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">int</SPAN> getX() {
+        <SPAN class="code-keyword">return</SPAN> x;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setX(<SPAN class="code-object">int</SPAN> x) {
+        discriminator = 1;
+        <SPAN class="code-keyword">this</SPAN>.x = x;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getY() {
+        <SPAN class="code-keyword">return</SPAN> y;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setY(<SPAN class="code-object">float</SPAN> y) {
+        discriminator = 2;
+        <SPAN class="code-keyword">this</SPAN>.y = y;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">float</SPAN> getZ() {
+        <SPAN class="code-keyword">return</SPAN> z;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setZ(<SPAN class="code-object">float</SPAN> z) {
+        discriminator = -1;
+        <SPAN class="code-keyword">this</SPAN>.z = z;
+    }
+
+}
+</PRE>
+</DIV></DIV>
+<P>&nbsp;<A name="SCAJavabinding.corba-MethodMapping"></A></P>
+
+<H4><A name="SCAJavabinding.corba-Method%2Foperationmappingrules"></A>Method/operation mapping rules</H4>
+
+<P>IDL rules are different than rules in Java programming language - Java method names can't be always directly mapped to CORBA operations. Following table shows used mapping rules:</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Mapping type <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Description&nbsp; <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Examples: Java method - translated CORBA operation </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> 1. Getters and setters <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> If user declared valid pair of getter and setter then those methods wouldbe translated to operations which are responsible for getting/setting objects attribute. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> 1. getName() - &#95;get_name <BR class="atl-forced-newline">
+2. setName(String newName) - &#95;set_name <BR class="atl-forced-newline">
+3. isName() - &#95;get_name&nbsp; </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 2. Overloaded names <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> CORBA does not support overloading method names - Java does.. Some mapping rules were applied to allow using overloaded names in Java interfaces using CORBA binding. Final operation name is created by taking method name and appending it by CORBA parameters type names separated by '_' chars. <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> 1. overloadedMethod() - overloadedMethod_&#95; <BR class="atl-forced-newline">
+2. overloadedMethod(String arg1) - overloadedMethod__CORBA_WStringValue <BR class="atl-forced-newline">
+3. overloadedMethod(String arg1, int arg2) - overloadedMethod&#95;<EM>CORBA_WStringValue</EM>&#95;long </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> 3. Names with case collisions </TD>
+<TD class="confluenceTd"> CORBA is not case sensitive - Java is. CORBA ie. doesn't distinguish methods caseDifferent() and CaseDifferent(), so some mapping rules are fixing it. Final operation name is created by taking method name and appending it by indexes of characters which are capitals. </TD>
+<TD class="confluenceTd"> 1. caseDifferent() - caseDifferent_4 <BR class="atl-forced-newline">
+2. CaseDifferent() - CaseDifferent_0_4 </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+<P><A name="SCAJavabinding.corba-IdAttribute"></A></P>
+
+<H4><A name="SCAJavabinding.corba-Usageofadditional%22id%22attributeinCORBAservicebindings"></A>Usage of additional &quot;id&quot; attribute in CORBA service bindings</H4>
+
+<P>User can also provide <B>id</B> attribute for service binding. It's not required, but helpfull if we want to publish service which will be consumed by some idlj generated code. This generated code contains &#42;Helper classes with narrow(...) methods. Narrow(...) method compares obtained CORBA reference ID to some local (which was generated). CORBA service binding provide this ID automatically basing on user provided Java interface name. Providing <B>id</B> attribute is the only way to provide custom identifier.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Example of using &quot;id&quot; attribute:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;service name=<SPAN class="code-quote">&quot;ScenarionOneServiceGenerated&quot;</SPAN> promote=<SPAN class="code-quote">&quot;ScenarionOneServiceGenerated&quot;</SPAN>&gt;
+
+    &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations&quot;</SPAN>/&gt;
+
+    &lt;tuscany:binding.corba host=<SPAN class="code-quote">&quot;localhost&quot;</SPAN> port=<SPAN class="code-quote">&quot;5060&quot;</SPAN> name=<SPAN class="code-quote">&quot;ScenarioOneTuscanyGenerated&quot;</SPAN>
+                           id=<SPAN class="code-quote">&quot;IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0&quot;</SPAN>/&gt;
+
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+<P><A name="SCAJavabinding.corba-Hosts"></A></P>
+
+<H3><A name="SCAJavabinding.corba-Hostenvironmenttypes"></A>Host environment types</H3>
+
+<P>CORBA binding supports two hosting environments.</P>
+
+<H4><A name="SCAJavabinding.corba-hostcorbajse"></A>host-corba-jse</H4>
+
+<P>It is the standalone hosting environment where various ORBs could be used. Note that you have to provide name service by yourself and configure service/reference to point onto desired ORB.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Usage: add <B>tuscany-host&#45;</B><B>jse</B><B>&#45;&lt;version&gt;.jar</B> module to your class path.</P>
+
+<H4><A name="SCAJavabinding.corba-hostcorbajsetns"></A>host-corba-jse-tns</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0">&nbsp; Not available in official Apache Tuscany release</P>
+
+
+<P>This hosting environment extends <B>host-corba-jse</B>. For every configured service CORBA binding which points to localhost Transient Name Service will be created and name servers for bindings using the same port will be shared.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Usage: add <B>tuscany-host-jse-tns-&lt;version&gt;.jar</B> module to your class path.</P>
+
+<H4><A name="SCAJavabinding.corba-hostcorbajee"></A>host-corba-jee</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0">&nbsp; Not available in official Apache Tuscany release</P>
+
+
+<P>It is the JEE application server environment. In this case ORB is obtained from JNDI by <B>java:comp/ORB</B> name and you don't need to provide name service. Also <B>host</B> and <B>port</B> (or their equivalent contained in corbaname URI) parameters are ignored.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Usage: add <B>tuscany-host-jee-&lt;version&gt;.jar</B> module to your class path.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingejb.html b/site/trunk/site-publish/sca-java-bindingejb.html
new file mode 100644
index 0000000000..322d0382c6
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingejb.html
@@ -0,0 +1,211 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.ejb</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66256">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ejb">SCA Java binding.ejb</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.ejb-%3Cbinding.ejb%3E"></A>&lt;binding.ejb&gt;</H3>
+
+<P>Tuscany provides the reference-side support for the <A href="http://www.osoa.org/download/attachments/35/SCA_EJBSessionBeanBinding_V100.pdf?version=1" class="external-link" rel="nofollow">SCA EJB Session Bean Binding V1.00</A>. It allows SCA components to access existing stateless session beans.</P>
+
+<H3><A name="SCAJavabinding.ejb-TheXMLconfigutation"></A>The XML configutation</H3>
+
+<P>To access a stateless session, the uri attribute of the &lt;binding.ejb&gt; element needs to be be configured with a JNDI name. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.ejb uri=<SPAN class="code-quote">&quot;corbaname:iiop:1.2@localhost:1050#BrokerServiceBean&quot;</SPAN> /&gt; 
+</PRE>
+</DIV></DIV>
+
+<P>Depending on which enviroment the SCA components are hosted, various styles of the JNDI names can be supported:</P>
+<UL>
+	<LI>relative JNDI</LI>
+	<LI>java:comp/env/&lt;ejb-ref&gt;</LI>
+	<LI>corbaname JNDI</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.ejb-Someexamples"></A>Some examples</H3>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN> name=<SPAN class="code-quote">&quot;account&quot;</SPAN>&gt;
+</SPAN>    &lt;component name=<SPAN class="code-quote">&quot;AccountDataServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;bigbank.accountdata.AccountDataServiceImpl&quot;</SPAN> /&gt; 
+        &lt;reference name=<SPAN class="code-quote">&quot;brokerService&quot;</SPAN>&gt;
+            &lt;binding.ejb uri=<SPAN class="code-quote">&quot;corbaname:iiop:1.2@localhost:1050#BrokerServiceBean&quot;</SPAN> /&gt; 
+        &lt;/reference&gt;
+  &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The open-ejb deployment descriptor</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;openejb-jar xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.openejb.org/xml/ns/openejb-jar-2.1&quot;</SPAN>&gt;
+</SPAN>    ...
+    &lt;enterprise-beans&gt;
+        &lt;session&gt;
+            &lt;ejb-name&gt;BrokerServiceBean&lt;/ejb-name&gt;
+            &lt;jndi-name&gt;BrokerServiceBean&lt;/jndi-name&gt;
+            &lt;tss-link&gt;IdentityTokenNoSecurity&lt;/tss-link&gt;
+        &lt;/session&gt;    
+    &lt;/enterprise-beans&gt;
+    ...
+&lt;/openejb-jar&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Integration with Geronimo 2.0.1</B><BR>Make sure org.apache.geronimo.configs/openejb-corba-deployer/2.0-SNAPSHOT/car is started. <BR>
+Look under System Modules in Admin Console. This module is required to support CORBA Naming.</TD></TR></TABLE></DIV>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingerlang.html b/site/trunk/site-publish/sca-java-bindingerlang.html
new file mode 100644
index 0000000000..9fa720421e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingerlang.html
@@ -0,0 +1,494 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.erlang</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=118627">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.erlang">SCA Java binding.erlang</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.erlang-%3Cbinding.erlang%3E"></A>&lt;binding.erlang&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports Erlang using the &lt;binding.erlang&gt; SCDL extension. New Erlang based service can be provided using a &lt;binding.erlang&gt; element within a SCA &lt;service&gt;, existing Erlang object can be accessed using a &lt;binding.erlang&gt; element within a SCA &lt;reference&gt;.</P>
+<UL>
+	<LI><A href="#SCAJavabinding.erlang-using"><B>Using Erlang binding</B></A>
+	<UL>
+		<LI><A href="#SCAJavabinding.erlang-requirements"><B>Requirements</B></A></LI>
+		<LI><A href="#SCAJavabinding.erlang-configuration"><B>Binding configuration</B></A></LI>
+		<LI><A href="#SCAJavabinding.erlang-interface"><B>Declaring interface</B></A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavabinding.erlang-messaging"><B>Details of message based RPC</B></A></LI>
+	<LI><A href="#SCAJavabinding.erlang-Exceptions"><B>Exceptions</B></A></LI>
+	<LI><A href="#SCAJavabinding.erlang-Samples"><B>Samples</B></A></LI>
+</UL>
+
+
+<P><A name="SCAJavabinding.erlang-using"></A></P>
+
+<H2><A name="SCAJavabinding.erlang-UsingErlangbinding"></A>Using Erlang binding</H2>
+
+<P>Basically SCA services can be exposed in two ways:</P>
+<UL>
+	<LI>by Erlang <B>RPC</B> mechanism. In this case SCA component would act as Erlang module containing functions, based on components operations names.</LI>
+	<LI>by RPC realised using Erlang <B>messaging</B>. In this case for every operation named Erlang message box would be created - name of the box will correspond to operation name. After receiving message from Erlang node appropriate components operation will be invoked and result would be sent back to sender.</LI>
+</UL>
+
+
+<P>Similarly, SCA references can access Erlang modules in two ways:</P>
+<UL>
+	<LI>using <B>RPC</B> mechanism. In this case SCA reference would be mapped to remote Erlang functions module, each operation would correspond to different function, basing on its name.</LI>
+	<LI>by RPC realised using Erlang <B>messaging</B>. In this case invoking operation on reference would cause sending Erlang message to named Erlang process - name would be the same as operation name. If operation has return value then return message will be expected.</LI>
+</UL>
+
+
+<P><A name="SCAJavabinding.erlang-requirements"></A></P>
+
+<H4><A name="SCAJavabinding.erlang-Requirements"></A>Requirements</H4>
+
+<P>Erlang binding is available since Apache Tuscany SCA Java 1.6, <B>source distribution only</B>. To use Erlang binding module you need to build Apache Tuscany by your own, please follow instructions contained in <B>BUILDING</B> file which can be found in source distribution root directory.</P>
+
+<P>Erlang nodes need to communicate with <B>Erlang Port Mapper Daemon (EPMD)</B> which should be run locally. To run JUnit tests and samples for Tuscany Erlang modules you <B>need to have epmd binary</B> in your system path - epmd comes with Erlang/OTP distribution. See <A href="http://erlang.org/" class="external-link" rel="nofollow">http://erlang.org</A> for downloads.</P>
+
+<P>Erlang samples and JUnit tests inside Tuscany spawns epmd process automatically, but if you are creating your own solution using Erlang binding <B>you need to provide running epmd process</B>.</P>
+
+<P><A name="SCAJavabinding.erlang-configuration"></A></P>
+
+<H4><A name="SCAJavabinding.erlang-Bindingconfiguration"></A>Binding configuration</H4>
+
+<P>Binding configuration can take several attributes:</P>
+<UL>
+	<LI><B>node</B> &#45; name of the local (service side) or remote (reference side) Erlang node. Tuscany creates separate Erlang node for each service binding, so remember to provide unique node name for every service binding.</LI>
+	<LI><B>module</B> &#45; specifies name of the module mapped to SCA component/reference. When using this attribute you can't use mbox=&quot;true&quot; attribute.</LI>
+	<LI><B>mbox</B> &#45; specifies whether binding would be realised using messaging based RPC (&quot;true&quot;) or built-in Erlang RPC (&quot;false&quot;). Default (no value specified) is &quot;false&quot;. When using mbox=&quot;true&quot; you can't use module attribute.</LI>
+	<LI><B>cookie</B> &#45; (optional) authentication token. Communicating nodes should have the same cookies. You can also provide cookie in .erlang.cookie file in users home directory (it's originally supported by Jinterface).</LI>
+	<LI><B>timeout</B> &#45; (optional) specifies timeout (in milliseconds) for inactive connections. Timeouts will be disabled if attribute value is 0 or not provided.</LI>
+	<LI><B>serviceThreadPool</B> &#45; (optional) for service side bindings only. Specifies maximum number of threads which will be handling clients. Default value is 20.</LI>
+</UL>
+
+
+<H5><A name="SCAJavabinding.erlang-Serviceconfigurationsamples"></A>Service configuration samples</H5>
+
+<P><B>Sample based on RPC</B></P>
+
+<P>Following sample exposes component as Erlang module named &quot;HelloModule&quot;. Modules functions would be the same as in service interface - helloworld.HelloWorld. Node which will host this module will be named &quot;HelloNodeModule&quot;.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+
+    &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorld&quot;</SPAN>/&gt;
+
+    &lt;tuscany:binding.erlang node=<SPAN class="code-quote">&quot;HelloNodeModule&quot;</SPAN> module=<SPAN class="code-quote">&quot;HelloModule&quot;</SPAN>/&gt;
+
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+<P><B>Sample based on messaging</B></P>
+
+<P>Following sample exposes component as several message boxes - each box will correspond to each component operation. Node which will host those message boxes will be named &quot;HelloNodeMbox&quot;.<BR>
+Additional attributes are used:</P>
+<UL>
+	<LI>cookie for authentication purposes - &quot;secret string&quot;</LI>
+	<LI>timeout (1 second) for disconnecting hanging clients</LI>
+	<LI>number of threads that handles clients (serviceThreadPool attribute) is set to 10.</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+
+    &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorld&quot;</SPAN>/&gt;
+
+    &lt;tuscany:binding.erlang node=<SPAN class="code-quote">&quot;HelloNodeMbox&quot;</SPAN> mbox=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">true</SPAN>&quot;</SPAN> cookie=<SPAN class="code-quote">&quot;secret string&quot;</SPAN> timeout=<SPAN class="code-quote">&quot;1000&quot;</SPAN> serviceThreadPool=<SPAN class="code-quote">&quot;10&quot;</SPAN>/&gt;
+
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<H5><A name="SCAJavabinding.erlang-Referenceconfigurationsamples"></A>Reference configuration samples</H5>
+
+<P><B>Sample based on RPC</B></P>
+
+<P>Following sample uses remote Erlang module as reference. Configuration points to module named &quot;HelloModule&quot;, hosted on &quot;HelloNodeModule&quot;.<BR>
+Additional attributes are used:</P>
+<UL>
+	<LI>cookie for authentication purposes - &quot;secret string&quot;</LI>
+	<LI>timeout (1 second) for quitting from hanging server</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;reference name=<SPAN class="code-quote">&quot;helloWorldReference&quot;</SPAN>&gt;
+
+    &lt;tuscany:binding.erlang node=<SPAN class="code-quote">&quot;HelloNodeModule&quot;</SPAN> module=<SPAN class="code-quote">&quot;HelloModule&quot;</SPAN> cookie=<SPAN class="code-quote">&quot;secret string&quot;</SPAN> timeout=<SPAN class="code-quote">&quot;1000&quot;</SPAN>/&gt;
+
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+<P><B>Sample based on messaging</B></P>
+
+<P>Following sample uses remote Erlang message boxes in RPC style. Message boxes with names the same as reference operations are available on &quot;HelloNodeMbox&quot;.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;reference name=<SPAN class="code-quote">&quot;helloWorldReference&quot;</SPAN>&gt;
+
+    &lt;tuscany:binding.erlang node=<SPAN class="code-quote">&quot;HelloNodeMbox&quot;</SPAN> mbox=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">true</SPAN>&quot;</SPAN>/&gt;
+
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+<P><A name="SCAJavabinding.erlang-interface"></A></P>
+
+<H4><A name="SCAJavabinding.erlang-Declaringinterface"></A>Declaring interface</H4>
+
+<P>Following table describes mapping used between Java and Erlang types.</P>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Java type </TH>
+<TH class="confluenceTh"> Erlang type </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> byte, short, char, int, long </TD>
+<TD class="confluenceTd"> number - Erlang does not distinguish numbers size </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> float, double </TD>
+<TD class="confluenceTd"> Double - Erlang does not distinguish floating numbers size </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> String </TD>
+<TD class="confluenceTd"> Array of characters </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> String annotated with @ErlangAtom (package org.apache.tuscany.sca.binding.erlang.meta) </TD>
+<TD class="confluenceTd"> Atom </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> array </TD>
+<TD class="confluenceTd"> List </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> User defined class with pubic no argument constructor and public fields of type from this table. </TD>
+<TD class="confluenceTd"> Tuple </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H5><A name="SCAJavabinding.erlang-Atomssample"></A>Atoms sample</H5>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> SomeInterface {
+
+  <SPAN class="code-comment">// Returns user defined class - tuple
+</SPAN>  TupleClass operation1();
+
+  <SPAN class="code-comment">// Returns list of characters and takes list of characters as an argument
+</SPAN>  <SPAN class="code-object">String</SPAN> operation2(<SPAN class="code-object">String</SPAN> argument);
+
+  <SPAN class="code-comment">// Returns atom and takes atom as an argument
+</SPAN>  @ErlangAtom
+  <SPAN class="code-object">String</SPAN> operation3(@ErlangAtom <SPAN class="code-object">String</SPAN> argument);
+
+  <SPAN class="code-comment">// Returns list of atoms
+</SPAN>  @ErlangAtom
+  <SPAN class="code-object">String</SPAN>[] operation4();
+
+}
+
+
+<SPAN class="code-comment">// Java class represents tuple which contains atom and list of characters.
+</SPAN><SPAN class="code-keyword">public</SPAN> class TupleClass {
+
+  @EralngAtom
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> atom;
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> notAtom;
+
+}
+</PRE>
+</DIV></DIV>
+
+<H5><A name="SCAJavabinding.erlang-Tuplessample"></A>Tuples sample</H5>
+
+<P>Following interface:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class TupleClass1 {
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">long</SPAN> field1;
+  <SPAN class="code-keyword">public</SPAN> TupleClass2 field2;
+
+}
+
+<SPAN class="code-keyword">public</SPAN> class TupleClass2 {
+
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">long</SPAN> field1;
+  <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">double</SPAN> field2;
+
+}
+</PRE>
+</DIV></DIV>
+<P>will correspond to live tuple structure (using Erlang notation):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{10, {10, 0.9}}
+</PRE>
+</DIV></DIV>
+
+<P><A name="SCAJavabinding.erlang-messaging"></A></P>
+
+<H2><A name="SCAJavabinding.erlang-DetailsofmessagebasedRPCcommunication"></A>Details of message based RPC communication</H2>
+
+<P>RPC based on messaging uses messages for requests and responses.</P>
+<UL>
+	<LI>For <B>service bindings</B> incoming messages should contain SCA operation arguments, formed in tuple. Operation result will be send in return message.</LI>
+	<LI>For <B>reference bindings</B> Tuscany creates message with content depending on attributes passed to reference operation. If reference operation has return value defined then Tuscany will wait for reply from remote process.</LI>
+</UL>
+
+
+<P>In Erlang messaging it's common technique for sender to provide it's PID at the beginning - it allows recipient to respond. In Tuscany every Erlang message is a tuple which contains operation arguments. This tuple is wrapped with tuple with PID.</P>
+
+<H4><A name="SCAJavabinding.erlang-Overloadingoperations"></A>Overloading operations</H4>
+
+<P>Overloading operations allows user to send message with different structure. Ie., in reference binding we could declare interface:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> SomeInterface {
+
+  void someMbox(<SPAN class="code-object">String</SPAN> argument);
+
+  void someMbox(<SPAN class="code-object">String</SPAN> arg1, <SPAN class="code-object">String</SPAN> arg2);
+
+}
+</PRE>
+</DIV></DIV>
+<P>Invoking first <B>someMbox</B> operation would cause sending message addressed to <B>someMbox</B> message box. This message would contain one string value. Invoking second <B>someMbox</B> operation would cause sending message addressed also to <B>someMbox</B> message box, but message content would differ - now it would contain two string values.</P>
+
+<H4><A name="SCAJavabinding.erlang-Servicesideexample"></A>Service side example</H4>
+
+<P>For service defined by following interface:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> operation(<SPAN class="code-object">long</SPAN> arg1, @ErlangTuple arg2);
+</PRE>
+</DIV></DIV>
+<P>expected Erlang message is (sample using Erlang notation):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{SomePid, {10, AtomValue}}
+</PRE>
+</DIV></DIV>
+<P>After receiving such formed message Tuscany is able to process it correctly, invoke SCA operation and send reply to PID provided as first element of outer tuple.</P>
+
+<H4><A name="SCAJavabinding.erlang-Referencesideexample"></A>Reference side example</H4>
+
+<P>For reference interface defined as:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> operation(<SPAN class="code-object">long</SPAN> arg1, @ErlangTuple <SPAN class="code-object">String</SPAN> arg2);
+</PRE>
+</DIV></DIV>
+<P>executing it with following arguments:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+obj.operation(10, <SPAN class="code-quote">&quot;AtomValue&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>will make Tuscany to convert input arguments to Erlang tuple (using Erlang notation):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{10, AtomValue}
+</PRE>
+</DIV></DIV>
+<P>and wrap with tuple containing PID as follows (using Erlang notation):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+{SomePid, {10, AtomValue}}
+</PRE>
+</DIV></DIV>
+<P>In this example Erlang message box would receive message and know PID for reply.</P>
+
+<P><A name="SCAJavabinding.erlang-exceptions"></A></P>
+
+<H2><A name="SCAJavabinding.erlang-Exceptions"></A>Exceptions</H2>
+
+<P>While communicating with Erlang nodes (reference bindings) several error can be raised:</P>
+<UL>
+	<LI>Function on remote Erlang doesn't exist</LI>
+	<LI>Connection problems</LI>
+	<LI>Others and unexpected errors</LI>
+</UL>
+
+
+<P>In case of error two things can happen:</P>
+<UL>
+	<LI><B>Exception will be thrown</B>, only for operations which <B>declares exceptions</B></LI>
+	<LI><B>Problem will be logged</B>, only for operations with <B>no exception declared</B></LI>
+</UL>
+
+
+<P><A name="SCAJavabinding.erlang-samples"></A></P>
+
+<H2><A name="SCAJavabinding.erlang-Samples"></A>Samples</H2>
+
+<P>Samples can be found under sca/java/samples/:</P>
+<UL>
+	<LI><B>helloworld-service-erlang</B></LI>
+	<LI><B>helloworld-reference-erlang</B></LI>
+</UL>
+
+
+<P>Samples use service and reference Erlang bindings realised via Erlang RPC. If you want to play with Erlang binding it's good place to start. Maybe you would like to experiment by changing communication model to message based?<BR>
+For running instructions <B>please read README files</B>. You should also get familiar with <A href="#SCAJavabinding.erlang-requirements"><B>requirements</B></A>.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg
new file mode 100644
index 0000000000..500725ebae
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg.jpeg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg.jpeg
new file mode 100644
index 0000000000..3fb20747fd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg
new file mode 100644
index 0000000000..4bda5e8806
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg.jpeg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg.jpeg
new file mode 100644
index 0000000000..57285826b3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.data/scenario.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.html b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.html
new file mode 100644
index 0000000000..c612ee198b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy-section.html
@@ -0,0 +1,131 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.http security policy section</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99372">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http security policy section">SCA Java binding.http security policy section</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJavabinding.httpsecuritypolicysection-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.httpsecuritypolicysection-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.httpsecuritypolicysection-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg
new file mode 100644
index 0000000000..500725ebae
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg.jpeg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg.jpeg
new file mode 100644
index 0000000000..3fb20747fd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/high_level_design.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg
new file mode 100644
index 0000000000..4bda5e8806
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg.jpeg b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg.jpeg
new file mode 100644
index 0000000000..57285826b3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.data/scenario.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security-policy.html b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.html
new file mode 100644
index 0000000000..795ca0da56
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security-policy.html
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java binding.http security policy : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=99372">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http security policy">SCA Java binding.http security policy</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.httpsecuritypolicy-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="infoMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD> work in progress </TD></TR></TABLE>
+
+<H3><A name="SCAJavabinding.httpsecuritypolicy-Scenarios"></A>Scenarios</H3>
+
+<P><IMG src="sca-java-bindinghttp-security-policy.data/scenario.jpg" align="absmiddle" border="0"></P>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.httpsecuritypolicy-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+<P><DIV align="center"><IMG src="sca-java-bindinghttp-security-policy.data/high_level_design.jpg" border="0"></DIV></P>
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-bindinghttp-security.html b/site/trunk/site-publish/sca-java-bindinghttp-security.html
new file mode 100644
index 0000000000..d61636d8af
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp-security.html
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java binding.http Security : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=99372">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http Security">SCA Java binding.http Security</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.httpSecurity-PolicySecuritysupportinHTTPandWeb2.0Bindings"></A>Policy Security support in HTTP and Web 2.0 Bindings</H3>
+
+<H3><A name="SCAJavabinding.httpSecurity-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.httpSecurity-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.</P>
+
+
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-bindinghttp.html b/site/trunk/site-publish/sca-java-bindinghttp.html
new file mode 100644
index 0000000000..62fcef17d2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindinghttp.html
@@ -0,0 +1,338 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.http</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=98671">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.http">SCA Java binding.http</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.http-%3Cbinding.http%3EIntroduction"></A>&lt;binding.http&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Hyper Text Transfer Protocol (HTTP) using the &lt;binding.http&gt; extension. Tuscany can communicate with services that provide or consume business data objects via the well known actions of HTTP, for example POST, GET, PUT, and DELETE. In HTTP interactions between a client and a server takes place as a series of requests and responses. Information is comunicated by reads and rights over server socket ports. HTTP actions, also known as verbs, are communicated between a client and a server in the requests and responses. Each request and response consists of a header and a body. Typically the header contains the request action name, a URI indicating the location of object of the object of the action, and a number property name and value pairs containing other meta information about the transaction (e.g. body length, modification dates, MIME type, etc.). The body contains the subject of the action, whether it be a text or binary encoding of the data, an error message, or a serialized object.</P>
+
+<P>More information on the HTTP protocol is located at:</P>
+<UL>
+	<LI><A href="http://tools.ietf.org/html/rfc2616" class="external-link" rel="nofollow">Hyper Text Transfer Protocol</A>.</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Some of the advanced function described here is included in the Tuscany 1.3.2 and 1.4 releases. The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A>. Users should also be aware of the <A href="http://tuscany.apache.org/sca-java-bindingatom.html" class="external-link" rel="nofollow">Atom binding</A> and <A href="http://tuscany.apache.org/sca-java-bindingrss.html" class="external-link" rel="nofollow">RSS binding</A> which sit on top of the HTTP binding, but have additional features and data types associated with the actions.</P>
+
+<P>A Tuscany protocol binding such as the HTTP binding, is a way to fit a common protocol into the Tuscany abstraction and way of doing things. Each binding identifies itself to the Tuscany runtime and states under what conditions it is available. The Tuscany runtime uses the binding to translate invocations and data from the Tuscany world into the world of the protocol and back. So in the case of the HTTP binding, Tuscany uses the HTTP request and response mechanism to share business data between service components.</P>
+
+
+<H3><A name="SCAJavabinding.http-UsingtheTuscanyHTTPbinding"></A>Using the Tuscany HTTP binding</H3>
+
+<P>The primary use of the HTTP binding is to share resources and services over HTTP over the web in a distributed fashion. Resources are items that have a resource implementation such as web content. Services are items that have data types and a defined business interfaces such as shared collections. Examples of shared collections includes shopping carts, telephone directories, insurance forms, and blog sites. These collections of items can be added, retrieved, updated, and deleted using the 4 basic actions of the HTTP protocol:</P>
+<UL>
+	<LI>POST (create or add)</LI>
+	<LI>GET (retreive or query)</LI>
+	<LI>PUT (update)</LI>
+	<LI>DELETE (destroy or remove</LI>
+</UL>
+
+
+<P>The simplest way to use the HTTP binding is to declare a resource that can be shared over the web via HTTP and provide an HTTP address where one can access the resource. This resource is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;ResourceServiceComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.resource location=<SPAN class="code-quote">&quot;content&quot;</SPAN>/&gt;
+    	&lt;service name=<SPAN class="code-quote">&quot;Resource&quot;</SPAN>&gt;
+    		&lt;tuscany:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/webcontent&quot;</SPAN>/&gt;
+</SPAN>    	&lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+<P>No further implementation is needed with a resource. It is served on the web like any other static web content.</P>
+
+<P>The HTTP binding can also declare a business service that can be shared over the web and provide an HTTP address where one can access the service. This resource is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;HTTPBindingComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.http.TestBindingImpl&quot;</SPAN>/&gt;
+    	&lt;service name=<SPAN class="code-quote">&quot;TestBindingImpl&quot;</SPAN>&gt;
+    		&lt;tuscany:binding.http uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/httpbinding&quot;</SPAN>/&gt;
+</SPAN>    	&lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.http-ExampleHTTPServletandServiceImplementations"></A>Example HTTP Servlet and Service Implementations</H3>
+
+<P>A service that uses the HTTP binding usually implements the javax.servlet.Servlet interface. This interface declares the basic access methods mentioned in the J2EE specification: init, destroy, service, getServletInfo, etc. The Tuscany runtime ensures that the proper method is invoked whenever a service does one of the HTTP actions. For example here is a TestService implemented in the package org.apache.tuscany.sca.binding.http;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Service(Servlet.class)
+<SPAN class="code-keyword">public</SPAN> class TestServiceImpl <SPAN class="code-keyword">implements</SPAN> Servlet {
+
+    <SPAN class="code-keyword">public</SPAN> void init(ServletConfig config) <SPAN class="code-keyword">throws</SPAN> ServletException {
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void service(ServletRequest request, ServletResponse response) <SPAN class="code-keyword">throws</SPAN> ServletException, IOException {
+        response.getOutputStream().print(<SPAN class="code-quote">&quot;&lt;html&gt;&lt;body&gt;&lt;p&gt;Hello from Tuscany HTTP service&lt;/body&gt;&lt;/html&gt;&quot;</SPAN>);
+    }
+
+}
+</PRE>
+</DIV></DIV>
+
+<P>Another way of implementing an HTTP service is to use a collection interface that matches the actions of the HTTP protocol. In this case, the methods must be named post, get, put, and delete. Tuscany ensures that the proper method is invoked via the request and response protocol of HTTP:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class TestGetImpl {
+    
+    <SPAN class="code-keyword">public</SPAN> InputStream get(<SPAN class="code-object">String</SPAN> id) {
+        <SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> ByteArrayInputStream((<SPAN class="code-quote">&quot;&lt;html&gt;&lt;body&gt;&lt;p&gt;This is the service GET method, item=&quot;</SPAN> + id + <SPAN class="code-quote">&quot;&lt;/body&gt;&lt;/html&gt;&quot;</SPAN>).getBytes());
+
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<P>So using the common verbs of HTTP and Java object serialization, one can implement services and run them anywhere the HTTP protocol is implemented. The service developer or implementer simply creates methods for post, get, put, and delete, and a business collection such as a shopping cart, telephone directory, insurance form, or blog sites can be created. See the Tuscany module binding-http-runtime for complete examples.</P>
+
+<P>Unlike the Atom or RSS bindings, which have defined data types which encapsulate the business objects, the HTTP binding uses Java object serialization for passing business object data back and forth. Thus it is up to the developer or implementer to deserialize the data and reconstitute a business object.</P>
+
+<H3><A name="SCAJavabinding.http-AdvancedFeaturesoftheTuscanyHTTPBinding"></A>Advanced Features of the Tuscany HTTP Binding</H3>
+
+<H4><A name="SCAJavabinding.http-HTTPConditionalActionsandCachingusingETagsandLastModified"></A>HTTP Conditional Actions and Caching using ETags and Last-Modified</H4>
+
+<P>The HTTP specification provides a set of methods for HTTP clients and servers to interact. These methods form the foundation of the World Wide Web. Tuscany implements many of these methods a binding interface to a collection. The main methods are:</P>
+
+<UL>
+	<LI>GET - retrieves an item from a collection</LI>
+	<LI>POST - creates or adds an item to a collection</LI>
+	<LI>PUT - updates or replaces an item in a collection</LI>
+	<LI>DELETE - removes an item in a a collection</LI>
+</UL>
+
+
+<P>The HTTP specification (HTTP 1.1 Chapter 13 - Caching) also provides a mechanism by which these methods may be executed conditionally. To perform conditional methods, an HTTP client puts 3 items in the HTTP request header:</P>
+
+<UL>
+	<LI>ETag - entity tag, a unique identifier to an item in a collection. Normally created and returned by the server when creating (POST) a new item.</LI>
+	<LI>LastModified - an updated field. Normally a string containing a date and time of the last modification of the item.</LI>
+	<LI>Predicate - a logical test (e.g. IfModified, IfUnmodified) to use with the ETag and LastModified to determine whether to act.</LI>
+</UL>
+
+
+<P>The complete list of predicates is given in the HTTP specification.</P>
+
+<P>The most common use of conditional methods is to prevent two requests to the server instead of one conditional request. For example, a common scenario is to check if an item has been modified, if not changed update it with a new version, if changed do not update it. With a conditional PUT method (using the IfUnmodifed predicate and a LastModified date), this can be done in one action. Another common use is to prevent multiple GETs of an item to ensure we have a valid copy. Rather than doing a second request of a large item, one can do a conditional GET request (using an IfModified predicate and a LastModified date), and avoid the second request if our object is still valid. The server responds with either a normal response body, or status code 304 (Not Modified), or status code 412 (precondition failed).</P>
+
+<P>Tuscany implements the logic to move these caching items to and from the HTTP request and response headers, and deliver them to the collection implementation. The items are delivered to a user implementation via a serializable object called CacheContext. This object contains the value of the ETag, the LastModified value, and any predicates. It is up to the implementer of a collection to provide the correct server logic to act on these predicates. The CacheContext class is found in found in the Tuscany module package org.apache.tuscany.sca.binding.http.</P>
+
+<P>To implement conditional actions on your service, the developer or implementer implements any of the condional HTTP actions: conditionalPost, conditionalGet, conditionalPut, or conditionalDelete. Tuscany automatically routes a request with proper request header fields (ETag, LastModified, and predicates) to the proper collection method.</P>
+
+<P>For example, the TestBindingCacheImpl class in package org.apache.tuscany.sca.binding.http implements a server collection which pays attention to conditional methods. Notice that this collection implements conditionalGet, conditionalPut, conditionalPost, and conditionalDelete methods as well as get, put, post, delete. The server collection can look at the CacheContext obect to determine whether an item or a status code should be returned. In this example code, the conditionalGet checked the If-Modified predicate and determines whether the item is not modified and if so, throws a NotModifiedException.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	<SPAN class="code-keyword">public</SPAN> InputStream conditionalGet(<SPAN class="code-object">String</SPAN> id, HTTPCacheContext cacheContext)
+			<SPAN class="code-keyword">throws</SPAN> NotModifiedException, PreconditionFailedException {
+
+		<SPAN class="code-keyword">if</SPAN> (cacheContext != <SPAN class="code-keyword">null</SPAN>) {
+			<SPAN class="code-keyword">if</SPAN> (cacheContext.ifModifiedSince) {
+				<SPAN class="code-keyword">if</SPAN> ((id.equals(<SPAN class="code-quote">&quot;1&quot;</SPAN>))
+						&amp;&amp; (0 &gt; cacheContext.lastModifiedDate
+								.compareTo(<SPAN class="code-keyword">new</SPAN> Date())))
+					<SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> NotModifiedException(<SPAN class="code-quote">&quot;item 1 was modified on &quot;</SPAN>
+							+ <SPAN class="code-keyword">new</SPAN> Date());
+			}
+                ...
+        ...
+</PRE>
+</DIV></DIV>
+
+<P>For a full example of all conditional methods and many combinations of predicates, one can look to the module http-binding unit tests to understand how these conditional request work. The HTTPBindingCacheTestCase contains 36 tests of all 4 HTTP conditonal methods. Various predicates are tested with various ETags and LastModified fields. The fields are tested in both the positive and negative cases.</P>
+
+<P>Here is a complete list of the tests:</P>
+<UL>
+	<LI>testGet() - tests normal GET method of collection, expects item</LI>
+	<LI>testConditionalGetIfModifiedNegative() - tests not modified GET, expects item</LI>
+	<LI>testConditionalGetIfModifiedPositive() - tests modified GET, expect code 304</LI>
+	<LI>testConditionalGetIfUnmodifiedNegative() - tests unmodifed GET, expects item</LI>
+	<LI>testConditionalGetIfUnmodifiedPositive() - tests modified GET, expects code 412</LI>
+	<LI>testConditionalGetIfMatchNegative() - tests matching GET, expects code 412</LI>
+	<LI>testConditionalGetIfMatchPositive() - tests matching GET, expects item</LI>
+	<LI>testConditionalGetIfNoneMatchNegative - tests unmatching GET, expects item</LI>
+	<LI>testConditionalGetIfNoneMatchPositive() - tests unmatching GET, expects code 412</LI>
+</UL>
+
+
+<P>Similarly, there are 9 tests each for DELETE, POST, and PUT, making a total of 36 test cases.</P>
+
+<H4><A name="SCAJavabinding.http-DifferencesBetweenHTTPBindingCachingandAtomBindingCachinginTuscany"></A>Differences Between HTTP Binding Caching and Atom Binding Caching in Tuscany</H4>
+
+<P>A similar sort of conditional posting is implemented in the Atom Binding. The difference is that the HTTP binding requires an implementer to provide conditional methods. The Atom binding caching uses the Abdera Atom model objects to automatically derive an ETag and a LastModified tags. In the Atom model, the Entry or Feed ID is used to make an item ETag field. The Atom Entry or Feed updated field is used to make an item LastModified field.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Use the HTTP binding caching when you are not using Atom Entries and Feeds as your business objects. However, the more flexible HTTP binding caching requires you to implement special conditional methods. Use the Atom binding when you can model your business data in terms of Atom Entries and Feeds. The more constrictive Atom binding caching will derive caching tags from your data model fields.</P>
+
+<H3><A name="SCAJavabinding.http-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.http-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.http-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png
new file mode 100644
index 0000000000..05e62f3b8c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg
new file mode 100644
index 0000000000..e3339143d8
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-reference.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png
new file mode 100644
index 0000000000..7db2eb03f5
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg
new file mode 100644
index 0000000000..10bb02a586
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/DataFormatScenarios-2-service.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png b/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png
new file mode 100644
index 0000000000..5dc161000d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg b/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg
new file mode 100644
index 0000000000..4c5282c1d3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/jmstextxml-invocation-chain.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/providers.png b/site/trunk/site-publish/sca-java-bindingjms.data/providers.png
new file mode 100644
index 0000000000..737772334e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/providers.png
diff --git a/site/trunk/site-publish/sca-java-bindingjms.data/providers.png.jpeg b/site/trunk/site-publish/sca-java-bindingjms.data/providers.png.jpeg
new file mode 100644
index 0000000000..5fb006a80a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.data/providers.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-bindingjms.html b/site/trunk/site-publish/sca-java-bindingjms.html
new file mode 100644
index 0000000000..9dc4e91fae
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjms.html
@@ -0,0 +1,769 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.jms</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=57033">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jms">SCA Java binding.jms</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.jms-%3Cbinding.jms%3E"></A>&lt;binding.jms&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports the Java Messaging Service using the &lt;binding.jms&gt; SCDL extension. New JMS based service endpoints can be provided using a &lt;binding.jms&gt; element within a SCA &lt;service&gt;, existing JMS queues can be accessed using a &lt;binding.jms&gt; element within a SCA &lt;reference&gt;.</P>
+
+<P>The JMS binding is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-bindings" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<H4><A name="SCAJavabinding.jms-UsingtheJMSbinding"></A>Using the JMS binding</H4>
+
+<P>The simplest way to use the JMS binding is to use the URI syntax to configure the binding, for example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:RequestQueue&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+<P>This tells the binding to use a JMS destination named &quot;RequestQueue&quot;, with all the other configuration options using default values. </P>
+
+<P>By default Tuscany will use a JMS connection factory named 'ConnectionFactory', this can be changed by using a query parameter in the URI, for example, to use a connection factory named 'myCF' can be done as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:RequestQueue?connectionFactoryName=myCF&quot;</SPAN>/&gt;</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> When using a SCA reference for RPC style requests and no response destination is defined in the SCDL then a temporary replyTo queue will automatically be created and used.   </P>
+
+<P>When using the JMS binding with SCA services the syntax can be simplified even further by letting the destination name default to the service name. For example, the following SCDL snippet creates a JMS service listening on a JMS destination named &quot;MyService&quot;:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;service name=<SPAN class="code-quote">&quot;MyService&quot;</SPAN>&gt;
+   &lt;binding.jms /&gt;
+&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jms-ValidationintheJMSBinding"></A>Validation in the JMS Binding</H3>
+
+<P>Tuscany performs two types of validation of the JMS Binding specified in a composite file.</P>
+
+<OL>
+	<LI>All XML is validated according to the schema to be valid XML. Elements are validated to be of the correct number<BR>
+and order. URIs are validated to be of the correct form. Required attributes and elements are checked.</LI>
+	<LI>The model data for the JMS binding is validated. These are semantic issues such as the connection factory should not contradict destination type, connection factory and activation specification are mutually exclusive, and response connection must<BR>
+either be a name attribute or a response element.</LI>
+</OL>
+
+
+<P>Validation rules are taken from the binding schema and the OSOA and OASIS specs:</P>
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/documents.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/documents.php?wg_abbrev=sca-bindings</A> (sca-binding-jms-1.1-spec-cd01-rev4.pdf)</LI>
+	<LI><A href="http://www.osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications</A> (SCA JMS Binding V1.00 )</LI>
+</UL>
+
+
+<P>Invalid JMS bindings usually result in a JMSBindingException with error message and specific context of the error. See the JMSBindingProcessor for a complete list of validation rules.</P>
+
+<H3><A name="SCAJavabinding.jms-SomeExamples"></A>Some Examples</H3>
+
+<H4><A name="SCAJavabinding.jms-HelloWorld"></A>HelloWorld</H4>
+
+<P>The <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/" class="external-link" rel="nofollow">helloworld-jms</A> sample demonstrates basic RPC style operations over JMS. The sample has one component exposing a JMS service on a queue name 'HelloWorldService' and another component which invokes the service by sending JMS messages to that queue. A temporary destination is used for the response messages. The .composite file for this is shown below, see the helloworld sample <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/README" class="external-link" rel="nofollow">README</A> for full details.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldClient&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldClient&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldRef&quot;</SPAN>&gt;
+            &lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:HelloWorldService&quot;</SPAN>/&gt;
+        &lt;/reference&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldServiceImpl&quot;</SPAN> /&gt;
+	&lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+            &lt;binding.jms /&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jms-OperationSelection"></A>Operation Selection</H3>
+
+<P>Operation selection extensions allow you to choose how the JMS bindings determines which service operation to call based on the incoming MS message. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> operatiion selector </TH>
+<TH class="confluenceTh"> description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;opertionSelector.jmsdefault/&gt; </TD>
+<TD class="confluenceTd"> The default operations selector as described in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A>; 
+<UL>
+	<LI>If there is only one operation on the service interface then this operation is chosen.</LI>
+	<LI>Else If the property scaOperationName appears in the incoming JMS message then its value determines the service operation</LI>
+	<LI>Else the operation is assumed to be called onMessage</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;opertionSelector.jmsUserProp propertyName=&quot;somePropertyName&quot;/&gt; </TD>
+<TD class="confluenceTd"> The named property, in this case somePropertyName, on the incoming JMS message holds name of the service operation that will be called </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>While you can specify the default operation selector there is no need to as in lieu of other operation selectors being specified this one it assumed to be in force. You can add new operation selectors by adding the appropriate model objects, processors and providers.</P>
+
+<P>Following operation selection the actual operation that is called may be further affected by operationProperties configuration.</P>
+
+<H3><A name="SCAJavabinding.jms-WireFormats"></A>Wire Formats</H3>
+
+<P>Wire format extensions allow you to choose how message data is expected to appear inside the JMS message as it flows across the wire. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> wire format </TH>
+<TH class="confluenceTh"> description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsdefault sendFormat=&quot;text or bytes&quot;/&gt; </TD>
+<TD class="confluenceTd"> The default wire format as described in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A>; 
+<UL>
+	<LI>If the service operation has a single parameter of type javax.jms.Message then the incoming JMS message is passed in as is</LI>
+	<LI>Else the incoming message is a text message containing XML (we have added the sendFormat attribute to control whether the message type is actially text or bytes)
+	<UL>
+		<LI>If there is a single parameter in the service operation signature then the data in the JMS message is assumed to be a direct serialization of the data coming from/going to the service operation</LI>
+		<LI>Else there are multiple parameters in the servioce operation signature and  the data in the JMS message is assumed to be a document literal wrapped serialization of the data coming from/going to the service operation</LI>
+	</UL>
+	</LI>
+</UL>
+</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsBytes/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the native bytes of the data coming from/going to the service operation. The service operation signature is expected to have a single byte[] parameter </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsBytesXML/&gt; </TD>
+<TD class="confluenceTd">The data in the JMS message is an XML document literal wrapped representation of the parameters of the service operation presented as a series of bytes </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsText/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the string representation of data coming from/going to the service operation. The service operation signature is expected to have a single String parameter </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsTextXML/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is an XML document literal wrapped representation of the parameters of the service operation presented as a String </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> &lt;wireFormat.jmsObject/&gt; </TD>
+<TD class="confluenceTd"> The data in the JMS message is the Java object serialization of data coming from/going to the service operation </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>While you can specify this wire format there is no need to as in lieu of other operation selectors being specified this one it assumed to be in force. You can add new wire formats by adding the appropriate model objects, processors and providers.</P>
+
+<H3><A name="SCAJavabinding.jms-UsingSCAcallbackswiththeJMSbinding"></A>Using SCA callbacks with the JMS binding</H3>
+
+<P>The Tuscany JMS binding supports using SCA callbacks for creating asynchronous clients and services.</P>
+
+<P>This is done by using a &lt;callback&gt; element in the SCDL for the service or reference as shown in the following example. <BR>
+See the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/callbacks-jms/" class="external-link" rel="nofollow">callbacks-jms</A> sample for a complete example of using callbacks</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;CallbacksComposite&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ClientComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;callbacks.OrderServiceClient&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;orderService&quot;</SPAN> target=<SPAN class="code-quote">&quot;ServiceComponent/OrderService&quot;</SPAN>&gt;
+            &lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:OrderService&quot;</SPAN>/&gt;
+            &lt;callback&gt;
+                &lt;binding.jms /&gt;
+            &lt;/callback&gt;
+        &lt;/reference&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;ServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;callbacks.OrderServiceImpl&quot;</SPAN> /&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+            &lt;binding.jms /&gt;
+            &lt;callback&gt;
+                &lt;binding.jms /&gt;
+            &lt;/callback&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> When no destination is defined on the callback binding of a &lt;reference&gt; then a JMS temporary queue will be used.</P>
+
+<H3><A name="SCAJavabinding.jms-SettingJMSheadersanduserproperties"></A>Setting JMS headers and user properties</H3>
+
+<P>JMS headers and user properties can be set on JMS messages sent from Tuscany by using the &lt;Headers&gt; and &lt;OperationProperties&gt; elements of the JMS binding. The &lt;Headers&gt; element applies to all messages, the &lt;OperationProperties&gt; applies to individual operations and may override values set on the &lt;Headers&gt; element.</P>
+
+<P>An example of using these is shown in the following snippet of SCDL:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:ServiceQueue&quot;</SPAN>&gt;
+    &lt;headers JMSType=<SPAN class="code-quote">&quot;someTypeValue&quot;</SPAN> /&gt;
+    &lt;operationProperties name=<SPAN class="code-quote">&quot;op2&quot;</SPAN>&gt;
+        &lt;headers JMSType=<SPAN class="code-quote">&quot;op2SpecificTypeValue&quot;</SPAN> /&gt;
+    &lt;/operationProperties&gt;
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>A complete working example of using &lt;Headers&gt; and &lt;OperationProperties&gt; can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java" class="external-link" rel="nofollow">properties itest </A></P>
+
+<H3><A name="SCAJavabinding.jms-UsingJMSmessageselectors"></A>Using JMS message selectors </H3>
+
+<P>Services using the JMS binding to receive messages may only want a subset of the messages arriving on a queue or topic. This can be done by using the &lt;SubscriptionHeaders&gt; element which enables defining a <A href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS4.html#wp79281" class="external-link" rel="nofollow">JMS message selector </A> to filter the messages that will be received.   </P>
+
+<P>An example of using these is shown in the following snippet of SCDL:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms uri=<SPAN class="code-quote">&quot;jms:ServiceTopic&quot;</SPAN> &gt;
+    &lt;SubscriptionHeaders JMSSelector=<SPAN class="code-quote">&quot;JMSType = 'type1'&quot;</SPAN>/&gt;
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV> 
+
+<P>A complete working example of using &lt;SubscriptionHeaders&gt; can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms-selectors" class="external-link" rel="nofollow">jms selectors itest </A>.</P>
+
+<H3><A name="SCAJavabinding.jms-Usingadefinitions.xmlfileandtherequestConnection%2FresponseConnectionattributes"></A>Using a definitions.xml file and the requestConnection/responseConnection attributes</H3>
+
+<P>It can be useful to define the details of the JMS resources separately from the SCA composite, to support this the SCA definitions.xml file can be used to define 'model' &lt;binding.jms&gt; elements which can then be referred to from the binding within the composite.  </P>
+
+<P>For example, the following shows a definitions.xml file defining a JMS queue and connection factory which are then used by a JMS binding within a composite.</P>
+
+<P>The definitions.xml file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>             xmlns:itest=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//jms&quot;</SPAN>
+</SPAN>             targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//jms&quot;</SPAN> &gt;
+</SPAN>
+    &lt;binding.jms name=<SPAN class="code-quote">&quot;itest:TestService&quot;</SPAN> &gt;
+        &lt;destination name=<SPAN class="code-quote">&quot;MyServiceQueue&quot;</SPAN> create=<SPAN class="code-quote">&quot;never&quot;</SPAN>/&gt;
+        &lt;connectionFactory name=<SPAN class="code-quote">&quot;MyConnectionFactory&quot;</SPAN>/&gt;
+    &lt;/binding.jms&gt;
+
+&lt;/definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>and a binding which uses the definitions.xml binding:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.jms requestConnection=<SPAN class="code-quote">&quot;itest:TestService&quot;</SPAN> /&gt;</PRE>
+</DIV></DIV>
+
+<P>A complete working example of using the requestConnection/responseConnection attributes can be seen in the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms-definitions" class="external-link" rel="nofollow">jms definitions itest </A>.</P>
+
+<H3><A name="SCAJavabinding.jms-ConfiguringJMSresources"></A>Configuring JMS resources</H3>
+
+<P>Tuscany locates all JMS resources from JNDI so the environment where Tuscany is running needs to have JNDI and JMS correctly configured in order to use the Tuscany JMS binding. </P>
+
+<P>The following describes how to configure JMS in some common environments:</P>
+
+<H4><A name="SCAJavabinding.jms-TuscanyJ2SEstandaloneenvironmentwithActiveMQ"></A>Tuscany J2SE standalone environment with ActiveMQ</H4>
+
+<P>The Tuscany standalone runtime can use an embedded <A href="http://activemq.apache.org/" class="external-link" rel="nofollow">Apache ActiveMQ</A> message broker. To use ActiveMQ the application needs to include the  JMS API and ActiveMQ jars in the classpath and include a jndi.properties file to configure the ActiveMQ resources in JNDI. </P>
+
+<P>An example of this can be seen in the Tuscany <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/" class="external-link" rel="nofollow">JMS itest</A> which uses the <A href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-core/4.1.1/activemq-core-4.1.1.jar" class="external-link" rel="nofollow">ActiveMQ 4.1.1</A> release and <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties" class="external-link" rel="nofollow">this</A> jndi.properties file. </P>
+
+<P>For more information on using ActiveMQ see the Apache ActiveMQ website and specifically <A href="http://activemq.apache.org/jndi-support.html" class="external-link" rel="nofollow">this</A> page for information about configuring JNDI resources. </P>
+
+<H4><A name="SCAJavabinding.jms-ApacheTomcat"></A>Apache Tomcat</H4>
+
+<P>Tomcat does not include a JMS broker by default so you need to either embed one in each Tuscany application, install a broker into the tomcat installation, or use an external broker. Once that is done JNDI resources can be defined using the standard Tomcat facilities, see the Tomcat <A href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-resources-howto.html" class="external-link" rel="nofollow">JNDI How-to</A>. </P>
+
+<P>The Tuscany samples that use JMS and Tomcat demonstrate how to embed a JMS broker within the application by including ActiveMQ and its dependencies within the sample WAR, and using the webapp META-INF/context.xml file to define the JMS resources in JNDI. </P>
+
+
+<H4><A name="SCAJavabinding.jms-JEEapplicationserverssuchasApacheGeronimo%2CWebSphereetc"></A>JEE application servers such as Apache Geronimo, WebSphere etc</H4>
+
+<P>JEE Application servers such as Geronimo, WebSphere, WebLogic etc come with their own JMS broker that can be used by Tuscany. All the JMS resources used by a Tuscany application must be manually defined in the application server. Usually the application server has some sort of admin console where the resources can be defined using a web browser. </P>
+
+<P>The Tuscany helloworld JMS sample <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/helloworld-jms-webapp/README" class="external-link" rel="nofollow">README</A> describes the specific details of how to do this for some common application servers.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>ClassCastExceptions when using Tuscany applications in an Application Server</B><BR>Tuscany applications, specifically the JMS samples, are built to work out of-the-box on Tomcat by including a JMS broker embedded within the application. This causes incompatibilities with some Application Servers because the Java class of JMS resources may use different class loaders in the server and the application. The solution is to delete any JMS API jar included in the application WAR, for example, the geronimo-jms_1.1_spec-1.1.jar.</TD></TR></TABLE></DIV>
+
+<H4><A name="SCAJavabinding.jms-%28%2F%29UsingJEEresourcereferences"></A><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Using JEE resource references</H4>
+
+<P>When running Tuscany in a JEE environment it can be useful to use JEE resource references to map local application resource names to global JNDI names. This can be done by using &lt;resource-ref&gt; elements in the application deployment descriptor. If a &lt;resource-ref&gt; exists for a JMS binding resource then Tuscany will use that instead of looking up the resource directly in the global JNDI.</P>
+
+<P>For example, adding the following definitions to the helloworld JMS sample <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml" class="external-link" rel="nofollow">web.xml</A> will enable mapping the 'ConnectionFactory' and 'HelloWorldService' names used by the JMS binding into names for the actual resources used on the Application Server. This will normally occur when the application is dployed with the deploy tool asking what real resource names the resourecs should be mapped to.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;resource-ref&gt;
+    &lt;res-ref-name&gt;ConnectionFactory&lt;/res-ref-name&gt;
+    &lt;res-type&gt;javax.jms.ConnectionFactory&lt;/res-type&gt;
+    &lt;res-auth&gt;Container&lt;/res-auth&gt;
+    &lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+&lt;/resource-ref&gt;
+
+&lt;resource-ref&gt;
+    &lt;res-ref-name&gt;HelloWorldService&lt;/res-ref-name&gt;
+    &lt;res-type&gt;javax.jms.Queue&lt;/res-type&gt;
+    &lt;res-auth&gt;Container&lt;/res-auth&gt;
+    &lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+&lt;/resource-ref&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H4><A name="SCAJavabinding.jms-UsinganexternalJMSbroker"></A>Using an external JMS broker</H4>
+
+<P>When the Tuscany environment does not include a JMS broker then an external broker may be used by specifying the initialContextFactory and jndiURL attributes on the binding.jms element. Any JMS 1.1 compatible broker should work such as Apache ActiveMQ or any other proprietary broker. The Tuscany application classpath will need to include jars for the initial context factory and all of its dependencies.</P>
+
+<P>An example of using the Tuscany JMS binding with an external ActiveMQ broker is as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms initialContextFactory=<SPAN class="code-quote">&quot;org.apache.activemq.jndi.ActiveMQInitialContextFactory&quot;</SPAN> jndiURL=<SPAN class="code-quote">&quot;tcp:<SPAN class="code-comment">//localhost:61616&quot;</SPAN>&gt;
+</SPAN>   &lt;destination name=<SPAN class="code-quote">&quot;DestQueueA&quot;</SPAN>/&gt;
+&lt;/binding.jms&gt;  
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-UsingtheWebSphereclientforJMS"></A>Using the WebSphere client for JMS</H4>
+
+<P>The Tuscany JMS binding now (post Tuscany SCA 1.2) works the <A href="http://www-1.ibm.com/support/docview.wss?uid=swg24012804" class="external-link" rel="nofollow">WebSphere client for JMS </A> which enables Tuscany applications running outside of WebSphere to use JMS resources defined within WebSphere. You need to include the JMS client jars in the Tuscany classpath and ensure that the JMS connection factory has the &quot;endpoint providers&quot; field configured in WebSphere. See this <A href="http://apache.markmail.org/message/qufruqdwxuvaagev" class="external-link" rel="nofollow">email thread </A> for more information.</P>
+
+<H3><A name="SCAJavabinding.jms-JMSMessagetypesandmessagebodyformat"></A>JMS Message types and message body format</H3>
+
+<P>The SCA JMS specification only defines how to use JMS TextMessages which contain XML in the message body, however it is a common requirement to use alternative message types and body formats. Currently Tuscany defines an additional &quot;messageProcessor&quot; attribute on the binding.jms element to support additional message types and payload formats. For the time being this should be considered an interim solution which will be changed in future Tuscany releases.</P>
+
+<P>The messageProcessor attribute value may be &quot;XMLTextMessage&quot;, &quot;TextMessage&quot;, &quot;ObjectMessage&quot;, or the name of a Java class that implements the org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor interface. For example:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For a complete example of using the messageProcessor attribute see the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java" class="external-link" rel="nofollow">MessageProcessorTestCase</A> itest. </P>
+
+<H3><A name="SCAJavabinding.jms-UsingpolicytocontroltheJMSbinding"></A>Using policy to control the JMS binding</H3>
+<P>The JMS binding is aware of the following policy implementations. </P>
+
+<UL class="alternate" type="square">
+	<LI>org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy
+	<UL class="alternate" type="square">
+		<LI>Used to set various JMS message headers including JMSType, JMSCorrelationID, JMSDeliveryMode, JMSTimeToLive, JMSPriority and arbitrary user defined header properties</LI>
+	</UL>
+	</LI>
+	<LI>org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy
+	<UL class="alternate" type="square">
+		<LI>Used to insert a user defined authentication property into the JMS header.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Intents and policy sets can be constructed to control the application of these policies. The following intents are defined by default</P>
+<UL class="alternate" type="square">
+	<LI>pritority</LI>
+	<LI>deliveryMode</LI>
+</UL>
+
+
+<P>New intents and policy sets can be designed are required to provide the level of control you need over your application.  </P>
+
+<H4><A name="SCAJavabinding.jms-Intent%3Apriority"></A>Intent: priority</H4>
+<P>The priority intent provides a coarse grained approach to setting message priority. For example,</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ &lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN> requires=<SPAN class="code-quote">&quot;priotiry.meduim&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The values &quot;priority.high&quot;, &quot;priority.medium&quot;, &quot;priority.low&quot; are supported. It is the responsibility of the user to define a policy set to support these intents. The following policy set could be used to support these priority values.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;policySet name=<SPAN class="code-quote">&quot;JMSPolicySet1&quot;</SPAN>
+               provides=<SPAN class="code-quote">&quot;priority&quot;</SPAN>
+               appliesTo=<SPAN class="code-quote">&quot;sca:binding.jms&quot;</SPAN>&gt;
+        &lt;intentMap provides=<SPAN class="code-quote">&quot;priority&quot;</SPAN> <SPAN class="code-keyword">default</SPAN>=<SPAN class="code-quote">&quot;medium&quot;</SPAN>&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;high&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;9&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;medium&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;4&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;low&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSPriority=<SPAN class="code-quote">&quot;0&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+        &lt;/intentMap&gt;
+    &lt;/policySet&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-Intent%3AdeliveryMode"></A>Intent: deliveryMode</H4>
+
+<P>The deliveryMode intent provides s simple way of specifying whether a message should be delivered persistently or non-persistently. For example, </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ &lt;reference name=<SPAN class="code-quote">&quot;serviceA&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldClient/serviceA&quot;</SPAN> requires=<SPAN class="code-quote">&quot;deliveryMode.persistent&quot;</SPAN>&gt;
+    &lt;binding.jms messageProcessor=<SPAN class="code-quote">&quot;my.TestMessageProcessor&quot;</SPAN> /&gt;
+&lt;/reference&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The values &quot;deliveryMode.persistent&quot; and &quot;deliveryMode.nonPersistent&quot; are supported. It is the responsibility of the user to define a policy set to support these intents. The following policy set could be used to support these delivery mode values.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;policySet name=<SPAN class="code-quote">&quot;JMSPolicySet2&quot;</SPAN>
+               provides=<SPAN class="code-quote">&quot;deliveryMode&quot;</SPAN>
+               appliesTo=<SPAN class="code-quote">&quot;sca:binding.jms&quot;</SPAN>&gt;
+        &lt;intentMap provides=<SPAN class="code-quote">&quot;deliveryMode&quot;</SPAN> <SPAN class="code-keyword">default</SPAN>=<SPAN class="code-quote">&quot;nonPersistent&quot;</SPAN>&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;persistent&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSDeliveryMode=<SPAN class="code-quote">&quot;PERSISTENT&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+            &lt;qualifier name=<SPAN class="code-quote">&quot;nonPersistent&quot;</SPAN>&gt;
+                &lt;tuscany:jmsHeader JMSDeliveryMode=<SPAN class="code-quote">&quot;NON_PERSISTENT&quot;</SPAN>/&gt;
+            &lt;/qualifier&gt;
+        &lt;/intentMap&gt;
+    &lt;/policySet&gt;    
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jms-Otherheadervalues"></A>Other header values</H4>
+
+<P>TBD</P>
+
+
+<H3><A name="SCAJavabinding.jms-JMSbindingschema"></A>JMS binding schema</H3>
+
+<P>The complete JMS binding SCDL schema has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.jms correlationScheme=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+             initialContextFactory=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>?
+             jndiURL=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>?
+             requestConnection=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             responseConnection=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             operationProperties=<SPAN class="code-quote">&quot;QName&quot;</SPAN>?
+             ... &gt;
+
+   &lt;destination name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>? create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/destination&gt;?
+
+   &lt;connectionFactory name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/connectionFactory&gt;?
+
+   &lt;activationSpec name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/activationSpec&gt;?
+
+   &lt;response&gt;
+      &lt;destination name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>? create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/destination&gt;?
+      &lt;connectionFactory name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/connectionFactory&gt;?
+      &lt;activationSpec name=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN> create=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/activationSpec&gt;?
+   &lt;/response&gt;?
+
+   &lt;complexType name=<SPAN class="code-quote">&quot;SubscriptionHeaders&quot;</SPAN>&gt; 
+      &lt;attribute name=<SPAN class="code-quote">&quot;JMSSelector&quot;</SPAN> type=<SPAN class="code-quote">&quot;string&quot;</SPAN>/&gt; 
+   &lt;/complexType&gt;
+
+   &lt;resourceAdapter name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;?
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/resourceAdapter&gt;?
+
+   &lt;headers JMSType=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSCorrelationId=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSDeliveryMode=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+            JMSTimeToLive=<SPAN class="code-quote">&quot;<SPAN class="code-object">int</SPAN>&quot;</SPAN>?
+            JMSPriority=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+   &lt;/headers&gt;?
+
+   &lt;operationProperties name=<SPAN class="code-quote">&quot;string&quot;</SPAN> nativeOperation=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+      &lt;headers JMSType=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSCorrelationId=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSDeliveryMode=<SPAN class="code-quote">&quot;string&quot;</SPAN>?
+               JMSTimeToLive=<SPAN class="code-quote">&quot;<SPAN class="code-object">int</SPAN>&quot;</SPAN>?
+               JMSPriority=<SPAN class="code-quote">&quot;string&quot;</SPAN>?&gt;
+         &lt;property name=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN> type=<SPAN class="code-quote">&quot;NMTOKEN&quot;</SPAN>&gt;*
+      &lt;/headers&gt;?
+   &lt;/operationProperties&gt;*
+
+   &lt;opertionSelector.jmsdefault/&gt;? | &lt;opertionSelector.jmsUserProp propertyName=<SPAN class="code-quote">&quot;somePropertyName&quot;</SPAN>/&gt;?
+   &lt;wireFormat.jmsdefault sendFormat+<SPAN class="code-quote">&quot;text|bytes&quot;</SPAN>/&gt;? | &lt;wireFormat.jmsBytes/&gt;? | &lt;wireFormat.jmsBytesXML/&gt;? | &lt;wireFormat.jmsText/&gt;? | &lt;wireFormat.jmsTextXML/&gt;? | &lt;wireFormat.jmsObject/&gt;?
+
+&lt;/binding.jms&gt;
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> See the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A> for full details of each of these configuration options.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Not all these elements are supported by Tuscany. Specifically, the &lt;activationSpec&gt; and &lt;resourceAdapter&gt; elements are not supported as Tuscany does not use JCA or MDBs for its JMS support.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The create attribute on the destination element is not supported in most environments and all JMS resources (connection factories, queues and topics) need to be pre-configured. An exception to this is when using Apache ActiveMQ as the JMS broker then Tuscany may be able to dynamically create queue and topic resources. This is mainly only useful for unit testing and it is recommended that user applications are designed with the expectation that JMS resources need to be preconfigured.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> the &quot;operationSelector&quot; and &quot;wireFormat&quot; elements are declared in the tuscany namespace (<A href="http://tuscany.apache.org/xmlns/sca/1.0" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.0</A>). The default operation selection and wire format behvaviour is defined in the <A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">JMS Binding Specification 1.0</A> but we have added a selection of other formats and selectors as alternatives. </P>
+
+<H3><A name="SCAJavabinding.jms-ImplementationNotes"></A>Implementation Notes</H3>
+
+<P>The JMS binding is the first binding where we have started to exploit the binding wire concept. This affects how the JMS binding is implemented.</P>
+
+<P>The addition of a binding wire to the infrastructure allows interceptors to be added that operate on message data in the context of the binding. This allows wire formats to be specified. This is important for bindings like JMS where the data format on the wire does not necessarily follow a well known specification. The default wire format in the Tuscany JMS binding is as described in the SCA JMS specification, i.e. a JMS text message containing XML. However JMS messages using any arbitrary format can be supported by constructing new wire format extensions. </P>
+
+<P>The following diagram shows an overview of how a reference JMS binding may be configured to talk to a service JMS binding using the Text XML wire format. </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/jmstextxml-invocation-chain.png" style="border: 0px solid black"></SPAN></P>
+
+<P>In the above diagram, <BR>
+1) databinding interceptor normalizes the data into an intermediate format that the binding can understand<BR>
+2) wire format interceptor, that is called WireFormat.jmsTextXML,  marshals the normalized data into the protocol-specific message, JMSMessage for binding.jms</P>
+
+<P>An example of a composite file which results in this kind of configuration is as follows:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>	xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;helloworld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldReferenceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldService1&quot;</SPAN> &gt;
+            &lt;binding.jms&gt;
+                &lt;destination name=<SPAN class="code-quote">&quot;HelloWorldService1&quot;</SPAN>/&gt;
+                &lt;wireFormat.jmsTextXML/&gt;
+            &lt;/binding.jms&gt;
+        &lt;/reference&gt;      
+    &lt;/component&gt;
+    
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent1&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl&quot;</SPAN> /&gt;
+        &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+            &lt;binding.jms&gt;
+                &lt;destination name=<SPAN class="code-quote">&quot;HelloWorldService1&quot;</SPAN>/&gt;
+            &lt;/binding.jms&gt;
+        &lt;/service&gt;
+    &lt;/component&gt;     
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Note that &lt;wireFormat.jmsTextXML/&gt; is explicitly specified on the reference binding. As this is the default wire format it can be omitted as is the case on the service binding. </P>
+
+<P>Of course Tuscany already has a databinding framework that is able to transform between datatypes generically. So think of the wire format functionality as performing binding specific transformations. </P>
+
+<P>The following diagram gives an overview of the difference between the databinding and wireformat transformations on the reference side: </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/DataFormatScenarios-2-reference.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The following diagram gives an overview of the difference between the databinding and wireformat transformations on the service side:</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/DataFormatScenarios-2-service.png" style="border: 0px solid black"></SPAN></P>
+
+<P>When looking at the code itself you will see the following structure:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+binding-jms
+  The jms binding model
+
+binding-jms-runtime
+  /org/apache/tuscany/sca/binding/jms/provider
+     The base JMS binding runtime implementation. Exploits the Tuscany provider pattern. 
+
+  /org/apache/tuscany/sca/binding/jms/context
+     A structure that passes the binding context with the message and allows the wire format and operation selection interceptors to <SPAN class="code-keyword">do</SPAN> binding specific things
+  /org/apache/tuscany/sca/binding/jms/transport
+     JMS transport processing implmented as an interceptor
+  /org/apache/tuscany/sca/binding/jms/headers
+     JMS header processing implmented as an interceptor
+  /org/apache/tuscany/sca/binding/jms/wireformat
+     JMS wire format interceptors
+  /org/apache/tuscany/sca/binding/jms/operationselector
+     JMS operation selector interceptors
+      
+binding-jms-policy
+  Some base JMS policy implementations
+</PRE>
+</DIV></DIV>
+
+<P>The providers can be replaced in order to change the way that the JMS binding is constructed. </P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sca-java-bindingjms.data/providers.png" style="border: 0px solid black"></SPAN></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingjsonrpc.html b/site/trunk/site-publish/sca-java-bindingjsonrpc.html
new file mode 100644
index 0000000000..28d3ca27e4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingjsonrpc.html
@@ -0,0 +1,343 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.jsonrpc</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54462">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.jsonrpc">SCA Java binding.jsonrpc</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.jsonrpc-%3Cbinding.jsonrpc%3E"></A>&lt;binding.jsonrpc&gt;</H3>
+
+<P>Tuscany supports <A href="http://json-rpc.org/" class="external-link" rel="nofollow">JSON-RPC</A> as a protcol for use with SCA services by using the &lt;binding.jsonrpc&gt; SCDL extension. This enables remote web browser clients to easily make RPC style calls to server-side SCA components.</P>
+
+<P>The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A></P>
+
+<H3><A name="SCAJavabinding.jsonrpc-UsingtheTuscanyJSONRPCbinding"></A>Using the Tuscany JSON-RPC binding</H3>
+
+<P>You could use this binding without any configuration, or by providing a specific service URI. <BR>
+To include it on a SCA service choose one of the SCDL examples below :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;binding.jsonrpc/&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;binding.jsonrpc uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/store/catalog&quot;</SPAN>/&gt;</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavabinding.jsonrpc-ConsumingJSONRPCservicesontheclientapplication"></A>Consuming JSON-RPC services on the client application</H3>
+
+<P>Any JSON-RPC client may be used to access SCA services which use &lt;binding.jsonrpc&gt;, below we are going to describe different ways you could consume the Tuscany JSON-RPC services in your client application.</P>
+
+<H4><A name="SCAJavabinding.jsonrpc-UtilizingTuscanyImplementation.widget"></A>Utilizing Tuscany Implementation.widget</H4>
+
+<P>When your web client application is defined as an SCA component utilizing <A href="sca-java-implementationwidget.html" title="SCA Java implementation.widget">Tuscany Widgets</A>, a JavaScript is generated which may be included within an HTML document to properly inject services references to SCA references defined on the same HTML document.</P>
+
+<P>This script is used by simply including the following tag within the HTML page :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;html-page-name.js&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This initializes the proxys for the SCA services which can then be injected into SCA references to make requests to the server-side components. For example, if there was a service named &quot;myService&quot; which had operations &quot;aOnewayRequest&quot; and &quot;anRpcRequest&quot; the scripts in the HTML page could now invoke these operations with the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;myService&quot;</SPAN>);
+myService.aOnewayRequest(args);
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;myService&quot;</SPAN>);
+myService.anRpcRequest(args, responseFunction);
+</PRE>
+</DIV></DIV>
+
+<P>Also see <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%2BJava%2Bimplementation.widget&linkCreation=true&fromPageId=54462" class="createlink">Tuscany Widgets</A> for more details.</P>
+
+<H4><A name="SCAJavabinding.jsonrpc-UtilizingaJavaScriptClientProxy"></A>Utilizing a JavaScript Client Proxy</H4>
+
+<P>To simplify the task for web browsers developers Tuscany provides a 'binding-jsonrpc.js&quot; JavaScript client proxy code that can be included in your application. </P>
+
+<P>After copying the script to your application, it can be used bu simply including the following tag within the HTML page :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;binding-jsonrpc.js&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>This initializes the proxys for the SCA services which can then be used make requests to the server-side components. Based on the scenario described above, below are the to invoke these operations.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>).service;
+myService.aOnewayRequest(args);
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> JSONRpcClient(<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>).service;
+myService.anRpcRequest(args, responseFunction);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-HandlingJSONRPCResponsewithcallbacks"></A>Handling JSON-RPC Response with callbacks</H4>
+
+<P>In that example 'responseFunction' is the name of a function which is called to process the response and which gets called asynchronously on another thread when the response is avaialble. RPC requests are done this way instead of the simpler &quot;answer = myService.anRpcRequest(args)&quot; to avoid hanging the browser while the (potentially slow) request is being processed. An example of the responseFunction for the previous example is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+function responseFunction(answer){
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with answer
+</SPAN>}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-Handlingerrors"></A>Handling errors</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//initialization code
+</SPAN><SPAN class="code-keyword">try</SPAN>{
+   myService.anRpcRequest(args, responseFunction);
+} <SPAN class="code-keyword">catch</SPAN>(e) {
+   <SPAN class="code-comment">//handle error
+</SPAN>   alert(e);
+}
+
+function responseFunction(answer, exception){
+   <SPAN class="code-comment">//handle exception information
+</SPAN>   <SPAN class="code-keyword">if</SPAN>(exception){
+      alert(exception.message);
+      <SPAN class="code-keyword">return</SPAN>;
+   }
+  <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something with answer
+</SPAN>}
+
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-UsingSCAJSONRPCserviceswithDojo"></A>Using SCA JSON-RPC services with Dojo</H4>
+
+<P>Apache Tuscany JSON-RPC services provide built-in support for <A href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9" class="external-link" rel="nofollow">Dojo RPC</A>. The <A href="http://dojotoolkit.org/" class="external-link" rel="nofollow">Dojo</A> toolkit is a popular framework for writing Ajax/Web 2.0 style browser client applications. Tuscany SCA services which use &lt;binding.jsonrpc&gt; will by default support  the <A href="http://dojo.jot.com/SMD" class="external-link" rel="nofollow">Simple Method Description (SMD) </A> protocol. SMD is similar to ?wsdl for Web services, entering a service endpoint appended with ?smd will return a SMD descriptor for the service. </P>
+
+<P>Using Tuscany SCA services with Dojo can therefore be as simple as the following:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  <SPAN class="code-keyword">var</SPAN> myService = <SPAN class="code-keyword">new</SPAN> dojo.rpc.JsonService(<SPAN class="code-quote">&quot;myService?smd&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.jsonrpc-Supporteddatatypes"></A>Supported data types</H4>
+
+<P>The JSON-RPC binding utilize the Databinding Framework to provide support for the following data transformations :</P>
+
+<UL>
+	<LI>Primitive Type &lt;==&gt; JSON &lt;==&gt; Primitive Type</LI>
+	<LI>Array of Primitive Type  &lt;==&gt; JSON &lt;==&gt; Array of Primitive Type</LI>
+	<LI>Java bean &lt;==&gt; JSON &lt;==&gt; Java bean</LI>
+	<LI>List &lt;==&gt; JSON &lt;==&gt; List</LI>
+	<LI>Map &lt;==&gt; JSON &lt;==&gt; Map</LI>
+	<LI>Set &lt;==&gt; JSON &lt;==&gt; Set</LI>
+</UL>
+
+
+<H4><A name="SCAJavabinding.jsonrpc-Someexamples%3A"></A>Some examples:</H4>
+
+<P>There are two samples showing using &lt;binding.jsonrpc&gt;, one which uses the Dojo Toolkit on the client, and another which uses the Tuscany scaDomain.js script. The samples are <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-dojo/" class="external-link" rel="nofollow">helloworld-dojo</A> and <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/" class="external-link" rel="nofollow">helloworld-jsonrpc</A>.</P>
+
+
+<H3><A name="SCAJavabinding.jsonrpc-SecurityPolicysupportinHTTPandWeb2.0Bindings"></A>Security Policy support in HTTP and Web 2.0 Bindings</H3>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>work in progress</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavabinding.jsonrpc-Scenarios"></A>Scenarios</H3>
+
+<UL>
+	<LI>A Web 2.0 application requires that a user get authenticated before it can access the application.</LI>
+	<LI>A Web 2.0 application requires that all communication between client/server be done using SSL.</LI>
+	<LI>A given service, exposed using a web 2.0 binding requires user authentication.</LI>
+	<LI>A given operation, exposed using a web 2.0 binding requires user authentication.</LI>
+</UL>
+
+
+<H3><A name="SCAJavabinding.jsonrpc-PolicyInterceptor"></A>Policy Interceptor</H3>
+
+<P>The design approach that is being considered is to inject policy security interceptors, that would properly validate and enforce the security intents.<BR>
+The authentication will be done using JAAS modules for authentication, and initially we would support authenticating to a list of username/password supplied by the application or using an LDAP.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java-bindinghttp-security-policy-section.data/high_level_design.jpg" style="border: 0px solid black"></SPAN></P>
+
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Differences between &lt;binding.jsonrpc&gt; and &lt;binding.dwr&gt;</B><BR>The current Tuscany SCA runtime supports &lt;binding.jsonrpc&gt; and &lt;binding.dwr&gt; which provide similar functionality. The differences are:
+<UL>
+	<LI>&lt;binding.jsonrpc&gt; supports the SMD protocol enabling easy use with Dojo, &lt;binding.ajax&gt; does not support SMD</LI>
+	<LI>&lt;binding.ajax&gt; supports SCA references and using <A href="http://en.wikipedia.org/wiki/Comet_(programming)" class="external-link" rel="nofollow">COMET</A> style asynchronous operation, &lt;binding.jsonrpc&gt; does not</LI>
+	<LI>&lt;binding.jsonrpc&gt; uses the standard <A href="http://json-rpc.org/" class="external-link" rel="nofollow">JSON-RPC</A> protocol, &lt;binding.dwr&gt; uses a proprietry protocol using <A href="http://getahead.org/dwr/" class="external-link" rel="nofollow">DWR</A></LI>
+</UL>
+
+
+<P>These differences should be resolved by the Tuscany SCA 1.0 release.</P></TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Changes since 0.90 release</B><BR>The Tuscany JSON-RPC and Ajax binding's have had significant functional and useability changes since the 0.90 release. It is recomended that if possible the latest code is used (the description on this page is based on the latest code).</TD></TR></TABLE></DIV>
+
+</TD></TR></TBODY></TABLE> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingrmi.html b/site/trunk/site-publish/sca-java-bindingrmi.html
new file mode 100644
index 0000000000..b3b97ae407
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingrmi.html
@@ -0,0 +1,198 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.rmi</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56390">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rmi">SCA Java binding.rmi</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.rmi-%3Cbinding.rmi%3E"></A>&lt;binding.rmi&gt;</H3>
+
+<P>Tuscany supports <A href="http://java.sun.com/javase/technologies/core/basic/rmi/index.jsp" class="external-link" rel="nofollow">Remote Method Invocation (RMI)</A> as a protocol for use with SCA services and references by using the &lt;binding.rmi&gt; SCDL extension. </P>
+
+<P>The RMI binding enables SCA components to use or be used by any other application which uses the standard Java RMI protocol. One use of this is to easily integrate the Tuscany runtime with existing Java applications which use RMI.</P>
+
+<P>This RMI binding SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;binding.rmi host=<SPAN class="code-quote">&quot;&quot; port=&quot;</SPAN><SPAN class="code-quote">&quot; serviceName=&quot;</SPAN>&quot;/&gt;
+</PRE>
+</DIV></DIV>
+
+
+
+
+<H4><A name="SCAJavabinding.rmi-Someexamples%3A"></A>Some examples:</H4>
+
+<P>This example composite shows how to make an SCA component available as an RMI service:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           xmlns:rmi=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;HelloWorldRmiComposite&quot;</SPAN>&gt;
+
+   &lt;service name=<SPAN class="code-quote">&quot;HelloWorldRmiService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+      &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN>/&gt;
+      &lt;binding.rmi host=<SPAN class="code-quote">&quot;localhost&quot;</SPAN> port=<SPAN class="code-quote">&quot;8099&quot;</SPAN> serviceName=<SPAN class="code-quote">&quot;HelloWorldRemoteService&quot;</SPAN>   /&gt;
+      &lt;reference target=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;HelloWorldServiceComponent&lt;/reference&gt;
+   &lt;/service&gt;
+      
+   &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+      &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldImpl&quot;</SPAN>/&gt;
+   &lt;/component&gt;   
+  
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+</TD></TR></TBODY></TABLE> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingrss.html b/site/trunk/site-publish/sca-java-bindingrss.html
new file mode 100644
index 0000000000..b0d81944c9
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingrss.html
@@ -0,0 +1,244 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.rss</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=98618">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.rss">SCA Java binding.rss</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.rss-%3Cbinding.rss%3EIntroduction"></A>&lt;binding.rss&gt; Introduction</H3>
+
+<P>The Tuscany Java SCA runtime supports Really Simple Syndication (RSS) using the &lt;binding.rss&gt; extension. Tuscany can communicate with services that provide or consume items described in the RSS 1.0 or 2.0 syndication format. The RSS protcol is an additional conceptual layer that operates on top of the Hyper Text Transfer Protocol, so it is useful to understand that underlying protocol as well. Reference materials on these specifications is available here.</P>
+
+<UL>
+	<LI><A href="http://tools.ietf.org/html/rfc2616" class="external-link" rel="nofollow">Hyper Text Transfer Protocol</A>.</LI>
+	<LI><A href="http://web.resource.org/rss/1.0/" class="external-link" rel="nofollow">RSS 1.0 Specification</A>.</LI>
+	<LI><A href="http://cyber.law.harvard.edu/rss/rss.html" class="external-link" rel="nofollow">RSS 2.0 Specification</A>.</LI>
+</UL>
+
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Some of the function described here is included in the Tuscany 1.3.2 and 1.4 releases. The complete timeline of available and future plans is given in the <A href="http://tuscany.apache.org/sca-java-roadmap.html" class="external-link" rel="nofollow">Tuscany Web 2.0 Roadmap</A>. Note also that the RSS binding support is similar to the <A href="http://tuscany.apache.org/sca-java-bindingatom.html" class="external-link" rel="nofollow">Tuscany Atom Binding Support</A> in both syntax and function.</P>
+
+
+<H3><A name="SCAJavabinding.rss-UsingtheTuscanyRSSbinding"></A>Using the Tuscany RSS binding</H3>
+
+<P>The primary use of the RSS binding is to provide support for collections that can be shared in a distributed fashion. Examples of shared collections includes shopping carts, telephone directories, insurance forms, and blog sites. These collections of items can be added, retrieved, updated, and deleted using the 4 basic actions of the HTTP protocol:</P>
+<UL>
+	<LI>POST (create or add)</LI>
+	<LI>GET (retreive or query)</LI>
+	<LI>PUT (update)</LI>
+	<LI>DELETE (destroy or remove</LI>
+</UL>
+
+
+<P>The simplest way to use the Atom binding is to declare a collection as a service and provide an HTTP address where one can access the service. This service is declared in an SCA composite file which describes the SCA domain.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+	&lt;service name=<SPAN class="code-quote">&quot;customer&quot;</SPAN> promote=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+		&lt;tuscany:binding.rss uri = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8084/customer&quot;</SPAN>/&gt;
+</SPAN>	&lt;/service&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The service can be implemented in Java or any of the the Tuscany implementation types. For example, here is a way to create an implmentation for the above CustomerCollection service as the Java implementation.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;CustomerCollection&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.apache.tuscany.sca.binding.feed.CustomerCollectionImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>A collection that uses the RSS binding usually implements the Collection interface given in the package org.apache.tuscany.sca.binding.atom.collection. This interface declares the basic access methods mentioned above (post, get, put, and delete), and the data types on the methods are expressed as RSS  SyndFeed and SyndEntry objects. This shows the basic methods of the RSS Collection interface in Tuscany:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Collection {
+
+    SyndFeed getFeed();
+    SyndFeed query(<SPAN class="code-object">String</SPAN> queryString);
+</PRE>
+</DIV></DIV>
+
+<P>It is up to the developer or implementer of the shopping cart, telephone directory, or blog site to provide the code that implements the Collection interface. The developer or implementor also provides the code that translates from the business objects (shopping cart items, directory entries, insurance forms, blog articles) to the Atom model objects Feed and Entry.</P>
+
+<P>One of the features of using this binding is that your business objects (shopping cart items, directory entries, insurance forms, and blog articles) can now be easily published and shared by the many RSS supporting tools such as feed readers, web browsers, and syndication aggregation. In other words, people can access your collection most anywhere on any device.</P>
+
+<H3><A name="SCAJavabinding.rss-Example"></A>Example</H3>
+
+<P>Continuing with the CustomerCollection example shown above, let's see how to implement one of the common access methods. In this case, let's look at the get method in a client and how one would display the items of a collection. When you declared your RSS binding in your SCA composite, you also provided a uri for your collection. Using a web browser or other device, a user performs an HTTP get request to this uri. The HTTP response for your get request contains a body which has the RSS SyndFeed seruialized as a SyndFeed. You may access this SyndFeed using Java, and display or present to a user the contents of the RSS feed.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+        SyndFeed feed = resourceCollection.getFeed();
+        <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-object">Object</SPAN> o : feed.getEntries()) {
+            SyndEntry e = (SyndEntry)o;
+            <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;id = &quot;</SPAN> + e.getUri() + <SPAN class="code-quote">&quot; entry = &quot;</SPAN> + e.getTitle());
+        }
+</PRE>
+</DIV></DIV>
+
+<P>Much of the code consists of converting from a RSS SyndFeed or SyndEntry to a business data model and storing to a collection.</P>
+
+<P>Tuscany uses Java Project ROME to provide a model for RSS data. Please see <A href="https://rome.dev.java.net/" class="external-link" rel="nofollow">Project ROME </A> for the Java methods to access RSS SyndFeeds and SyndEntries, and how to easily convert these Java objects to and from XML.</P>
+
+<H3><A name="SCAJavabinding.rss-OtherFeaturesoftheTuscanyRSSBinding"></A>Other Features of the Tuscany RSS Binding</H3>
+
+<P>In contrast to the Tuscany Atom binding, the Tuscany RSS binding does not provide:</P>
+
+<UL>
+	<LI>Data caching based on ETag and LastModified header fields.</LI>
+	<LI>JavaScript Object Notation (JSON) alternative to XML feeds and entry data.</LI>
+	<LI>Service document for site introspection.</LI>
+	<LI>Full featured JavaScript client for easy client side programming.</LI>
+</UL>
+
+
+<P>See the <A href="http://tuscany.apache.org/sca-java-bindingatom.html" class="external-link" rel="nofollow">Tuscany Atom Binding Support</A> for a description of these features and how users may get more benefits from the Atom binding.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-bindingws.html b/site/trunk/site-publish/sca-java-bindingws.html
new file mode 100644
index 0000000000..3d3f0a94a3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-bindingws.html
@@ -0,0 +1,249 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java binding.ws</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55963">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java binding.ws">SCA Java binding.ws</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavabinding.ws-%3Cbinding.ws%3E"></A>&lt;binding.ws&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports Web services by using the &lt;binding.ws&gt; SCDL extension. New Web service endpoints can be provided by using &lt;binding.ws&gt; within a SCA &lt;service&gt;, existing Web services can be invoked by using &lt;binding.ws&gt; within a SCA &lt;reference&gt;.</P>
+
+<P>The Web service binding is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-bindings" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<P>The Web service binding SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;binding.ws name=<SPAN class="code-quote">&quot;NCName&quot;</SPAN>? uri=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>? wsdlElement=<SPAN class="code-quote">&quot;xs:anyURI&quot;</SPAN>? wsdli:wsdlLocation=<SPAN class="code-quote">&quot;list of xs:anyURI&quot;</SPAN>? &gt;
+   &lt;wsa:EndpointReference&gt;...&lt;/wsa:EndpointReference&gt;*
+&lt;/binding.ws&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.ws-simpleuse"></A>simple use</H4>
+
+<P>All the attributes and elements of the Web service binding are optional, so the simplest way to use it is to use all the defaults:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.ws/&gt;</PRE>
+</DIV></DIV>
+
+<P>With that simplest form the endpoint which will be used is derived from the names of the component and binding. This works well for services but for references its likely not what you want, so with references the following is a more useful simplest form:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//someHost/someService&quot;</SPAN>/&gt;</SPAN></PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavabinding.ws-wsdlElement"></A>wsdlElement</H4>
+
+<P>The wsdlElement attribute indicates that a WSDL document exists which should be used and it points to the element within that WSDL to use. The value of the wsdlElement attribute can have one of the following four forms:</P>
+
+<OL>
+	<LI>Service:<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.service(&lt;service-name&gt;)<BR>
+ In this case, all the endpoints in the WSDL Service that have equivalent PortTypes with the SCA service or reference must be available to the SCA service or reference.</LI>
+	<LI>Port (WSDL 1.1):<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.port(&lt;service-name&gt;/&lt;port-name&gt;)<BR>
+ In this case, the identified port in the WSDL 1.1 Service must have an equivalent PortType with the SCA service or reference.</LI>
+	<LI>Endpoint (WSDL 2.0):<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.endpoint(&lt;service-name&gt;/&lt;endpoint-name&gt;)<BR>
+ In this case, the identified endpoint in the WSDL 2.0 Service must have an equivalent PortType with the SCA service or reference.</LI>
+	<LI>Binding:<BR>
+ &lt;WSDL-namespace-URI&gt;#wsdl.binding(&lt;binding-name&gt;)<BR>
+ In this case, the identified WSDL binding must have an equivalent PortType with the SCA service or reference. In this case the endpoint address URI for the SCA service or reference must be provided via the URI attribute on the binding.</LI>
+</OL>
+
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>What will the endpoint be?</B><BR>The actual Web service endpoint used depends on whether or not a WSDL port is being used, if the EndpointReference element or the uri attribute of the &lt;binding.ws&gt; has been specified, and the names of the component and binding. The actual alogrythim defined in the Web service binding specification is: 
+
+<OL>
+	<LI>Either the URIs in the endpoint(s) of the referenced WSDL<BR>
+  or the URI specified by the wsa:Address element of the wsa:EndpointReference</LI>
+	<LI>The explicitly stated URI in the &quot;uri&quot; attribute of the binding.ws element, which may be relative,</LI>
+	<LI>The implicit URI as defined by the Assembly specification</LI>
+</OL>
+
+
+<P>The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a relative URI, in which case it is relative to the URI defined in (2) or (3). The wsa:Address element can be the empty relative URI, in which case it uses the URI defined in (2) or (3) directly. This allows the EPR writer to specify reference parameters, metadata and other EPR contents while allowing the URI to be chosen by the deployer. To reference a WSDL document and also specify an EPR, the wsdlElement attribute must refer to a binding element in the WSDL and not an endpoint or service.</P></TD></TR></TABLE></DIV>
+
+<H4><A name="SCAJavabinding.ws-wsdlLocation"></A>wsdlLocation</H4>
+
+<P>The wsdlLocation attribute enables defining the location of the WSDL document to be used. Using wsdlLocation is not normally necessary as the Tuscany contrabution service will have discovered all the WSDL documents within a deployed SCA contrabution.</P>
+
+<H4><A name="SCAJavabinding.ws-wsa%3AEndpointReference"></A>wsa:EndpointReference</H4>
+
+<P>This attribute enables using a WS-Addressing EndpointReference that specifies the endpoint for the service or reference, or any WSA reference parameters, metadata and other EPR contents to be used.</P>
+
+<H3><A name="SCAJavabinding.ws-Someexamples%3A"></A>Some examples:</H3>
+
+<P>This example shows making a HelloWorld component available as a Web service endpoint. All the Web service binding defaults are used so the endpoint of the Web service will be <A href="http://localhost:8080/HelloWorldComponent" class="external-link" rel="nofollow">http://localhost:8080/HelloWorldComponent</A>.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>           targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>           xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>           name=<SPAN class="code-quote">&quot;helloworldws&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldComponent&quot;</SPAN>&gt;
+       &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN> /&gt;
+       &lt;binding.ws /&gt;
+    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;helloworld.HelloWorldImpl&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-definitionsxml.html b/site/trunk/site-publish/sca-java-definitionsxml.html
new file mode 100644
index 0000000000..461f7b6ce8
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-definitionsxml.html
@@ -0,0 +1,242 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java definitions.xml</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91982">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java definitions.xml">SCA Java definitions.xml</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="SCAJavadefinitions.xml-definitions.xml"></A>definitions.xml</H1>
+
+<P>Section 1.8 describes the definitions.xml file as holding all of the artifacts that are useful for configuring an SCA domain but that are not specific to a particular composite or component. It goes on to say that &quot;All of these artifacts within and SCA Domain are defined in a global, SCA Domain-wide file named definitions.xml&quot;. To achieve our extensibility goals we, in Tuscany, consider the SCA Domain wide definitions.xml file to be a logical concept that is constructed at runtime from the contents of definitions.xml files provided in contributions and in Tuscany extensions. </P>
+
+<P>Each definitions.xml file may contain.</P>
+
+<UL>
+	<LI>Intents</LI>
+	<LI>Policy sets</LI>
+	<LI>Predefined binding specifications</LI>
+	<LI>Binding type descriptions</LI>
+	<LI>Implementation type descriptions</LI>
+</UL>
+
+
+<H2><A name="SCAJavadefinitions.xml-CompleteFeatures"></A>Complete Features</H2>
+
+<H3><A name="SCAJavadefinitions.xml-AddIntentsandPolicySetswithanExtension"></A>Add Intents and Policy Sets with an Extension</H3>
+
+<P>An extension, such as the modules/policy-security extension relies on some policy sets and intents being available in the SCA Domain. The definitions.xml is the place to define these and hence if you look in this extension module you will find the following. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>
+    &lt;!-- POLICY SETS --&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;runAs&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;allow&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;rolesAllowed&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;permitAll&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    &lt;policySet name=<SPAN class="code-quote">&quot;denyAll&quot;</SPAN> appliesTo=<SPAN class="code-quote">&quot;sca:implementation.java&quot;</SPAN>/&gt;
+    
+	&lt;!-- Policy Intents Defined by the SCA <SPAN class="code-object">Runtime</SPAN> --&gt;
+	&lt;intent name=<SPAN class="code-quote">&quot;authentication&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent on references requires necessary authentication information
+			to be sent along with outgoing messages. Specifying <SPAN class="code-keyword">this</SPAN> intent on service requires
+			incoming messages to be authenticated
+		&lt;/description&gt;
+	&lt;/intent&gt;
+	
+	&lt;intent name=<SPAN class="code-quote">&quot;confidentiality&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent requires message exchanged to be encrypted
+		&lt;/description&gt;
+	&lt;/intent&gt;
+	
+	&lt;intent name=<SPAN class="code-quote">&quot;integrity&quot;</SPAN> 
+	 		constrains=<SPAN class="code-quote">&quot;sca:binding&quot;</SPAN>&gt;
+		&lt;description&gt;
+			Specifying <SPAN class="code-keyword">this</SPAN> intent requires message exchanged to be signed
+		&lt;/description&gt;
+	&lt;/intent&gt;
+&lt;/definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>When this module is loaded at runtime the contents of this file are made generally available and hence in you composite you can use statements such at. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+
+&lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+    &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+    &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> &gt;
+        &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.AddService&quot;</SPAN> /&gt;        
+        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/sample-calculator-ws-secure-webapp/AddServiceComponent&quot;</SPAN>
+</SPAN>                    requires=<SPAN class="code-quote">&quot;authentication&quot;</SPAN> /&gt;        
+    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where <TT>requires=&quot;authentication&quot;</TT> refers to <TT>intent name=&quot;authentication&quot;</TT> which is now available as an SCA Domain level definition.</P>
+
+<H2><A name="SCAJavadefinitions.xml-TODOFeatures"></A>TODO Features</H2>
+
+<H3><A name="SCAJavadefinitions.xml-AddIntentsandPolicySetswithaContribution"></A>Add Intents and Policy Sets with a Contribution</H3>
+
+<P>If contributionA provides a file such as:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;sca:definitions xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN> 			xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>
+&lt;sca:intent name=<SPAN class="code-quote">&quot;specialAuthentication&quot;</SPAN> 
+            constrains=<SPAN class="code-quote">&quot;sca:binding.ws&quot;</SPAN>&gt;
+    &lt;description&gt;
+        Communitcation thro <SPAN class="code-keyword">this</SPAN> binding required Authentication.
+    &lt;/description&gt;
+&lt;/sca:intent&gt;	
+ 
+&lt;/sca:definitions&gt;
+</PRE>
+</DIV></DIV>
+
+<P>and ContributionB provides a file such as:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;sca:policySet name=<SPAN class="code-quote">&quot;specialAuthenticationPolicy&quot;</SPAN>
+ 	       provides=<SPAN class="code-quote">&quot;tuscany:wsAuthentication&quot;</SPAN>
+ 	       appliesTo=<SPAN class="code-quote">&quot;<SPAN class="code-comment">//sca:binding.ws&quot;</SPAN>&gt;
+</SPAN>    &lt;tuscany:wsConfigParam&gt;
+        &lt;parameter name=<SPAN class="code-quote">&quot;OutflowSecurity&quot;</SPAN>&gt;
+            &lt;action&gt;
+                &lt;items&gt;UsernameToken&lt;/items&gt;
+                &lt;user&gt;TuscanyWsUser&lt;/user&gt;
+                &lt;passwordCallbackClass&gt;my.PWCBHandler&lt;/passwordCallbackClass&gt;&quot;
+                &lt;passwordType&gt;PasswordText&lt;/passwordType&gt;
+            &lt;/action&gt;
+        &lt;/parameter&gt;
+    &lt;/tuscany:wsConfigParam&gt;
+&lt;/sca:policySet&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then both the itent and the policySet should be available in the logical SCA Domain-wide definitions.xml and the policySet &quot;specialAuthenticationPolicy&quot; should successfully find the intent &quot;tuscany:wsAuthentication&quot;. Composite files contributed to the domain will successfully be able to reference both the intent and the policy set. </P>
+
+<P>See: </P>
+
+<P><A href="https://issues.apache.org/jira/browse/TUSCANY-2499" class="external-link" rel="nofollow">https://issues.apache.org/jira/browse/TUSCANY-2499</A><BR>
+<A href="http://www.mail-archive.com/dev@tuscany.apache.org/msg01077.html" class="external-link" rel="nofollow">http://www.mail-archive.com/dev%40tuscany.apache.org/msg01077.html</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-developer-reference.html b/site/trunk/site-publish/sca-java-developer-reference.html
new file mode 100644
index 0000000000..a956ff780f
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-developer-reference.html
@@ -0,0 +1,352 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Developer Reference</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55369">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Developer Reference">SCA Java Developer Reference</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Downloads-remove%20after%20upgrade%20to%20new%20format&linkCreation=true&fromPageId=47581" class="createlink">Downloads</A><BR>
+<A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" class="createlink">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" class="createlink">Java Doc</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca" class="external-link" rel="nofollow">Java SCA Source </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJavaDeveloperReference-SystemModules"></A>System Modules</H2>
+
+<P>Modules that are required by the system but which are not user configurable. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA assembly model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-xml </TD>
+<TD class="confluenceTd"> The processors that load the basic SCA assembly model from XML (SCDL) files </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-java-dsl </TD>
+<TD class="confluenceTd"> The java domain specific language for describing SCA assembly models </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-axis2 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-xml </TD>
+<TD class="confluenceTd"> The processors that parse the &lt;binding.ws&gt; to create model objects </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> commonj-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution </TD>
+<TD class="confluenceTd"> Models and SPIs for the contribution service </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution-impl </TD>
+<TD class="confluenceTd"> Implementation of the contribution service and a set of built-in package/artifact processors </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core </TD>
+<TD class="confluenceTd"> The core that&nbsp;handles bootstrapping and&nbsp;provides life cylce, event and scope managements <BR class="atl-forced-newline">
+The runtime wiring and invocation chains </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-databinding </TD>
+<TD class="confluenceTd"> The module that contributes interceptors, databinding and transformers&nbsp;to&nbsp;core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-spi </TD>
+<TD class="confluenceTd"> The SPIs for core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding </TD>
+<TD class="confluenceTd"> The SPIs for the databinding framework, default implementations and&nbsp;built-in transformers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support for AXIOM databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-jaxb </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;JAXB databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;SDO databinding&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support optimzed SDO to AXIOM transformation </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> discovery-jms </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-http </TD>
+<TD class="confluenceTd"> The module that provides&nbsp;support for the HTTP&nbsp;protocol </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-webapp </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-runtime </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-xml </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface </TD>
+<TD class="confluenceTd"> The representation of interfaces independent of the interface definition languages </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for java interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.java model from the XML (SCDL)&nbsp;or introspect the java&nbsp;classes </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for&nbsp;WSDL interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.wsdl model from the XML (SCDL)&nbsp;or introspect the WSDL definition </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the java interface related extension points and extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the&nbsp;WSDL interface related extension points and extensions&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA&nbsp;policy model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> sca-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-development-guide-osgi.html b/site/trunk/site-publish/sca-java-development-guide-osgi.html
new file mode 100644
index 0000000000..6629361f18
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-development-guide-osgi.html
@@ -0,0 +1,503 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java Development Guide (OSGI) : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogoCake.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=100579">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Development Guide (OSGI)">SCA Java Development Guide (OSGI)</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/" title="Visit page outside Confluence" rel="nofollow">1.x Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" title="Visit page outside Confluence" rel="nofollow">2.x Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>How to get involved in development of Java SCA?</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P>This document is the development guideline for SCA Java project.</P>
+<UL>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-GeneralGuide" title="#General Guide">General Guide\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-GettingSource" title="#Getting Source">Getting Source code\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-Setup" title="#Setup">Setting up your development environment\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-IDE" title="#IDE">Importing SCA modules into your Development IDE\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-CodingGuidelines" title="#Coding Guidelines">Coding Guidelines\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-Testing" title="#Testing">Testing\</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-ClientApplications" title="Client Applications on SCA Java Development Guide (OSGI)">Client Applications</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-MavenBuildStructure" title="#Maven Build Structure">Maven Build Structure\</A></LI>
+	<LI><B>Development Hints</B>
+	<UL>
+		<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-WebappinEclipse" title="#Webapp in Eclipse">Generating Eclipse WTP Web Projects for Webapp samples\</A></LI>
+		<LI><A href="#SCAJavaDevelopmentGuide%2528OSGI%2529-Ant" title="#Ant">Generating Dependencies for Ant in Samples\</A></LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-GeneralGuide"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-GeneralGuide"></A> General Guide</H3>
+
+<P>Welcome to the Tuscany SCA Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA.</LI>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>The Java SCA infrastructure should provide flexibility and choice. It should not dictate programming models but support many.</LI>
+	<LI>The Java SCA infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-Prerequisites"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-Prerequisites"></A> Prerequisites</H3>
+
+<P>Java SCA requires the following:</P>
+<UL>
+	<LI><SPAN class="nobr"><A href="http://java.sun.com/j2se/1.5.0" title="Visit page outside Confluence" rel="nofollow">JDK 5.0&#43; (J2SE 1.5.0+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://maven.apache.org/" title="Visit page outside Confluence" rel="nofollow">Apache Maven (2.0.9+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://subversion.tigris.org/" title="Visit page outside Confluence" rel="nofollow">Subversion (1.5+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> or <SPAN class="nobr"><A href="http://tortoisesvn.tigris.org/" title="Visit page outside Confluence" rel="nofollow">TortoiseSVN (1.5.x+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://www.eclipse.org/downloads" title="Visit page outside Confluence" rel="nofollow">Eclipse PDE (Ganymede ) <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide%28OSGI%29-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/branches/sca-equinox/</SPAN></PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-SettingupyourDevelopmentEnvironment"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-Setup"></A> Setting up your Development Environment</H3>
+
+<H4><A name="SCAJavaDevelopmentGuide%28OSGI%29-topdownbuild%28recommendedapproach%29"></A>top-down build (recommended approach)</H4>
+
+<P>Check out all of the java source code.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout http:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/branches/sca-equinox/</SPAN></PRE>
+</DIV></DIV>
+<P>Building the SCA source code :</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">cd  tools\maven\maven-eclipse-compiler
+mvn clean install
+cd ..\..\..\modules
+mvn -Dmaven.test.skip=<SPAN class="code-keyword">true</SPAN> -fae clean install
+cd ..\distribution
+mvn -Dmaven.test.skip=<SPAN class="code-keyword">true</SPAN> -fae clean install</PRE>
+</DIV></DIV>
+<P>It should work even if you start with an empty Maven local repository, and it should always work, however when you are building for Tuscany for the first time there are a lot of dependencies which must be downloaded so the first build can take a long time and it may fail with problems retrieving the dependencies.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The trunk code sometimes has SNAPSHOT dependencies which can get out of date in your local repository so if you see odd build failures try updating the SNAPSHOT jars by using the &quot;-U&quot; parameter in the mvn command.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Once you have done a top-down build, and your local maven repository is populated, you can start using the maven off line option to speed up the build process by using the &quot;-o&quot; parameter in the mvn command.</P>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="infoMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>
+<P> The SCA build consumes a good amount of memory, in case you are seeing issues during the build, set a MAVEN_OPTS environment variable to allocate more memory for the build process.</P>
+
+<P> Windows : SET MAVEN_OPTS=-Xmx512m<BR>
+ Unix    : export MAVEN_OPTS=-Xmx512m</P></TD></TR></TABLE>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-ImportingSCAmodulesintoyourDevelopmentIDE"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-IDE"></A>Importing SCA modules into your Development IDE</H3>
+
+
+<H4><A name="SCAJavaDevelopmentGuide%28OSGI%29-UsingEclipse"></A>Using Eclipse</H4>
+
+
+<P>If this is the first time you are using your workspace with maven m2 local repository, you will need to tell your Eclipse workspace the location of the directory, and you can do this with the following command :</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn -Declipse.workspace=[path-to-eclipse-workspace] eclipse:add-maven-repo</PRE>
+</DIV></DIV>
+<P>In order to generate the necessary project files to import the SCA modules to Eclipse, you can use the maven eclipse plugin</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn -fae -Peclipse eclipse:eclipse</PRE>
+</DIV></DIV>
+
+
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the project from SCA Modules into your Eclipse Workspace.</P>
+
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then import the &quot;PDE Target&quot; project (from distribution/pdetarget) into your Eclipse Workspace.</P>
+
+<UL>
+	<LI>Import distribution/pdetarget</LI>
+	<LI>Inside eclipse, open tuscany-distribution-pdetarget project
+	<UL>
+		<LI>open target/tuscany-distribution-pdetarget.target</LI>
+		<LI>click &quot;Set as target platform&quot; on the upper-right side of the overview window that opened</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>There are some Tuscany Eclipse code templates available:<BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codestyle.xml" title="Visit page outside Confluence" rel="nofollow">Eclipse Style Formatter <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codetemplates.xml" title="Visit page outside Confluence" rel="nofollow">Eclipse Templates <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-CodingGuidelines"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-CodingGuidelines"></A> Coding Guidelines</H3>
+
+<P>There are a few simple guidelines when developing for JAVA SCA:</P>
+<UL>
+	<LI>The basic coding style used is the described at <SPAN class="nobr"><A href="http://java.sun.com/docs/codeconv/" title="Visit page outside Confluence" rel="nofollow">Sun Java coding standards<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> but the main thing is to be consistent with the existing code you're updating, so for example, if you're updating a method that uses the braces on the same line style don't add code with the hanging braces style.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files (both source code files and resource files such as xml documents)</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<P>While Tuscany does not yet have an official style or template, here are some templates that folks have been using and have been checked into the build which are stored at <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/tuscany/java/etc/" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/java/etc/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="SCAJavaDevelopmentGuide%28OSGI%29-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, java/sca/module/implementation-java would be in package structure org.apache.tuscany.implementation.java.&#42;</P>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-Testing"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-Testing"></A> Testing</H3>
+
+<P>Tuscany uses plain junit test cases to perform unit and integration testing, below is an example that can also be used as a template for writing new test cases; it demonstrates how to bootstrap the Tuscany SCA runtime in your test case, and because they are based on junit, you can run it from your IDE of choice or from Maven.</P>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="infoMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>
+<P>Note that we are using JUnit 4.2 code style in OSGI development stream</P></TD></TR></TABLE>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">/**
+ * Description of your test <SPAN class="code-keyword">case</SPAN> and necessary details you find necessary
+ */
+@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorTestCase {
+
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> CalculatorService calculatorService;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> NodeLauncher launcher;
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> Node node;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        CalculatorTestCase.calculatorService = calculatorService;
+    }
+    
+    
+    @BeforeClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void setUpBeforeClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        launcher = NodeLauncher.newInstance();
+        <SPAN class="code-object">String</SPAN> location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        node = launcher.createNode(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>, <SPAN class="code-keyword">new</SPAN> Contribution(<SPAN class="code-quote">&quot;test&quot;</SPAN>, location));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA Node API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + node.getClass().getClassLoader());
+        node.start();
+    }
+
+    @AfterClass
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void tearDownAfterClass() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-keyword">if</SPAN> (node != <SPAN class="code-keyword">null</SPAN>) {
+            node.stop();
+            node.destroy();
+        }
+        <SPAN class="code-keyword">if</SPAN> (launcher != <SPAN class="code-keyword">null</SPAN>) {
+            launcher.destroy();
+        }
+    }
+
+    @Test
+    <SPAN class="code-keyword">public</SPAN> void testCalculator() <SPAN class="code-keyword">throws</SPAN> Exception {
+        <SPAN class="code-comment">// Calculate
+</SPAN>        assertEquals(calculatorService.add(3, 2), 5.0);
+        assertEquals(calculatorService.subtract(3, 2), 1.0);
+        assertEquals(calculatorService.multiply(3, 2), 6.0);
+        assertEquals(calculatorService.divide(3, 2), 1.5);
+    }
+}</PRE>
+</DIV></DIV>
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a &#42;*/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-ClientApplicationsasSCAComponents"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-ClientApplications"></A> Client Applications as SCA Components</H3>
+
+<P>Below is how you can build client applications as an SCA component.</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">@Scope(<SPAN class="code-quote">&quot;COMPOSITE&quot;</SPAN>) @EagerInit
+<SPAN class="code-keyword">public</SPAN> class CalculatorClient {
+    
+    <SPAN class="code-keyword">private</SPAN> CalculatorService calculatorService;
+
+    @Reference
+    <SPAN class="code-keyword">public</SPAN> void setCalculatorService(CalculatorService calculatorService) {
+        <SPAN class="code-keyword">this</SPAN>.calculatorService = calculatorService;
+    }
+    
+    @Init
+    <SPAN class="code-keyword">public</SPAN> void calculate() {
+
+        <SPAN class="code-comment">// Calculate
+</SPAN>        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;SCA API <SPAN class="code-object">ClassLoader</SPAN>: &quot;</SPAN> + print(Reference.class.getClassLoader()));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 + 2=&quot;</SPAN> + calculatorService.add(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 - 2=&quot;</SPAN> + calculatorService.subtract(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 * 2=&quot;</SPAN> + calculatorService.multiply(3, 2));
+        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;3 / 2=&quot;</SPAN> + calculatorService.divide(3, 2));
+    }
+    
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> <SPAN class="code-object">String</SPAN> print(<SPAN class="code-object">ClassLoader</SPAN> cl) {
+        <SPAN class="code-object">StringBuffer</SPAN> buf = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">StringBuffer</SPAN>();
+        <SPAN class="code-keyword">for</SPAN> (; cl != <SPAN class="code-keyword">null</SPAN>;) {
+            buf.append(cl.toString());
+            buf.append(' ');
+            cl = cl.getParent();
+        }
+        <SPAN class="code-keyword">return</SPAN> buf.toString();
+    }
+
+}</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-MavenBuildStructure"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-MavenBuildStructure"></A> Maven Build Structure</H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.sca</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn &#45;Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide%28OSGI%29-Addinganewmoduleandnotreadytointegrate%3F"></A>Adding a new module and not ready to integrate?</H4>
+
+<P>'work-in-progress' modules can be worked on in the same source tree and yet not break the top-down build. You can do this by not listing your module(s) in java/sca/modules/pom.xml.</P>
+
+<H2><A name="SCAJavaDevelopmentGuide%28OSGI%29-DevelopmentHints"></A>Development Hints</H2>
+
+<H3><A name="SCAJavaDevelopmentGuide%28OSGI%29-GeneratingEclipseWTPWebProjectsforWebappsamples"></A><A name="SCAJavaDevelopmentGuide%28OSGI%29-WebappinEclipse"></A> Generating Eclipse WTP Web Projects for Webapp samples</H3>
+
+<P>If you're using Eclipse WTP and want to get WTP Web Projects generated<BR>
+for our Webapp samples you can simply pass a &#45;Dwtpversion=1.5 option to<BR>
+the usual mvn eclipse:eclipse command, like this:<BR>
+mvn &#45;Dwtpversion=1.5 &#45;Peclipse eclipse:eclipse</P>
+
+<P>The magic &#45;Dwtpversion=1.5 option will add the WTP Web project nature to<BR>
+all the Eclipse projects with &lt;packaging&gt;war&lt;/packaging&gt; in their Maven<BR>
+pom.xml. You'll then be able to add these projects to a WTP Tomcat or<BR>
+Geronimo Server configuration, to publish and run them straight from<BR>
+your Eclipse workspace.</P>
+
+<P>h3:<A name="SCAJavaDevelopmentGuide%28OSGI%29-Ant"></A> Generating Dependencies for Ant in Samples</P>
+
+<P>Figuring out the package dependency to include in Ant build.xml can be a pain. Here is a quick<BR>
+script which works in Linux environment for war files.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">jar tvf sample-feed-aggregator-webapp.war | grep .jar | awk '{ printf <SPAN class="code-quote">&quot;%s\n&quot;</SPAN>, $8 }' | sed -e <SPAN class="code-quote">&quot;s/WEB-INF\/lib\<SPAN class="code-comment">///&quot;</SPAN> | awk '{ printf <SPAN class="code-quote">&quot;&lt;include name=\&quot;</SPAN>%s\<SPAN class="code-quote">&quot;/&gt;\n&quot;</SPAN>, $1 }' | grep -v tuscany</SPAN></PRE>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-development-guide.html b/site/trunk/site-publish/sca-java-development-guide.html
new file mode 100644
index 0000000000..96504b6988
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-development-guide.html
@@ -0,0 +1,588 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Development Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47570">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Development Guide">SCA Java Development Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>How to get involved in development of Java SCA?</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P>This document is the development guideline for SCA Java project.</P>
+<UL>
+	<LI><A href="#SCAJavaDevelopmentGuide-GeneralGuide">General Guide</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-GettingSource">Getting Source code</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Setup">Setting up your development environment</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Distributions">Building the binary and source distributions</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-IDE">Importing SCA modules into your Development IDE</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-CodePath">Understanding SCA Code Path</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-CodingGuidelines">Coding Guidelines</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Testing">Testing</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-MavenBuildStructure">Maven Build Structure</A></LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-Providingpatches">Reporting Issues and Providing patches</A></LI>
+	<LI><B>Development Hints</B>
+	<UL>
+		<LI><A href="#SCAJavaDevelopmentGuide-WebappinEclipse">Generating Eclipse WTP Web Projects for Webapp samples</A></LI>
+		<LI><A href="#SCAJavaDevelopmentGuide-Ant">Generating Dependencies for Ant in Samples</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaDevelopmentGuide-ReleaseChecklist">How to do a release of Tuscany? </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Logging,%20Tracing,%20and%20Timing%20in%20Tuscany" class="external-link" rel="nofollow">Logging, Tracing, and Timing in Tuscany</A></LI>
+</UL>
+
+
+<P><BR class="atl-forced-newline">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopmentGuide-GeneralGuide"></A><A name="SCAJavaDevelopmentGuide-GeneralGuide"></A> General Guide</H3>
+
+<P>Welcome to the Tuscany SCA Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA.</LI>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>The Java SCA infrastructure should provide flexibility and choice. It should not dictate programming models but support many.</LI>
+	<LI>The Java SCA infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+
+<H3><A name="SCAJavaDevelopmentGuide-Prerequisites"></A><A name="SCAJavaDevelopmentGuide-Prerequisites"></A> Prerequisites</H3>
+
+<P>Java SCA requires the following:</P>
+<UL>
+	<LI><A href="http://java.sun.com/j2se/1.5.0" class="external-link" rel="nofollow">JDK 5.0&#43; (J2SE 1.5.0+)</A></LI>
+	<LI><A href="http://maven.apache.org/" class="external-link" rel="nofollow">Apache Maven (2.0.7+)</A></LI>
+	<LI><A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">Subversion (1.2+)</A> or <A href="http://tortoisesvn.tigris.org/" class="external-link" rel="nofollow">TortoiseSVN (1.4.x+)</A></LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopmentGuide-GettingSourcecode"></A><A name="SCAJavaDevelopmentGuide-GettingSource"></A> Getting Source code</H3>
+
+<P>The Java SCA project Subversion repository is located at <A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/</A>.<BR>
+The repository can also be viewed online at <A href="http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/</A></P>
+
+<P>Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so.</P>
+
+<H4><A name="SCAJavaDevelopmentGuide-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows (note that it uses http scheme so if you're a committer change it to https):</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout http:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/ sca-java-1.x</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaDevelopmentGuide-CommittingChangestoSubversion"></A>Committing Changes to Subversion</H4>
+
+<P>Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.</P>
+
+<P>Tuscany committers should configure these properties in the svn per-user config. On Unix-like systems, this area appears as a directory named .subversion in the user's home directory. On Win32 systems, Subversion creates a folder named Subversion, typically inside the Application Data area of the user's profile directory (C:\Documents and Settings\&lt;user name&gt;\Application Data\Subversion, which, by the way, is usually a hidden directory). </P>
+
+<P>Please make sure the following properties are set in the &quot;config&quot; file:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+[miscellany]
+...
+enable-auto-props = yes
+
+[auto-props]
+### The format of the entries is:
+###   file-name-pattern = propname[=value][;propname[=value]...]
+### The file-name-pattern can contain wildcards (such as '*' and
+### '?').  All entries which match will be applied to the file.
+### Note that auto-props functionality must be enabled, which
+### is typically done by setting the 'enable-auto-props' option.
+
+*.c = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+*.cpp = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+*.h = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+*.dsp = svn:eol-style=CRLF
+*.dsw = svn:eol-style=CRLF
+*.sh = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:executable
+*.txt = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+*.png = svn:mime-type=image/png
+*.jpg = svn:mime-type=image/jpeg
+Makefile = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+
+*.java = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.xml = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.xsd = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.html = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.properties = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.jelly = svn:eol-style=<SPAN class="code-keyword">native</SPAN>;svn:keywords=Rev Date
+*.ipr = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+*.iml = svn:eol-style=<SPAN class="code-keyword">native</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Once your password is set, you can use a command like this to commit:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn commit
+</PRE>
+</DIV></DIV>
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn --username &lt;name&gt; commit
+</PRE>
+</DIV></DIV>
+<P>Subversion will prompt you for a password, and once you've entered it, it will remember it for you. Note this is the password you configured with svnpasswd not your shell or other password.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-SettingupyourDevelopmentEnvironment"></A><A name="SCAJavaDevelopmentGuide-Setup"></A> Setting up your Development Environment</H3>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-Buildtreestructure"></A>Build tree structure</H4>
+
+<P>The build tree is designed to facilitate modular development and releases. Maven modules are grouped by how they are released under an hierarchy. Java SCA currently have the below module hierarchy :</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>-java
+ |-- sca
+     |-- demos                SCA demo applications
+     |-- distribution         SCA distributions
+     |-- itest                SCA Integration Tests
+     |-- modules              SCA Implementation Modules (core, runtimes, contribution, extensions, etc)
+     |-- samples              SCA Sample Applications
+     |-- tools                SCA Tools (Eclipse plugins, wsdl2java, java2wsdl, etc)
+     |-- tutorial             SCA Tutorial
+</PRE>
+</DIV></DIV>
+<P>The individual modules can be built separately or build with top-down build.</P>
+
+<H4><A name="SCAJavaDevelopmentGuide-topdownbuild%28recommendedapproach%29"></A>top-down build (recommended approach)</H4>
+
+<P>Check out all of the java source code.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn checkout http:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/ sca-java-1.x</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Building the SCA source code is simple</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca-java-1.x
+mvn
+</PRE>
+</DIV></DIV>
+<P>It should work even if you start with an empty Maven local repository, and it should always work, however when you are building for Tuscany for the first time there are a lot of dependencies which must be downloaded so the first build can take a long time and it may fail with problems retrieving the dependencies. </P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The trunk code sometimes has SNAPSHOT dependencies which can get out of date in your local repository so if you see odd build failures try updating the SNAPSHOT jars with:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -U
+</PRE>
+</DIV></DIV>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Once you have done a top-down build, and your local maven repository is populated, you can start using the maven off line option to speed up the build process</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -o
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The SCA build consumes a good amount of memory, in case you are seeing issues during the build, set a MAVEN_OPTS environment variable to allocate more memory for the build process.
+
+<P>   Windows : SET MAVEN_OPTS=-Xmx512m<BR>
+   Unix    : export MAVEN_OPTS=-Xmx512m</P></TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The &quot;trunk&quot; is always in very active development, and sometimes you might experience issues trying to build some modules, in that case you can tell maven to continue building other modules
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -fae clean install
+</PRE>
+</DIV></DIV>
+
+<P>or either skip all unit tests</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -fae -Dmaven.test.skip=<SPAN class="code-keyword">true</SPAN> clean install
+</PRE>
+</DIV></DIV>
+
+<P>or run tests, but do not stop building if one of the tests fails</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -fn clean install
+</PRE>
+</DIV></DIV></TD></TR></TABLE></DIV>
+
+<H4><A name="SCAJavaDevelopmentGuide-Buildingthebinaryandsourcedistributions"></A><A name="SCAJavaDevelopmentGuide-Distributions"></A> Building the binary and source distributions</H4>
+
+<P>The binary and source distribution release artifacts are created by running maven in the distribution folder, for example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca-java-1.x/distribution
+mvn clean install -o
+</PRE>
+</DIV></DIV>
+<P>The distribution artifacts can then be found in the folder named &quot;target&quot; within the distribution folder. </P>
+
+<H3><A name="SCAJavaDevelopmentGuide-ImportingSCAmodulesintoyourDevelopmentIDE"></A><A name="SCAJavaDevelopmentGuide-IDE"></A>Importing SCA modules into your Development IDE</H3>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-UsingEclipse"></A>Using Eclipse</H4>
+
+<P>If this is the first time you are using your workspace with maven m2 local repository, you will need to tell your Eclipse workspace the location of the directory, and you can do this with the following command :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Declipse.workspace=[path-to-eclipse-workspace] eclipse:add-maven-repo
+</PRE>
+</DIV></DIV>
+<P>In order to generate the necessary project files to import the SCA modules to Eclipse, you can use the maven eclipse plugin</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd sca-java-1.x
+mvn eclipse:eclipse
+</PRE>
+</DIV></DIV>
+<P>Now, launch your Eclipse IDE, select File-&gt;Import-&gt;Existing projects into Workplace, and then select the base SCA directory (e.g java/sca) and then press Finish, this should import all SCA modules into your Eclipse Workspace.</P>
+
+<P>There are some Tuscany Eclipse code templates available:<BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codestyle.xml" class="external-link" rel="nofollow">Eclipse Style Formatter </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/etc/tuscany-eclipse-codetemplates.xml" class="external-link" rel="nofollow">Eclipse Templates </A></P>
+
+
+
+<H3><A name="SCAJavaDevelopmentGuide-UnderstandingSCAcodepath"></A><A name="SCAJavaDevelopmentGuide-CodePath"></A> Understanding SCA code path</H3>
+
+<P>Here is a walk through of <A href="sca-java-get-started-with-coding.html" title="SCA Java Get Started with Coding">key methods/functions</A> which help you get started with SCA Java development.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-CodingGuidelines"></A><A name="SCAJavaDevelopmentGuide-CodingGuidelines"></A> Coding Guidelines</H3>
+
+<P>There are a few simple guidelines when developing for JAVA SCA:</P>
+<UL>
+	<LI>The basic coding style used is the described at <A href="http://java.sun.com/docs/codeconv/" class="external-link" rel="nofollow">Sun Java coding standards</A> but the main thing is to be consistent with the existing code you're updating, so for example, if you're updating a method that uses the braces on the same line style don't add code with the hanging braces style.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files (both source code files and resource files such as xml documents)</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<P>Some other useful suggestions:</P>
+<DIV class="panel" style="border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Clean Code</B></DIV><DIV class="panelContent">
+<UL class="alternate" type="square">
+	<LI>use correct visibility, private, default, public, avoid protected</LI>
+	<LI>make methods static if not using object state</LI>
+	<LI>make sure javadoc is in sync or remove that javadoc</LI>
+	<LI>no javadoc on overridden methods</LI>
+	<LI>test cases in same package to avoid having to over-open access to methods</LI>
+	<LI>don't create artificial dependencies by using constants from another module</LI>
+	<LI>don't extend/implement a 'constant' interface</LI>
+	<LI>avoid creating another private layer over a public interface/spi</LI>
+	<LI>remove old code, don't leave it commented out, very confusing</LI>
+	<LI>use functional programming names for functions that convert an object</LI>
+	<LI>add javadoc to private methods</LI>
+	<LI>review class javadoc and make sure it's accurate</LI>
+	<LI>inline methods used only once, or make them clean static functions</LI>
+	<LI>put utility methods in a Util class with package visibility</LI>
+	<LI>use static imports</LI>
+	<LI>use scoped variables</LI>
+	<LI>no stars in OSGi exports</LI>
+	<LI>correct use of generics, see the effective Java book</LI>
+</UL>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Unit/Integration Tests</B></DIV><DIV class="panelContent">
+<UL class="alternate" type="square">
+	<LI>put comments in test cases</LI>
+	<LI>review test cases and make sure they're included in the build</LI>
+	<LI>use junit 4 only, check correct use of @BeforeClass or @Before</LI>
+	<LI>use static imports for assert statements</LI>
+</UL>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Formatting</B></DIV><DIV class="panelContent">
+<UL class="alternate" type="square">
+	<LI>use Tuscany eclipse code style/formatter</LI>
+	<LI>no tabs</LI>
+	<LI>no excessive line wrapping</LI>
+</UL>
+</DIV></DIV>
+
+<P>While Tuscany does not yet have an official style or template, here are some templates that folks have been using and have been checked into the build which are stored at <A href="https://svn.apache.org/repos/asf/tuscany/java/etc/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/tuscany/java/etc/</A></P>
+
+<H4><A name="SCAJavaDevelopmentGuide-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, java/sca/module/implementation-java would be in package structure org.apache.tuscany.implementation.java.&#42;</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-Testing"></A><A name="SCAJavaDevelopmentGuide-Testing"></A> Testing</H3>
+
+<P>Tuscany uses plain junit test cases to perform unit and integration testing, below is an example that can also be used as a template for writing new test cases; it demonstrates how to bootstrap the Tuscany SCA runtime in your test case, and because they are based on junit, you can run it from your IDE of choice or from Maven.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * Description of your test <SPAN class="code-keyword">case</SPAN> and necessary details you find necessary
+ */
+<SPAN class="code-keyword">public</SPAN> class YourTestCase <SPAN class="code-keyword">extends</SPAN> TestCase {
+    <SPAN class="code-keyword">private</SPAN> SCADomain domain;
+    <SPAN class="code-keyword">private</SPAN> YourService service;
+
+
+    @Override
+    <SPAN class="code-keyword">protected</SPAN> void setUp() <SPAN class="code-keyword">throws</SPAN> Exception {
+    	domain = SCADomain.newInstance(<SPAN class="code-quote">&quot;YourTest.composite&quot;</SPAN>);
+        service = domain.getService(YourService.class, <SPAN class="code-quote">&quot;serviceName&quot;</SPAN>);
+    }
+
+    @Override
+    <SPAN class="code-keyword">protected</SPAN> void tearDown() <SPAN class="code-keyword">throws</SPAN> Exception {
+    	domain.close();
+    }
+
+
+   ...
+}
+</PRE>
+</DIV></DIV>
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Note that we use surefire maven plugin to run the unit and integration tests, and in most cases, they are configured to match a &#42;*/*TestCase.java file name pattern. Because of this, if your test case has a different file name pattern, you might execute it from your IDE of choice, but the maven build won't execute the test.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-MavenBuildStructure"></A><A name="SCAJavaDevelopmentGuide-MavenBuildStructure"></A> Maven Build Structure</H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group id: org.apache.tuscany.sca</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn &#45;Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopmentGuide-Addinganewmoduleandnotreadytointegrate%3F"></A>Adding a new module and not ready to integrate?</H4>
+
+<P>'work-in-progress' modules can be worked on in the same source tree and yet not break the top-down build. You can do this by not listing your module(s) in java/sca/modules/pom.xml.</P>
+
+<H3><A name="SCAJavaDevelopmentGuide-Reportingissuesandprovidingpatches"></A><A name="SCAJavaDevelopmentGuide-Providingpatches"></A> Reporting issues and providing patches</H3>
+
+<H3><A name="SCAJavaDevelopmentGuide-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="SCAJavaDevelopmentGuide-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopmentGuide-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="SCAJavaDevelopmentGuide-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P>
+<P></P>
+
+<H2><A name="SCAJavaDevelopmentGuide-DevelopmentHints"></A>Development Hints</H2>
+
+
+<H3><A name="SCAJavaDevelopmentGuide-GeneratingEclipseWTPWebProjectsforWebappsamples"></A><A name="SCAJavaDevelopmentGuide-WebappinEclipse"></A> Generating Eclipse WTP Web Projects for Webapp samples</H3>
+
+<P>If you're using Eclipse WTP and want to get WTP Web Projects generated<BR>
+for our Webapp samples you can simply pass a &#45;Dwtpversion=1.5 option to<BR>
+the usual mvn eclipse:eclipse command, like this:<BR>
+mvn &#45;Dwtpversion=1.5 &#45;Peclipse eclipse:eclipse</P>
+
+<P>The magic &#45;Dwtpversion=1.5 option will add the WTP Web project nature to<BR>
+all the Eclipse projects with &lt;packaging&gt;war&lt;/packaging&gt; in their Maven<BR>
+pom.xml. You'll then be able to add these projects to a WTP Tomcat or<BR>
+Geronimo Server configuration, to publish and run them straight from<BR>
+your Eclipse workspace.</P>
+
+<P>h3:<A name="SCAJavaDevelopmentGuide-Ant"></A> Generating Dependencies for Ant in Samples</P>
+
+<P>Figuring out the package dependency to include in Ant build.xml can be a pain. Here is a quick<BR>
+script which works in Linux environment for war files.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+jar tvf sample-feed-aggregator-webapp.war | grep .jar | awk '{ printf <SPAN class="code-quote">&quot;%s\n&quot;</SPAN>, $8 }' | 
+   sed -e <SPAN class="code-quote">&quot;s/WEB-INF\/lib\<SPAN class="code-comment">///&quot;</SPAN> | awk '{ printf <SPAN class="code-quote">&quot;&lt;include name=\&quot;</SPAN>%s\<SPAN class="code-quote">&quot;/&gt;\n&quot;</SPAN>, $1 }' | grep -v tuscany</SPAN>
+</PRE>
+</DIV></DIV>
+
+<H2><A name="SCAJavaDevelopmentGuide-HowtodoareleaseofTuscany%3F"></A><A name="SCAJavaDevelopmentGuide-ReleaseChecklist"></A> How to do a release of Tuscany?</H2>
+<P>Here is the <A href="making-releases.html" title="Making releases">Checklist for doing a Tuscany SCA Java release </A>.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-development.html b/site/trunk/site-publish/sca-java-development.html
new file mode 100644
index 0000000000..c3df60ac71
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-development.html
@@ -0,0 +1,337 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Development : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47570">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Development">SCA Java Development</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="events.html" title="Events">Events </A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">ASF <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>How to get involved in development of Java SCA?</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P>This document is the development guideline for SCA Java project. </P>
+
+<UL>
+	<LI><A href="#SCAJavaDevelopment-GeneralGuide" title="General Guide on SCA Java Development">General Guide</A></LI>
+	<LI><A href="#SCAJavaDevelopment-GettingSource" title="Getting Source on SCA Java Development">Getting Source</A></LI>
+	<LI><A href="#SCAJavaDevelopment-GettingSetup" title="Getting Setup on SCA Java Development">Getting Setup For Development</A>
+	<UL>
+		<LI>Prerequisite</LI>
+		<LI>Building</LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaDevelopment-CodingGuidelines" title="Coding Guidelines on SCA Java Development">Coding Guidelines</A></LI>
+	<LI><A href="#SCAJavaDevelopment-Testing" title="Testing on SCA Java Development">Testing</A></LI>
+	<LI><A href="#SCAJavaDevelopment-MavenBuildStructure" title="Maven Build Structure on SCA Java Development">Maven Build Structure</A></LI>
+</UL>
+
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-GeneralGuide"></A><FONT color="#0099cc">General Guide</FONT></H3>
+
+<P>Welcome to the Tuscany SCA Java subproject project. We look forward to your participation and try to help you get on board. Feel free to ask your questions on the mailing list.</P>
+
+<P>Here are some general guidelines we use in this project.</P>
+<UL>
+	<LI>Java SCA sub-project aims to provide enterprise-grade service infrastructure based on SCA.</LI>
+	<LI>Tuscany SCA is not just a reference implementation. We encourage innovation based on the tenets of SCA. A lot of work we do provides feedback to the specifications.</LI>
+	<LI>The Java SCA infrastructure should provide flexibility and choice. It should not dictate programming models but support many.</LI>
+	<LI>The Java SCA infrastructure is very modularized and is designed to be highly extensible so users can customize it to fit their needs.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-GettingSource"></A><FONT color="#0099cc">Getting Source</FONT></H3>
+
+<P>The Java SCA project Subversion repository is located at <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/sca<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.<BR>
+The repository can also be viewed online at <SPAN class="nobr"><A href="http://svn.apache.org/viewvc/incubator/tuscany/java/" title="Visit page outside Confluence" rel="nofollow">http://svn.apache.org/viewvc/incubator/tuscany/java/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>Anyone can check code out of Subversion. You only need to specify a username and password in order to update the Subversion repository, and only Tuscany committers have the permissions to do so.</P>
+
+<H4><A name="SCAJavaDevelopment-CheckingoutcodefromSubversion"></A>Checking out code from Subversion</H4>
+
+<P>Use the command as follows (note that it uses http scheme so if you're a committer change it to https):</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout http:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/sca</SPAN></PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaDevelopment-CommittingChangestoSubversion"></A>Committing Changes to Subversion</H4>
+
+<P>Any Tuscany committer should have a shell account on svn.apache.org. Before you can commit, you'll need to set a Subversion password for yourself. To do that, log in to svn.apache.org and run the command svnpasswd.</P>
+
+<P>Once your password is set, you can use a command like this to commit:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn commit</PRE>
+</DIV></DIV>
+<P>If Subversion can't figure out your username, you can tell it explicitly:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn --username &lt;name&gt; commit</PRE>
+</DIV></DIV>
+<P>Subversion will prompt you for a password, and once you've entered it, it will remember it for you. Note this is the password you configured with svnpasswd not your shell or other password.</P>
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-GettingSetup"></A><FONT color="#0099cc">Getting Setup For Development</FONT></H3>
+
+
+<H4><A name="SCAJavaDevelopment-Prerequisites"></A>Prerequisites</H4>
+
+<P>Java SCA requires the following:</P>
+<UL>
+	<LI><SPAN class="nobr"><A href="http://java.sun.com/j2se/1.5.0" title="Visit page outside Confluence" rel="nofollow">JDK 5.0&#43; (J2SE 1.5.0+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://maven.apache.org/" title="Visit page outside Confluence" rel="nofollow">Apache Maven (2.0.4+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://subversion.tigris.org/" title="Visit page outside Confluence" rel="nofollow">Subversion (1.2+)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopment-Buildtreestructure"></A>Build tree structure</H4>
+
+<P>The build tree is designed to facilitate modular development and releases. Maven modules are grouped by how they are released under an hierarchy. For example, all kernel-related modules are grouped under the 'kernel' module.</P>
+
+<P>The individual modules can be built separately or build with top-down build.</P>
+
+<H4><A name="SCAJavaDevelopment-topdownbuild"></A>top-down build</H4>
+<P><B>recommended approach</B></P>
+
+<P>Check out all of the java source code.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java</SPAN></PRE>
+</DIV></DIV>
+<P>Building the SCA source code is simple</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">cd java/sca
+mvn</PRE>
+</DIV></DIV>
+<P>It should work even if you start with an empty Maven local repository, and it should always work. This assumes that maven is able to retrieve a SNAPSHOT version of SDO (and of course the rest of software that SCA depends on) as we haven't built anything other than SCA here.</P>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> There can be occasional problems downloading artifacts from remote Maven repositories so if mvn fails with network related sounding messages sometimes just trying again can fix the problem.</P>
+
+<H4><A name="SCAJavaDevelopment-Buildingindividualmodules"></A>Building individual modules</H4>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> This section needs to be updated. We still have the ability to build modules.</P>
+
+<P>To build individual modules, please see the specific instructions for each top-level module.</P>
+
+<P>The build tree contains the following 'top-level' modules:</P>
+
+<P><B>kernel</B><BR>
+Contains the modules that make up the Java SCA foundation, including:</P>
+<UL>
+	<LI><EM>api</EM> &#45; Contains the Java SCA proprietary programming model APIs</LI>
+	<LI><EM>host_api</EM> &#45; Contains APIs for interacting with the kernel</LI>
+	<LI><EM>spi</EM> &#45; Defines kernel extension points. Includes interfaces and abstract extension classes.</LI>
+	<LI><EM>core</EM> &#45; The kernel implementation</LI>
+</UL>
+
+
+<P>Kernel may be checked out and built independently from the other modules such as extensions.</P>
+
+<P>To checkout kernel, do:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/sca/kernel</SPAN></PRE>
+</DIV></DIV>
+<P>To build kernel, do:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn</PRE>
+</DIV></DIV>
+<P>Note that <TT>mvn &#45;o</TT> may be used once all kernel dependencies have been downloaded</P>
+
+<P><B>runtime</B><BR>
+Contains modules for deploying Java SCA to various runtimes, e.g. in a Servlet Container or as a standalone runtime:</P>
+<UL>
+	<LI><EM>itest</EM> &#45; modules for embedding Java SCA in Maven as an iTest Plugin. Used for integration testing.</LI>
+	<LI><EM>standalone</EM> &#45; modules for deploying Java SCA as a standalone container</LI>
+	<LI><EM>services</EM> &#45; various runtime services such as JMX</LI>
+	<LI><EM>webapp</EM> &#45; modules for embedding Java SCA in a Servlet container</LI>
+</UL>
+
+
+<P>To checkout runtime, do:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn checkout https:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/sca/runtime</SPAN></PRE>
+</DIV></DIV>
+<P>The runtime modules may be built together or independently as sub-modules using the <TT>mvn</TT> command.</P>
+
+<P><B>extensions</B><BR>
+Contains kernel extensions such as bindings for transport protocols, component implementation types to enable the use of alternative programming models, etc. Each extension sub-module builds independently.</P>
+
+<P><B>services</B><BR>
+Contains kernel extensions that provide specific services such as persistence for core runtime operations. Each sub-module builds independently.</P>
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-CodingGuidelines"></A><FONT color="#0099cc">Coding Guidelines</FONT></H3>
+
+<P>There are a few simple guidelines when developing for JAVA SCA:</P>
+<UL>
+	<LI>Formatting standards are defined by the .checkstyle and .pmd configurations in the source repository. Please be sure to check code is formatted properly before doing a checkin (see below). If you are unfamiliar with Checkstyle or PMD, please see <SPAN class="nobr"><A href="http://checkstyle.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://checkstyle.sourceforge.net/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and <SPAN class="nobr"><A href="http://pmd.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://pmd.sourceforge.net/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. Consistent formatting makes it easier for others to follow and allows diffs to work properly.</LI>
+</UL>
+
+
+<UL>
+	<LI>Always include the Apache License Headers on all files and the following version tag:</LI>
+</UL>
+
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">@version $Rev$ $Date$</PRE>
+</DIV></DIV>
+<UL>
+	<LI>Please attempt to accompanied code with at least unit tests or verify it by existing tests before submitting a patch or checking in.</LI>
+</UL>
+
+
+<UL>
+	<LI>Do not checkin IDE-specific resources such as project files.</LI>
+</UL>
+
+
+<UL>
+	<LI>Prior to check-in, perform a clean build and run the complete battery of unit tests for the current module <B>from the command line</B> with Checkstyle enabled, as in:</LI>
+</UL>
+
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn clean
+mvn -o -Psourcecheck</PRE>
+</DIV></DIV>
+<UL>
+	<LI>Please do not perform a checkin using an IDE as doing so is frequently problematic.</LI>
+</UL>
+
+
+<UL>
+	<LI>Include a descriptive log message for checkins, for example &quot;fixed such and such problem&quot;.</LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopment-Namingconventionstoincreaseconsistency"></A>Naming conventions to increase consistency</H4>
+
+<P><B>Folder Names:</B> Please use all lowercases and dashes in folder names (like in the jar names)</P>
+<UL class="alternate" type="square">
+	<LI>Maven artifact id = tuscany-&lt;folder name&gt;</LI>
+</UL>
+
+
+<P><B>Package names:</B> Package names within modules should include the module name so that source code can be located in the source tree easily. So, for example, java/sca/module/implementation-java would be in package structure org.apache.tuscany.implementation.java.&#42;</P>
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-Testing"></A><FONT color="#0099cc">Testing</FONT></H3>
+
+<P><IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/help_16.gif" height="16" width="16" align="absmiddle" alt="" border="0"> This section seems to be outdated since integration tests can also be done without maven integration test plugin</P>
+
+<P>It is expected checkins always be accompanied by unit test and integration tests when appropriate. Unit tests should verify specific behavior relating to a single class or small set of related classes; integration tests verify code paths across subsystems. Testcases should be documented and clearly indicate what they verify. Also, avoid things that may cause side-effects when possible such as access of external resources.</P>
+
+<P>We encourage and follow <EM>continuous integration</EM>. Martin Fowler has a concise write-up <SPAN class="nobr"><A href="http://www.martinfowler.com/articles/continuousIntegration.html" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<P>We have found <SPAN class="nobr"><A href="http://www.easymock.org/" title="Visit page outside Confluence" rel="nofollow">EasyMock<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> extremely useful for unit testing and have standardized on it.</P>
+
+<P>When writing integration tests, use the <A href="maven-plugins.html" title="Maven Plugins">Maven Integration Test Plugin</A></P>
+
+<H3><A name="SCAJavaDevelopment-"></A><A name="SCAJavaDevelopment-MavenBuildStructure"></A><FONT color="#0099cc">Maven Build Structure</FONT></H3>
+
+<P><EM>We use the term Module to refer to the leaf of maven tree.</EM></P>
+<UL>
+	<LI>sca/pom.xml's parent will be pom/parent/pom.xml</LI>
+	<LI>Other poms will use the pom from the parent folder as parent pom</LI>
+	<LI>Group ids:<BR>
+ org.apache.tuscany.sca<BR>
+ org.apache.tuscany.sca.samples,<BR>
+ org.apache.tuscan.sca.itest</LI>
+	<LI>Version of our modules will be specified once in java/sca/pom.xml, child poms don't need specify a version as they get it from their parent</LI>
+	<LI>pom names begin Apache Tuscany SCA</LI>
+	<LI>Eclipse projects are generated for all built modules using mvn &#45;Peclipse eclipse:eclipse</LI>
+</UL>
+
+
+<H4><A name="SCAJavaDevelopment-Addinganewmoduleandnotreadytointegrate%3F"></A>Adding a new module and not ready to integrate?</H4>
+
+<P>'work-in-progress' modules can be worked on in the same source tree and yet not break the top-down build. You can do this by not listing your module(s) in java/sca/modules/pom.xml.</P>
+
+<P></P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-documentation.html b/site/trunk/site-publish/sca-java-documentation.html
new file mode 100644
index 0000000000..c62f91424e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-documentation.html
@@ -0,0 +1,112 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Documentation : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=34768">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Subproject</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Documentation">SCA Java Documentation</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="sca-java-090-incubating.html" title="Visit page outside Confluence" rel="nofollow">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="" title="SCA Java Documentation">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>Thanks for your interest in Apache Tuscany Java SCA.</P>
+
+<P>If you are just getting started and are interested to learn about SCA</P>
+<UL>
+	<LI><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+This introduces you to SCA concepts and shows you how to build simple sample applications.</LI>
+</UL>
+
+
+<P>If you would like to contribute to the project itself, we have a</P>
+<UL>
+	<LI><A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+This explains how to build Tuscany from the latest source code and also how to contribute code back to the project.</LI>
+</UL>
+
+
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Guide&linkCreation=true&fromPageId=34768" title="Create Page: Java SCA Extension Guide" class="createlink">Extension Development Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+This guide explains how to develop code that extends Tuscany.  </LI>
+</UL>
+
+
+<UL>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Architecture%20Guide&linkCreation=true&fromPageId=34768" title="Create Page: Java SCA Architecture Guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+This covers how to add a component or binding extension.</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-event-processing.html b/site/trunk/site-publish/sca-java-event-processing.html
new file mode 100644
index 0000000000..ce6556b26e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-event-processing.html
@@ -0,0 +1,140 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Event Processing</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99612">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Event Processing">SCA Java Event Processing</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page is the top level page for information relating to the SCA Java Event Processing work.</P>
+
+<P>There is a Prototype project for SCA Event processing being carried out in a Sandbox associated with the SCA Java project (sandbox/event).  These pages help to describe the work taking place in that sandbox.</P>
+
+<H2><A name="SCAJavaEventProcessing-EventProcessingComparedwithServiceProcessing"></A>Event Processing Compared with Service Processing</H2>
+
+<P>Currently SCA describes a programming model which is concerned with Service Processing - business function is developed as a series of services, which are implemented by components.  Each service may have one or more operations.  Each operation typically has (zero or more) request message and optionally some response message. One important aspect of a service operation is that the client invokes a specific operation, providing the necessary request message, and the client knows that a specific service implementation will execute the operation - and the operation usually has some implied business semantics associated with it.  SCA provides a model for writing services and service clients at the implementation language level (eg in Java) and also an Assembly level model for composing sets of components together, satisfying service references made by one component by wiring them to a component that provides the service.</P>
+
+<P>Event processing is a different approach to programming business applications, offering a more loose coupled approach to application design.  In event processing, one component can produce a message, called an Event, which it makes available for other components to consume.  The Producer component produces the event whether or not there are actually any Consumer components listening for that event.  The event can be received by zero, one or many Consumer components.  When a Producer produces an event, no semantics are implied for what processing should happen if the event is consumed - a consumer component is free to do what it wants with the event. A Consumer may consume only one type of event, or it may consume many different types of events.&nbsp; A consumer may consume events from only one producer or it may consume events from many different producers.</P>
+
+<P>As for Service Processing, SCA Event Processing is described at two levels:</P>
+<OL>
+	<LI>The programming model for writing component implementations with event consumers and/or event producers</LI>
+	<LI>The Assembly model for combining multiple components into an application, linking producers with consumers</LI>
+</OL>
+
+
+
+<P>These are extensions to the standard SCA Service Processing model - not replacements, so that components may offer or use services alongside the producing or consuming of events.</P>
+
+<P>The following page describes the Event Processing model for Java implementations:<BR>
+<A href="java-implementation-model-for-event-processing.html" title="Java Implementation Model for Event Processing">Java Implementation Model for Event Processing</A></P>
+
+
+<P>The following page describes the Event Processing Assembly model:<BR>
+<A href="assembly-model-for-event-processing.html" title="Assembly Model for Event Processing">Assembly Model for Event Processing</A></P>
+
+<P>The following page describes the sandbox implementation of the SCA Event Processing Model:<BR>
+<A href="sandbox-implementation-of-sca-event-processing.html" title="Sandbox Implementation of SCA Event Processing">Sandbox Implementation of SCA Event Processing</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-extension-developer-guide.data/ExtendingTuscany.ppt b/site/trunk/site-publish/sca-java-extension-developer-guide.data/ExtendingTuscany.ppt
new file mode 100644
index 0000000000..e04b2e5b43
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-developer-guide.data/ExtendingTuscany.ppt
diff --git a/site/trunk/site-publish/sca-java-extension-developer-guide.html b/site/trunk/site-publish/sca-java-extension-developer-guide.html
new file mode 100644
index 0000000000..4bacbebae7
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-developer-guide.html
@@ -0,0 +1,245 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Extension Developer Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51879">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extension Developer Guide">SCA Java Extension Developer Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Extension Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+
+</DIV></DIV>
+
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"><BR>
+This is a guide for developers who would like to extend Tuscany SCA Java.</P>
+<UL>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-extension" title="extension on SCA Java Extension Developer Guide">What is an extension?</A></LI>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-component" title="component on SCA Java Extension Developer Guide">How to add a new component implementation? </A></LI>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-binding" title="binding on SCA Java Extension Developer Guide">How to add a new binding? </A></LI>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-interface" title="interface on SCA Java Extension Developer Guide">How to add a new interface binding? </A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-databinding" title="databinding on SCA Java Extension Developer Guide">How to add a databinding </A></LI>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-generalguide" title="general guide on SCA Java Extension Developer Guide">General guide for developing extensions</A></LI>
+	<LI><A href="#SCAJavaExtensionDeveloperGuide-details" title="details on SCA Java Extension Developer Guide">Details on extension architecture</A> <B>can move to architecture doc</B></LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Modules&linkCreation=true&fromPageId=51879" title="Create Page: Java SCA Extension Modules" class="createlink">Extension Modules<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Modules&linkCreation=true&fromPageId=51879" title="Create Page: Java SCA Extension Modules" class="createlink">Extension Modules<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>
+<BR clear="all">
+&nbsp;<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>&nbsp;</LI>
+</UL>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-extension"></A><FONT color="#0099cc">A presentation on how to extend Tuscany in Microsoft PowerPoint format</FONT></H3>
+<P><SPAN class="nobr"><A href="sca-java-extension-developer-guide.data/ExtendingTuscany.ppt" title="ExtendingTuscany.ppt attached to SCA Java Extension Developer Guide">ExtendingTuscany <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-extension"></A><FONT color="#0099cc">What is an extension?</FONT></H3>
+
+<P>Extension is a module (or a set of modules),when built with Tuscany SCA, can extend it to work with additional bindings, language implementations, programming models or databindings.</P>
+
+<P>SCA assembly model is defined such that extensions can be added for new interface types or for new implementation types such as ruby and python, or new binding types such as CXF. However, the definition of extension SPIs is left to the implementor. Tuscany SCA Java provides a simple set of SPIs for implementing extensions. It also defines additional extension points such as data binding, for example support for SDO and JAXB.</P>
+
+<P>This guide explains the steps to add each of these extension types. Please help us refine the guide as you go through the steps of adding extensions.</P>
+
+<H4><A name="SCAJavaExtensionDeveloperGuide-Namespacesusedbyextensions"></A>Name spaces used by extensions</H4>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-component"></A><FONT color="#0099cc">How to add a new component implementation?</FONT></H3>
+
+<P><A href="mike-edwards-ramble-through-adding-a-new-component-type.html" title="Mike Edwards Ramble through Adding a New Component Type">Musings on Adding a New Component Type by Mike E</A>&nbsp;</P>
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-binding"></A><FONT color="#0099cc">How to add a new binding?</FONT></H3>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-interface"></A><FONT color="#0099cc">How to add a new interface binding?</FONT></H3>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-databinding"></A><FONT color="#0099cc">How to add a new databinding?</FONT></H3>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-generalguide"></A><FONT color="#0099cc">General guide for developing extensions</FONT></H3>
+
+<UL>
+	<LI>Familiarize yourself with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at www.osoa.org.</LI>
+	<LI>Never reference any classes in core. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+	<LI>Use autowire when assembling extension components.</LI>
+	<LI>Do not play with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaExtensionDeveloperGuide-"></A><A name="SCAJavaExtensionDeveloperGuide-details"></A><FONT color="#0099cc">Detail on extension architecture</FONT></H3>
+
+
+<H4><A name="SCAJavaExtensionDeveloperGuide-TheExtensionPointRegistry"></A>The ExtensionPointRegistry</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.sca.core;
+
+
+/**
+ * The registry <SPAN class="code-keyword">for</SPAN> the Tuscany core extension points. As the point of contact
+ * <SPAN class="code-keyword">for</SPAN> all extension artifacts <SPAN class="code-keyword">this</SPAN> registry allows loaded extensions to find
+ * all other parts of the system and register themselves appropriately.
+ *
+ * @version $Rev: 539355 $ $Date: 2007-05-18 03:05:14 -0700 (Fri, 18 May 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ExtensionPointRegistry {
+
+    /**
+     * Add an extension point to the registry
+     * @param extensionPoint The instance of the extension point
+     */
+    void addExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+
+    /**
+     * Get the extension point by the <SPAN class="code-keyword">interface</SPAN>
+     * @param extensionPointType The lookup key (extension point <SPAN class="code-keyword">interface</SPAN>)
+     * @<SPAN class="code-keyword">return</SPAN> The instance of the extension point
+     */
+    &lt;T&gt; T getExtensionPoint(<SPAN class="code-object">Class</SPAN>&lt;T&gt; extensionPointType);
+
+    /**
+     * Remove an extension point
+     * @param extensionPoint The extension point to remove
+     */
+    void removeExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+}</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaExtensionDeveloperGuide-TheModuleActivator"></A>The ModuleActivator</H4>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java"><SPAN class="code-keyword">package</SPAN> org.apache.tuscany.core;
+
+<SPAN class="code-keyword">import</SPAN> java.util.Map;
+
+/**
+ * ModuleActivator represents a module that plugs into the Tuscany system. Each module should
+ * provide an implementation of <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">interface</SPAN> and registry the implementation class by defining
+ * a file named as <SPAN class="code-quote">&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot;</SPAN>. The
+ * content of the file is the class name of the implementation. The implementation class must
+ * have a no-arg constructor. The same instance will be used to invoke all the methods during
+ * different phases of the module activation.
+ *
+ * @version $Rev: 529327 $ $Date: 2007-04-16 10:10:43 -0700 (Mon, 16 Apr 2007) $
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ModuleActivator {
+    /**
+     * Get a map of the extension points defined by <SPAN class="code-keyword">this</SPAN> module. The key is the
+     * java <SPAN class="code-keyword">interface</SPAN> to represent the extension point and the the value is the
+     * instance of the implementation of the <SPAN class="code-keyword">interface</SPAN>.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> All the extension points defined by <SPAN class="code-keyword">this</SPAN> module
+     */
+    Map&lt;<SPAN class="code-object">Class</SPAN>, <SPAN class="code-object">Object</SPAN>&gt; getExtensionPoints();
+
+    /**
+     * This method is invoked when the module is started by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to registr extensions against extension
+     * points.
+     *
+     * @param registry The extension point registry
+     */
+    void start(ExtensionPointRegistry registry);
+
+    /**
+     * This method is invoked when the module is stopped by the Tuscany system.
+     * It can be used by <SPAN class="code-keyword">this</SPAN> module to unregister extensions against the
+     * extension points.
+     *
+     * @param registry The extension point registry
+     */
+    void stop(ExtensionPointRegistry registry);
+}</PRE>
+</DIV></DIV>
+<P>The ModuleActivator represents a module that plugs into the Tuscany system.<BR>
+Each module should provide an implementation <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=3&linkCreation=true&fromPageId=51879" title="Create Page: 3" class="createlink">3<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> of this interface and<BR>
+registry the implementation class by defining a file named as<BR>
+&quot;META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator&quot; <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=4&linkCreation=true&fromPageId=51879" title="Create Page: 4" class="createlink">4<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. The<BR>
+content of the file is the class name of the implementation. The<BR>
+implementation class must have a no-arg constructor. The same instance will<BR>
+be used to invoke all the methods during different phases of the module<BR>
+activation.</P>
+
+<P>During bootstraping, the following sequence will happen:</P>
+
+<P>1) All the module activators will be discovered by the presence of<BR>
+META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator<BR>
+2) The activator class is instantiated using the no-arg constructor.<BR>
+3) ModuleActivator.getExtensionPoints() is invoked for all modules and the<BR>
+extension points contributed by each module are added to the<BR>
+ExtensionRegistry.<BR>
+4) ModuleActivator.start(ExtensionRegistry) is invoked for all the modules.<BR>
+The module can then get interested extension points and contribute<BR>
+extensions to them. The contract bwteen the extension and extension point is<BR>
+private to the extension point. The extension point can follow similar<BR>
+patterns such as Registry. If it happens that one extension point has a<BR>
+dependency on another extension point, they can linked at this phase.</P>
+
+<P>During shutting down, the stop() method is invoked for all the modules to<BR>
+perform cleanups. A module can choose to unregister the extension from the<BR>
+extension points.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany-V01.pdf b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany-V01.pdf
new file mode 100644
index 0000000000..dcc013d027
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany-V01.pdf
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.pdf b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.pdf
new file mode 100644
index 0000000000..c2fcc3cfbc
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.pdf
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.ppt b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.ppt
new file mode 100644
index 0000000000..e04b2e5b43
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany.ppt
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.pdf b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.pdf
new file mode 100644
index 0000000000..c2fcc3cfbc
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.pdf
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.ppt b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.ppt
new file mode 100644
index 0000000000..e04b2e5b43
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.data/ExtendingTuscany1.ppt
diff --git a/site/trunk/site-publish/sca-java-extension-development-guide.html b/site/trunk/site-publish/sca-java-extension-development-guide.html
new file mode 100644
index 0000000000..16d6d7a64c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-development-guide.html
@@ -0,0 +1,422 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Extension Development Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51879">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extension Development Guide">SCA Java Extension Development Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+<P><DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SCA Java Extension Guide</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P>This is a guide for developers who would like to extend Tuscany SCA Java.</P>
+<UL>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-extension">What is an extension?</A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-component">How to add a new component implementation? </A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-binding">How to add a new binding? </A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-interface">How to add a new interface binding? </A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-databinding">How to add a databinding </A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-monitor">How to add a new monitor extension? </A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-generalguide">General guide for developing extensions</A></LI>
+	<LI><A href="#SCAJavaExtensionDevelopmentGuide-details">Details on extension architecture</A> <B>can move to architecture doc</B></LI>
+	<LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Java%20SCA%20Extension%20Modules&linkCreation=true&fromPageId=51879" class="createlink">Extension Modules</A></LI>
+</UL>
+</DIV></DIV></P>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><DIV class="" align="center">This page is under construction&#45; You are welcome to help and complete it </DIV>
+</TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-extension"></A> <DIV class="" style="background-color: #C3CDA1;">A presentation on how to extend Tuscany in Microsoft PowerPoint format </DIV>
+</H3>
+
+<P><B>Extending Tuscany</B> <A href="sca-java-extension-development-guide.data/ExtendingTuscany1.ppt">PPT</A> <A href="sca-java-extension-development-guide.data/ExtendingTuscany1.pdf">PDF</A></P>
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-extension"></A> <DIV class="" style="background-color: #C3CDA1;">What is an extension? </DIV>
+</H3>
+
+<P>Extension is a module (or a set of modules),when built with Tuscany SCA, can extend it to work with additional bindings, language implementations, programming models or databindings.</P>
+
+<P>SCA assembly model is defined such that extensions can be added for new interface types or for new implementation types such as ruby and python, or new binding types such as CXF. However, the definition of extension SPIs is left to the implementor. Tuscany SCA Java provides a simple set of SPIs for implementing extensions. It also defines additional extension points such as data binding, for example support for SDO and JAXB.</P>
+
+<P>This guide explains the steps to add each of these extension types. Please help us refine the guide as you go through the steps of adding extensions.</P>
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-Namespacesusedbyextensions"></A>Name spaces used by extensions</H3>
+
+<P>Extensions sometimes contribute addtional elements or attributes to the SCA XML configuration model. These elements or attributes should be qualified as follows:</P>
+<UL>
+	<LI><A href="http://www.osoa.org/xmlns/sca/1.0:" class="external-link" rel="nofollow">http://www.osoa.org/xmlns/sca/1.0:</A> if the extension is defined by the SCA spec.</LI>
+	<LI><A href="http://tuscany.apache.org/xmlns/sca/1.0:" class="external-link" rel="nofollow">http://tuscany.apache.org/xmlns/sca/1.0:</A> if the extesion is defined by Tuscany</LI>
+</UL>
+
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-component"></A> <DIV class="" style="background-color: #C3CDA1;">How to add a new component implementation? </DIV>
+</H3>
+
+<P><A href="mike-edwards-ramble-through-adding-a-new-implementation-type.html" title="Mike Edwards Ramble through Adding a New Implementation Type">Musings on Adding a New Implementation Type by Mike E</A>&nbsp;</P>
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-binding"></A> <DIV class="" style="background-color: #C3CDA1;">How to add a new binding? </DIV>
+</H3>
+
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-interface"></A> <DIV class="" style="background-color: #C3CDA1;">How to add a new interface binding? </DIV>
+</H3>
+
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-databinding"></A> <DIV class="" style="background-color: #C3CDA1;">How to add a new databinding? </DIV>
+</H3>
+
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-monitor"></A> <DIV class="" style="background-color: #C3CDA1;">How to add a new monitor extension? </DIV>
+</H3>
+
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-NeedforMonitorExtension"></A>Need for Monitor Extension</H4>
+
+<P>The need for monitor extension came as a requirement, to have a customized exception handling on Tuscany runtime especially when the user input errors are determined while reading, resolving and building phase of the contribution within the Tuscany runtime. Here different users/vendors using Tuscany with their products wanted to ignore some of the user input errors and allow the runtime to proceed further, while the others wanted to stop processing when a error is determined at the end of each phase. Another important need for a monitor extension is to validate the user inputs (via contributions) and report all the issues identified in one go (Example: As how the java compiler does for java code).</P>
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-Understandingmessageconversionusingmonitor"></A>Understanding message conversion using monitor</H4>
+
+<P>1) Errors and warnings are logged with the monitor as problems and the processing continues. Exceptions won't be thrown, where ever possible. Processing here covers any processing of user input, i.e. contributions and the artifacts they contain.<BR>
+2) After each phase namely read, resolve and build contribution, the problems are read from the monitor for display to the user (currently this will have already happened as our current monitor will just log errors and warnings as it receives them but you can imagine more capable monitors).<BR>
+3) The controlling logic may look at the errors and warnings it is reporting to the user and prevent further processing occurring. Or it may allow processing to continue. This depends on which bit of processing we are talking about and what errors have been reported. Sample for the controlling logic is shown below</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">private</SPAN> void analyseProblems() <SPAN class="code-keyword">throws</SPAN> Exception {
+    <SPAN class="code-keyword">for</SPAN> (Problem problem : monitor.getProblems()){
+        <SPAN class="code-comment">// look <SPAN class="code-keyword">for</SPAN> any reported errors. Schema errors are filtered
+</SPAN>        <SPAN class="code-comment">// out as there are several that are generally reported at the
+</SPAN>        <SPAN class="code-comment">// moment and we don't want to stop
+</SPAN>        <SPAN class="code-keyword">if</SPAN> ((problem.getSeverity() == Severity.ERROR) &amp;&amp; (!problem.getMessageId().equals(<SPAN class="code-quote">&quot;SchemaError&quot;</SPAN>))) {
+            <SPAN class="code-keyword">if</SPAN> (problem.getCause() != <SPAN class="code-keyword">null</SPAN>){
+                <SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> Exception(problem.getCause());
+            } <SPAN class="code-keyword">else</SPAN> {
+                <SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> Exception(problem.toString());
+            }
+        }
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-Creatinganewmonitorextension"></A>Creating a new monitor extension</H4>
+
+<P>NOTE: Please have a look at the interface design of Monitor, Problem and MonitorFactory from monitor module in the Tuscany source code.</P>
+
+<P>Step 1) Create a class MyMonitorImpl.java which implements the Monitor interface.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class MyMonitorImpl <SPAN class="code-keyword">implements</SPAN> Monitor {
+    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-keyword">static</SPAN> <SPAN class="code-keyword">final</SPAN> Logger logger = Logger.getLogger(DefaultMonitorImpl.class.getName());
+    <SPAN class="code-comment">// Cache all the problem reported to monitor <SPAN class="code-keyword">for</SPAN> further analysis
+</SPAN>    <SPAN class="code-keyword">private</SPAN> List&lt;Problem&gt; problemCache = <SPAN class="code-keyword">new</SPAN> ArrayList&lt;Problem&gt;();
+    <SPAN class="code-keyword">public</SPAN> void problem(Problem problem) {
+        <SPAN class="code-comment">// Your custom code to handle the problem
+</SPAN>    }
+    <SPAN class="code-comment">// Returns a list of reported problems.
+</SPAN>    <SPAN class="code-keyword">public</SPAN> List&lt;Problem&gt; getProblems(){
+        <SPAN class="code-keyword">return</SPAN> problemCache;
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>Step 2) Create a class MyMonitorFactoryImpl.java which implements the MonitorFactory interface.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class MyMonitorFactoryImpl <SPAN class="code-keyword">implements</SPAN> MonitorFactory {
+    <SPAN class="code-keyword">private</SPAN> Monitor monitor = <SPAN class="code-keyword">null</SPAN>;
+    <SPAN class="code-keyword">public</SPAN> Monitor createMonitor() {
+        <SPAN class="code-keyword">if</SPAN> (monitor == <SPAN class="code-keyword">null</SPAN>) {
+            monitor = <SPAN class="code-keyword">new</SPAN> MyMonitorImpl();
+        }
+        <SPAN class="code-keyword">return</SPAN> monitor ;
+    }
+}
+</PRE>
+</DIV></DIV>
+<P>Step 3) Create a plain text file named as &quot;META&#45; INF/services/org.apache.tuscany.sca.monitor.MonitorFactory&quot;<BR>
+Register the extension by adding a line in this file as (org.apache.tuscany.sca.monitor.impl.MyMonitorFactoryImpl)</P>
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-Initializeandcreateaninstanceofthemonitor"></A>Initialize and create an instance of the monitor</H4>
+
+<P>Monitors can be initialized using the utility extensions as shown below.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
+monitor = monitorFactory.createMonitor();
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-generalguide"></A> <DIV class="" style="background-color: #C3CDA1;">General guide for developing extensions </DIV>
+</H3>
+
+<UL>
+	<LI>Familiarize yourself with SCA 1.0 Assembly and the SCA Java 1.0 programming model. Specifications can be found at www.osoa.org.</LI>
+	<LI>Never reference any classes in core. These classes are implementation-specific and subject to change; they are not part of the public SPI contract.</LI>
+	<LI>Use autowire when assembling extension components.</LI>
+	<LI>Do not play with classloaders such as setting the current context classloader unless it is absolutely necessary, i.e. a library used by an extension makes assumptions about context classloaders. Ideally the library can be refactored to not make these assumptions. If not, make sure the extension properly resets the current context classloader.</LI>
+</UL>
+
+
+<H3><A name="SCAJavaExtensionDevelopmentGuide-"></A><A name="SCAJavaExtensionDevelopmentGuide-details"></A> <DIV class="" style="background-color: #C3CDA1;">Detail on extension architecture </DIV>
+</H3>
+
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-TheExtensionPointRegistry"></A>The ExtensionPointRegistry</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> org.apache.tuscany.sca.core;
+
+
+/**
+* The registry <SPAN class="code-keyword">for</SPAN> the Tuscany core extension points. As the point of contact
+* <SPAN class="code-keyword">for</SPAN> all extension artifacts <SPAN class="code-keyword">this</SPAN> registry allows loaded extensions to find
+* all other parts of the system and register themselves appropriately.
+*
+* @version $Rev: 539355 $ $Date: 2007-05-18 03:05:14 -0700 (Fri, 18 May 2007) $
+*/
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ExtensionPointRegistry {
+
+/**
+* Add an extension point to the registry
+* @param extensionPoint The instance of the extension point
+*/
+void addExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+
+/**
+* Get the extension point by the <SPAN class="code-keyword">interface</SPAN>
+* @param extensionPointType The lookup key (extension point <SPAN class="code-keyword">interface</SPAN>)
+* @<SPAN class="code-keyword">return</SPAN> The instance of the extension point
+*/
+&lt;T&gt; T getExtensionPoint(<SPAN class="code-object">Class</SPAN>&lt;T&gt; extensionPointType);
+
+/**
+* Remove an extension point
+* @param extensionPoint The extension point to remove
+*/
+void removeExtensionPoint(<SPAN class="code-object">Object</SPAN> extensionPoint);
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-TheModuleActivator"></A>The ModuleActivator</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> org.apache.tuscany.sca.core;
+
+
+/**
+* ModuleActivator represents a module that plugs into the Tuscany system. Each
+* module should provide an implementation of <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">interface</SPAN> and register the
+* ModuleActivator implementation class by defining a file named
+*
+* <SPAN class="code-quote">&quot;META-INF/services/org.apache.tuscany.core.ModuleActivator&quot;</SPAN>
+*
+* The content of the file is the class name of the ModuleActivator implementation.
+* The implementation class must have a no-arg constructor. The same instance
+* will be used to invoke all the methods during different phases of the module
+* activation. Note that the start and stop methods defined by <SPAN class="code-keyword">this</SPAN> <SPAN class="code-keyword">interface</SPAN>
+* take a reference to the Tuscany SCA runtime ExtensionPointRegistry. This
+* gives the ModuleActivator the oppotunity to add extension points to the
+* registry as it is requested to start up and remove them when it is requested
+* to shut down.
+*
+* @version $Rev: 564429 $ $Date: 2007-08-09 16:49:11 -0700 (Thu, 09 Aug 2007) $
+*/
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> ModuleActivator {
+
+/**
+* This method is invoked when the module is started by the Tuscany system.
+* It can be used by <SPAN class="code-keyword">this</SPAN> module to registr extensions against extension
+* points.
+*
+* @param registry The extension point registry
+*/
+void start(ExtensionPointRegistry registry);
+
+/**
+* This method is invoked when the module is stopped by the Tuscany system.
+* It can be used by <SPAN class="code-keyword">this</SPAN> module to unregister extensions against the
+* extension points.
+*
+* @param registry The extension point registry
+*/
+void stop(ExtensionPointRegistry registry);
+}
+</PRE>
+</DIV></DIV>
+<P>The ModuleActivator represents a module that plugs into the Tuscany system. Each module can optionally provide an implementation of this interface and<BR>
+register the implementation class by defining a file named as &quot;<FONT color="#0000ff">META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</FONT>&quot;. The content of the file is the class name of the implementation. The implementation class must have a no-arg constructor. The same instance will be used to invoke all the methods during different phases of the module activation.</P>
+
+<P>During bootstraping, the following sequence will happen:</P>
+
+<P>1) All the module activators will be discovered by the presence of &quot;<FONT color="#0000ff">META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</FONT>&quot;<BR>
+2) The activator class is instantiated using the no-arg constructor.<BR>
+3) ModuleActivator.getExtensionPoints() is invoked for all modules and the extension points contributed by each module are added to the ExtensionRegistry.<BR>
+4) ModuleActivator.start(ExtensionRegistry) is invoked for all the modules. The module can then get interested extension points and contribute<BR>
+extensions to them. The contract bwteen the extension and extension point is private to the extension point. The extension point can follow similar<BR>
+patterns such as Registry. If it happens that one extension point has a dependency on another extension point, they can linked at this phase.</P>
+
+<P>During shutting down, the stop() method is invoked for all the modules to perform cleanups. A module can choose to unregister the extension from the<BR>
+extension points.</P>
+
+<H4><A name="SCAJavaExtensionDevelopmentGuide-Lazyinstantiationofextensions"></A>Lazy instantiation of extensions</H4>
+
+<P>To reduce the startup time and memory footprint, most of the extension points in Tuscany now supports lazy instantiation of the registered extensions. The following describes the pattern using org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor as an example.</P>
+
+<P>1) Create a plain text file named as &quot;<FONT color="#0000ff">META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</FONT>&quot;<BR>
+2) Register an extension by adding a line in the file</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation</SPAN>
+</PRE>
+</DIV></DIV>
+<P>The simple syntax is: <FONT color="#990000">&lt;implementation_class_name&gt;</FONT><FONT color="#0000ff">;</FONT><FONT color="#990000">&lt;parameter_name&gt;</FONT><FONT color="#0000ff">=</FONT><FONT color="#990000">&lt;parameter_value&gt;</FONT><FONT color="#0000ff">,</FONT><FONT color="#990000">&lt;parameter_name&gt;</FONT><FONT color="#0000ff">=</FONT><FONT color="#990000">&lt;parameter_value&gt;</FONT></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-extension-guide.html b/site/trunk/site-publish/sca-java-extension-guide.html
new file mode 100644
index 0000000000..5e216833c0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-guide.html
@@ -0,0 +1,404 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Extension Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54455">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extension Guide">SCA Java Extension Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<A href="sca-java-whats-new.html" title="SCA Java Whats New">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="" title="SCA Java Extension Guide">Extension Guide</A><BR>
+<A href="java-sca-architecture-guide.html" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="java-sca-extension-developer-guide.html" title="Java SCA Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>This is view of available modules for extensions</B><BR>
+<B>Should this be linked from the extension guide?</B></P>
+
+<H2><A name="SCAJavaExtensionGuide-RequiredModules"></A>Required Modules</H2>
+
+<P>These modules are always present in the Tuscany SCA runtime</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA assembly model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-xml </TD>
+<TD class="confluenceTd"> The processors that load the basic SCA assembly model from XML (SCDL) files </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-java-dsl </TD>
+<TD class="confluenceTd"> The java domain specific language for describing SCA assembly models </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface </TD>
+<TD class="confluenceTd"> The representation of interfaces independent of the interface definition languages </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for java interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.java model from the XML (SCDL)&nbsp;or introspect the java&nbsp;classes </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for&nbsp;WSDL interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.wsdl model from the XML (SCDL)&nbsp;or introspect the WSDL definition </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA&nbsp;policy model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H2><A name="SCAJavaExtensionGuide-ExtensionModules"></A>Extension Modules</H2>
+
+<P>These modules are only present in the Tuscany SCA runtime if their jar is included in the runtime CLASSPATH</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-jms </TD>
+<TD class="confluenceTd"> Not yet complete </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-binding-jsonrpc.html" title="SCA Java binding-jsonrpc">binding-jsonrpc</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-rmi </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-axis2 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-xml </TD>
+<TD class="confluenceTd"> The processors that parse the &lt;binding.ws&gt; to create model objects </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> commonj-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution </TD>
+<TD class="confluenceTd"> Models and SPIs for the contribution service </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution-impl </TD>
+<TD class="confluenceTd"> Implementation of the contribution service and a set of built-in package/artifact processors </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core </TD>
+<TD class="confluenceTd"> The core that&nbsp;handles bootstrapping and&nbsp;provides life cylce, event and scope managements <BR clear="all">
+The runtime wiring and invocation chains </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-databinding </TD>
+<TD class="confluenceTd"> The module that contributes interceptors, databinding and transformers&nbsp;to&nbsp;core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-spi </TD>
+<TD class="confluenceTd"> The SPIs for core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-spring </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding </TD>
+<TD class="confluenceTd"> The SPIs for the databinding framework, default implementations and&nbsp;built-in transformers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support for AXIOM databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-jaxb </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;JAXB databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;SDO databinding&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support optimzed SDO to AXIOM transformation </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> discovery-jms </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-embedded </TD>
+<TD class="confluenceTd"> A simple embedded host that boots Tuscany core and application from the same classpath </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-http </TD>
+<TD class="confluenceTd"> The module that provides&nbsp;support for the HTTP&nbsp;protocol </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-webapp </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-jetty </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Jetty&nbsp;web container </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-tomcat </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Tomcat web container </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-runtime </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-xml </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="java-sca-implementationscript.html" title="Java SCA implementation.script">implementation-script</A> </TD>
+<TD class="confluenceTd"> Support for SCA components implemented with scripting languages </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-spring </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the java interface related extension points and extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the&nbsp;WSDL interface related extension points and extensions&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> jmx </TD>
+<TD class="confluenceTd"> Under construvtion </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> sca-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H2><A name="SCAJavaExtensionGuide-Tools"></A>Tools</H2>
+
+<P>These modules are not used in the main Tuscany SCA runtime but provide</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-extension-modules.html b/site/trunk/site-publish/sca-java-extension-modules.html
new file mode 100644
index 0000000000..aaa4a411d2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-extension-modules.html
@@ -0,0 +1,404 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Extension Modules : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54455">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Extension Modules">SCA Java Extension Modules</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<A href="sca-java-whats-new.html" title="SCA Java Whats New">What's New?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="" title="SCA Java Extension Modules">Extension Guide</A><BR>
+<A href="java-sca-architecture-guide.html" title="Java SCA Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="java-sca-extension-developer-guide.html" title="Java SCA Extension Developer Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P><B>This is view of available modules for extensions</B><BR>
+<B>Should this be linked from the extension guide?</B></P>
+
+<H2><A name="SCAJavaExtensionModules-RequiredModules"></A>Required Modules</H2>
+
+<P>These modules are always present in the Tuscany SCA runtime</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA assembly model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-xml </TD>
+<TD class="confluenceTd"> The processors that load the basic SCA assembly model from XML (SCDL) files </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> assembly-java-dsl </TD>
+<TD class="confluenceTd"> The java domain specific language for describing SCA assembly models </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface </TD>
+<TD class="confluenceTd"> The representation of interfaces independent of the interface definition languages </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for java interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.java model from the XML (SCDL)&nbsp;or introspect the java&nbsp;classes </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl </TD>
+<TD class="confluenceTd"> The interfaces and implementation classes for&nbsp;WSDL interfaces </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-xml </TD>
+<TD class="confluenceTd"> The processors that load&nbsp;the interface.wsdl model from the XML (SCDL)&nbsp;or introspect the WSDL definition </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> policy </TD>
+<TD class="confluenceTd"> The java interfaces and implementation classes for the SCA&nbsp;policy model </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H2><A name="SCAJavaExtensionModules-ExtensionModules"></A>Extension Modules</H2>
+
+<P>These modules are only present in the Tuscany SCA runtime if their jar is included in the runtime CLASSPATH</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-jms </TD>
+<TD class="confluenceTd"> Not yet complete </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-binding-jsonrpc.html" title="SCA Java binding-jsonrpc">binding-jsonrpc</A> </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-rmi </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-axis2 </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> binding-ws-xml </TD>
+<TD class="confluenceTd"> The processors that parse the &lt;binding.ws&gt; to create model objects </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> commonj-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution </TD>
+<TD class="confluenceTd"> Models and SPIs for the contribution service </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> contribution-impl </TD>
+<TD class="confluenceTd"> Implementation of the contribution service and a set of built-in package/artifact processors </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core </TD>
+<TD class="confluenceTd"> The core that&nbsp;handles bootstrapping and&nbsp;provides life cylce, event and scope managements <BR clear="all">
+The runtime wiring and invocation chains </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-databinding </TD>
+<TD class="confluenceTd"> The module that contributes interceptors, databinding and transformers&nbsp;to&nbsp;core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-spi </TD>
+<TD class="confluenceTd"> The SPIs for core </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> core-spring </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding </TD>
+<TD class="confluenceTd"> The SPIs for the databinding framework, default implementations and&nbsp;built-in transformers </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support for AXIOM databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-jaxb </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;JAXB databinding </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo </TD>
+<TD class="confluenceTd"> The extension that provides the support for&nbsp;SDO databinding&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> databinding-sdo-axiom </TD>
+<TD class="confluenceTd"> The extension that provides the support optimzed SDO to AXIOM transformation </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> discovery-jms </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-embedded </TD>
+<TD class="confluenceTd"> A simple embedded host that boots Tuscany core and application from the same classpath </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-http </TD>
+<TD class="confluenceTd"> The module that provides&nbsp;support for the HTTP&nbsp;protocol </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> host-webapp </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-jetty </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Jetty&nbsp;web container </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> http-tomcat </TD>
+<TD class="confluenceTd"> The integration between Tuscany and the Tomcat web container </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-runtime </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-java-xml </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="java-sca-implementationscript.html" title="Java SCA implementation.script">implementation-script</A> </TD>
+<TD class="confluenceTd"> Support for SCA components implemented with scripting languages </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> implementation-spring </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-java-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the java interface related extension points and extensions </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> interface-wsdl-runtime </TD>
+<TD class="confluenceTd"> The runtime module that activates the&nbsp;WSDL interface related extension points and extensions&nbsp; </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> jmx </TD>
+<TD class="confluenceTd"> Under construvtion </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> sca-api </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+
+<H2><A name="SCAJavaExtensionModules-Tools"></A>Tools</H2>
+
+<P>These modules are not used in the main Tuscany SCA runtime but provide</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Module </TH>
+<TH class="confluenceTh"> Short Description </TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-java2wsdl </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> maven-wsdl2java </TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+<TD class="confluenceTd">&nbsp;</TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-found-a-bug.html b/site/trunk/site-publish/sca-java-found-a-bug.html
new file mode 100644
index 0000000000..0326b733cb
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-found-a-bug.html
@@ -0,0 +1,170 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Found A Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55924">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Found A Bug">SCA Java Found A Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SCAJavaFoundABug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="SCAJavaFoundABug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SCAJavaFoundABug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="SCAJavaFoundABug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-get-involved.html b/site/trunk/site-publish/sca-java-get-involved.html
new file mode 100644
index 0000000000..9080443ff0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-get-involved.html
@@ -0,0 +1,243 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55918">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Get Involved">SCA Java Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SCAJavaGetInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="SCAJavaGetInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-get-started-with-coding.html b/site/trunk/site-publish/sca-java-get-started-with-coding.html
new file mode 100644
index 0000000000..71ddf24f5b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-get-started-with-coding.html
@@ -0,0 +1,202 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Get Started with Coding</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64177">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Get Started with Coding">SCA Java Get Started with Coding</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> This page is in progress. Goal is to provide developers with a quick walk through of key methods so that they can get started coding/debugging. <B>Please help update this page. Thanks.</B></P>
+
+<H1><A name="SCAJavaGetStartedwithCoding-BringingUpAStandaloneTuscanyRuntime."></A>Bringing Up A Standalone Tuscany Runtime. </H1>
+<P>When starting to look at the Tuscany SCA Java runtime it is useful to understand what top level calls are made and why. Currently there are several implementations of a &quot;Domain&quot; object that can be used to start up Tuscany.</P>
+
+<UL>
+	<LI>DefaultSCADomain - a simple domain implementation that hides most of the details. Used in most test cases to date</LI>
+	<LI>EmbeddedSCADomain - used for embedding Tuscany into other systems</LI>
+	<LI>HotUpdateSCADomain - an example that automatically loads contributions as they change</LI>
+	<LI>EmbeddedNode - A node in a distributed domain</LI>
+</UL>
+
+
+<P>Looking at EmbeddedSCADomain gives a good view of what is necessary to bring up the runtime. The class can be seen in svn <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java" class="external-link" rel="nofollow">here</A> and a test program that uses it can be seen <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java" class="external-link" rel="nofollow">here</A>.</P>
+
+<P>The EmbeddedSCADomain class provides an implementation of an SCA domain that holds all the parts of the runtime together within a single VM. Creating and embedded domain is straighforward.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+domain = <SPAN class="code-keyword">new</SPAN> EmbeddedSCADomain(cl, domainName);
+domain.start();
+</PRE>
+</DIV></DIV>
+
+<P>Calling the start methd on the domain causes all the runtime artifacts to be built. In particular all the runtime extensions, e.g. implementation, binding, databinding, host, are loaded and initialized using the java META-INF/services mechanism. </P>
+
+<P>The next thing to do is load and SCA application into the domain. SCA applications are deployed as contributions. A contribution brings together composite file with all the resources required by the composite file, e.g. .java, .xml. xsd. wsdl etc. in a structure defined by the SCA assembly specification. The EmbeddedSCADomain provides a contribution service for reading contributions. Here the contribution service is retrieved and a contribution, identified by a URL, is added to it. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ContributionService contributionService = domain.getContributionService();
+Contribution contribution = contributionService.contribute(<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//calculator&quot;</SPAN>,
+</SPAN>                                                           contributionURL,
+                                                           <SPAN class="code-keyword">null</SPAN>, <SPAN class="code-comment">//resolver,
+</SPAN>                                                           <SPAN class="code-keyword">false</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>This results in an in memory assembly model (see the assembly module).You can get at the deployable parts of the model by asking the resulting contribution. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Composite composite = contribution.getDeployables().get(0);
+</PRE>
+</DIV></DIV>
+
+<P>The root of the deployable model is a composite which contains a hierarchy of components that will run in the Tuscany runtime. Various steps are now taken to turn the logical assembly model into runnable artifacts so that the components can be started. </P>
+
+<P>First the the model composite gets added to a top level composite that the local domain controls.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+domain.getDomainComposite().getIncludes().add(composite);
+</PRE>
+</DIV></DIV>
+
+<P>Then there is a build stage where the parts of the logical model are linked together, references to services etc.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+domain.getCompositeBuilder().build(composite);
+</PRE>
+</DIV></DIV>
+
+<P>Then finally the runtime artifacts are created based on the logical model, these include the service endpoints and clients. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+domain.getCompositeActivator().activate(composite);
+</PRE>
+</DIV></DIV>
+
+<P>Once all this is done, each composite in the domain can be started independently. It is at this stage, for example, that the servlets required to support web services on an HTTP transport are actually deployed.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">for</SPAN> (Composite composite : domain.getDomainComposite().getIncludes()){
+    domain.getCompositeActivator().start(composite);
+}
+</PRE>
+</DIV></DIV>
+
+<H1><A name="SCAJavaGetStartedwithCoding-TheDistrubutedRuntime"></A>The Distrubuted Runtime</H1>
+
+<P>When a domain is distributed across more than one VM an extra step is required. Once the logical model has been through the build stage there is a step where information is provided to the runtime so that remote services can be resolved automatically across the network. I.e. we link all of the services and reference in the assembly model into the notion of a distributed domain.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+distributedDomain.addDistributedDomainToBindings(composite);
+</PRE>
+</DIV></DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-getting-started-guides-1x.html b/site/trunk/site-publish/sca-java-getting-started-guides-1x.html
new file mode 100644
index 0000000000..1c3d749536
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-getting-started-guides-1x.html
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java Getting Started Guides - 1.x : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=108240">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Getting Started Guides - 1.x">SCA Java Getting Started Guides - 1.x</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <UL>
+	<LI><A href="getting-started-with-tuscany-using-the-command-line.html" title="Getting Started with Tuscany ( using the Command Line)">Get Started with Tuscany using Command Line</A><BR>
+This is a quick getting started guide that shows you how to download the latest release, run the calculator sample and then how to use the calculator sample project as a basis for you own projects</LI>
+	<LI><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Get Started with Tuscany using Eclipse</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany SCA distribution manually installed into Eclipse</LI>
+	<LI><A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Get Started with Tuscany using Tuscany Eclipse plugins</A><BR>
+This quick guide goes trough the steps of building the store scenario using Tuscany Eclipse plugins.</LI>
+	<LI><A href="build-your-first-web-services-with-tuscany.html" title="Build your first Web Services with Tuscany">Building your first web services using Tuscany</A><BR>
+This is a quick guide that go trough the steps of exposing your pojo component as web services.</LI>
+</UL>
+
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-getting-started-guides.html b/site/trunk/site-publish/sca-java-getting-started-guides.html
new file mode 100644
index 0000000000..b8d25a22c1
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-getting-started-guides.html
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SCA Java Getting Started Guides : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=108240">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Getting Started Guides">SCA Java Getting Started Guides</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <P>place holder</P>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-hostembedded.html b/site/trunk/site-publish/sca-java-hostembedded.html
new file mode 100644
index 0000000000..8772e3bb8b
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-hostembedded.html
@@ -0,0 +1,224 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA JAVA host.embedded</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=57008">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA JAVA host.embedded">SCA JAVA host.embedded</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJAVAhost.embedded-host.embedded"></A>host.embedded</H2>
+
+<P>The embedded host extension provides some simple options for embedding the SCA runtime in other applications such as the programs that the Apache Tuscany project uses for tests and for its sample applications. </P>
+
+<H3><A name="SCAJAVAhost.embedded-SCADomain"></A>SCADomain</H3>
+
+<P>You will see SCADomain used in many of the project's test and sample applications in the following form:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">// intialize the Tuscany SCA Java runtime and provide a contribution
+</SPAN>SCADomain scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>);
+
+<SPAN class="code-comment">// a self reference to a service in the contribution
+</SPAN>CalculatorService calculatorService = scaDomain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+
+<SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> some work with the service
+</SPAN><SPAN class="code-object">int</SPAN> result = calculatorService.add(3, 2)
+
+<SPAN class="code-comment">// shut down the Tuscany SCA Java runitme
+</SPAN>scaDomain.close();
+</PRE>
+</DIV></DIV>
+
+<P>SCADomain provides an interface for creating a domain and adding contributions. Once the domain is initialize it can be used to find services and references from the domain so that they can be manipulated directly. </P>
+
+<H3><A name="SCAJAVAhost.embedded-SelectingADomainImplementation"></A>Selecting A Domain Implementation</H3>
+
+<P>Currently two domain inplementations are provided, DefaultSCADomain and EmbeddedSCADomain. You can choose between the two by...</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO </P>
+
+<H3><A name="SCAJAVAhost.embedded-DefaultSCADomain"></A>DefaultSCADomain</H3>
+
+<H4><A name="SCAJAVAhost.embedded-DefiningAContribution"></A>Defining A Contribution</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO </P>
+
+<H4><A name="SCAJAVAhost.embedded-DomainURI"></A>Domain URI</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="SCAJAVAhost.embedded-GettingServices"></A>Getting Services</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="SCAJAVAhost.embedded-GettingReferences"></A>Getting References </H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H3><A name="SCAJAVAhost.embedded-EmbeddedSCADomain"></A>EmbeddedSCADomain</H3>
+
+<H4><A name="SCAJAVAhost.embedded-DefiningAContribution"></A>Defining A Contribution</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO </P>
+
+<H4><A name="SCAJAVAhost.embedded-DomainURI"></A>Domain URI</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="SCAJAVAhost.embedded-GettingServices"></A>Getting Services</H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+
+<H4><A name="SCAJAVAhost.embedded-GettingReferences"></A>Getting References </H4>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-hostgeronimo.html b/site/trunk/site-publish/sca-java-hostgeronimo.html
new file mode 100644
index 0000000000..64f9ed75af
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-hostgeronimo.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java host.geronimo</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66530">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java host.geronimo">SCA Java host.geronimo</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>To be done.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-hostweblogic.html b/site/trunk/site-publish/sca-java-hostweblogic.html
new file mode 100644
index 0000000000..2106096e4a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-hostweblogic.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java host.weblogic</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=76244">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java host.weblogic">SCA Java host.weblogic</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P> Please see this user's blog to learn how to do this:</P>
+
+
+<P><A href="http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html" class="external-link" rel="nofollow">http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-hostwebsphere.html b/site/trunk/site-publish/sca-java-hostwebsphere.html
new file mode 100644
index 0000000000..ee4d2735f4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-hostwebsphere.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java host.Websphere</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66531">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java host.Websphere">SCA Java host.Websphere</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Please find details of how to run Tuscany in Websphere at <A href="http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html" class="external-link" rel="nofollow">Sebastien's blog</A>.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationbpel.html b/site/trunk/site-publish/sca-java-implementationbpel.html
new file mode 100644
index 0000000000..8f083ec27d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationbpel.html
@@ -0,0 +1,163 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.bpel</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60308">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.bpel">SCA Java implementation.bpel</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJavaimplementation.bpel-Introduction"></A>Introduction</H3>
+
+<P>This is a initial WS-BPEL component implementation that allows SCA runtime to invoke WS-BPEL executable processes in a SCA composition.<BR>
+We are still working to finalize the Reference support, to allow your BPEL process to have partnerLinks pointing to SCA components.</P>
+
+<P>As for creating a SCA component, below is an sample SCDL</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//bpel&quot;</SPAN>
+</SPAN>    xmlns:hns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;bpel&quot;</SPAN>&gt;
+    
+    &lt;component name=<SPAN class="code-quote">&quot;BPELHelloWorldComponent&quot;</SPAN>&gt;
+        &lt;implementation.bpel process=<SPAN class="code-quote">&quot;hns:HelloWorld&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.bpel-WSBPELEngine"></A>WS-BPEL Engine</H3>
+
+<P>As for a WS-BPEL engine, we are using Apache ODE. In order to properly deploy a WS-BPEL process in ODE, a deployment descriptor like the one below should be suplied with your application :</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;deploy xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.apache.org/ode/schemas/dd/2007/03&quot;</SPAN>
+</SPAN>	xmlns:tns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld&quot;</SPAN> 
+</SPAN>	xmlns:wns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/implementation/bpel/example/helloworld.wsdl&quot;</SPAN>&gt;
+</SPAN>
+
+	&lt;process name=<SPAN class="code-quote">&quot;tns:HelloWorld&quot;</SPAN>&gt;
+		&lt;active&gt;<SPAN class="code-keyword">true</SPAN>&lt;/active&gt;
+		&lt;provide partnerLink=<SPAN class="code-quote">&quot;helloPartnerLink&quot;</SPAN>&gt;
+			&lt;service name=<SPAN class="code-quote">&quot;wns:HelloService&quot;</SPAN> port=<SPAN class="code-quote">&quot;HelloPort&quot;</SPAN>/&gt;
+		&lt;/provide&gt;
+	&lt;/process&gt;
+&lt;/deploy&gt;
+</PRE>
+</DIV></DIV>
+
+<P>For more information on these deployment descriptors, see documentation on <A href="http://ode.apache.org/creating-a-process.html" class="external-link" rel="nofollow">Deploying a process in ODE</A></P>
+
+
+<H3><A name="SCAJavaimplementation.bpel-References"></A>References</H3>
+
+<P><A href="http://osoa.org/display/Main/SCA%20BPEL%20White%20Paper" class="external-link" rel="nofollow">SCA &amp; BPEL white paper </A></P>
+
+<P><A href="http://osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforBPEL_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Client Implementation Model for BPEL v1.00 </A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationdas.html b/site/trunk/site-publish/sca-java-implementationdas.html
new file mode 100644
index 0000000000..3f18b55bb2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationdas.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.das</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60309">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.das">SCA Java implementation.das</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationjava.html b/site/trunk/site-publish/sca-java-implementationjava.html
new file mode 100644
index 0000000000..8ad8472674
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationjava.html
@@ -0,0 +1,192 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56275">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.java">SCA Java implementation.java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.java-%3Cimplementation.java%3E"></A>&lt;implementation.java&gt;</H3>
+
+
+<P>The Tuscany Java SCA runtime supports components implemented in Java by using the &lt;implementation.java&gt; SCDL extension.</P>
+
+<P>The Java component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.java class=<SPAN class="code-quote">&quot;NCName&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where the class attribute is the fully qualified name of the Java class of the implementation.</P>
+
+<P>The Java component implementtaion is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-java-annotations" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<H4><A name="SCAJavaimplementation.java-someexamples"></A>some examples</H4>
+
+<P>This example shows a simple composite with a component that uses &lt;implemantation.java&gt;:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>    targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    xmlns:sample=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;SampleComposite&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;SampleComponent&quot;</SPAN>&gt;
+       &lt;implementation.java class=<SPAN class="code-quote">&quot;sample.SampleImpl&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+    
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationjpa.html b/site/trunk/site-publish/sca-java-implementationjpa.html
new file mode 100644
index 0000000000..e2bd90ebcb
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationjpa.html
@@ -0,0 +1,251 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.jpa</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=109001">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.jpa">SCA Java implementation.jpa</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Disclaimer</B><BR>Work in progress, or should I say : Ideas in progress</TD></TR></TABLE></DIV> 
+
+<H1><A name="SCAJavaimplementation.jpa-InjectionofJPAEntityManagerFactory%2FEntityManager"></A>Injection of JPA Entity Manager Factory/Entity Manager</H1>
+
+<P> The injection of JPA Entity Manager Factory/Entity Manager would allow sharing of EMFs across multiple components, this would be useful in scenarios where you have conversation. In this case, the runtime would be responsible for making sure the EM would be created and closed transparently for the application developer based on the conversation.</P>
+
+<H1><A name="SCAJavaimplementation.jpa-JPADataServices"></A>JPA Data Services</H1>
+
+<P>In this case, we would be extending the SCA programming model to expose services that interact with a persistent layer in a declarative fashion hiding the implementation details from the service developer.It's all about simplicity, allowing a service to be defined without explicitly coding the persistence layer. This would be a new Tuscany Component Type named Implementaiton.JPA. A developer would provide the business objects that would by JPA to do the OR mapping, and a business interface that would be introspect by Tuscany to properly make the JPA calls to the persistence layer to retrieve the information. Information on how to connect to the data source would be done in the composite, and we could provide some annotations to read</P>
+
+<H4><A name="SCAJavaimplementation.jpa-BusinessObject"></A>Business Object</H4>
+
+<P> The business object can be defined as per JPA programming model. You can define it as a JPA Entity and make use of JPA annotations, or use the ORM.xml as well.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Entity
+<SPAN class="code-keyword">public</SPAN> class Customer {
+
+    @Id    <SPAN class="code-keyword">protected</SPAN> <SPAN class="code-object">int</SPAN> id;
+    @Basic <SPAN class="code-keyword">protected</SPAN> <SPAN class="code-object">String</SPAN> name;
+    @Basic <SPAN class="code-keyword">protected</SPAN> <SPAN class="code-object">String</SPAN> phone;
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">int</SPAN> getId() {
+        <SPAN class="code-keyword">return</SPAN> id;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setId(<SPAN class="code-object">int</SPAN> id) {
+        <SPAN class="code-keyword">this</SPAN>.id = id;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getName() {
+        <SPAN class="code-keyword">return</SPAN> name;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setName(<SPAN class="code-object">String</SPAN> name) {
+        <SPAN class="code-keyword">this</SPAN>.name = name;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getPhone() {
+        <SPAN class="code-keyword">return</SPAN> phone;
+    }
+
+    <SPAN class="code-keyword">public</SPAN> void setPhone(<SPAN class="code-object">String</SPAN> phone) {
+        <SPAN class="code-keyword">this</SPAN>.phone = phone;
+    }
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaimplementation.jpa-BusinessInterface"></A>Business Interface</H4>
+
+<P> The Business interface would define the access to the JPA entities, and we would introduce Java Annotations to bind a specific method to a JPA query.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">import</SPAN> org.osoa.sca.annotations.Remotable;
+
+@Remotable
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> CustomerService {
+
+    Customer[] getCustomers();
+
+    void setCustomer(Customer customer);
+
+    @Query(SELECT c FROM customer c WHERE c.name = '<SPAN class="code-quote">&quot; + $1 + &quot;</SPAN>'&quot;)
+    Customer queryCustomerByName(<SPAN class="code-object">String</SPAN> name);
+
+}
+</PRE>
+</DIV></DIV>
+
+<P> We would use some Convention over Configuration to bind the interfaces methods to proper database activities :</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"> Method </TD>
+<TD class="confluenceTd"> Correspondent db operation </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> createXXX </TD>
+<TD class="confluenceTd"> Insert a new entity on the db. A collection of new entities should also be supported </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> getXXX </TD>
+<TD class="confluenceTd"> Read a given entity from the db <BR class="atl-forced-newline">  A method signature with no parameters read a collection. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> setXXX </TD>
+<TD class="confluenceTd"> Update a previously existent entity on the db. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> deleteXXX </TD>
+<TD class="confluenceTd"> Remove a previously existent entity on the db. </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> queryXXX </TD>
+<TD class="confluenceTd"> Execute a query on the db. <BR class="atl-forced-newline">  We would introduce a Java Annotation to bind a given query to the method invocation </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P> Note that introspection will be required by the runtime to properly identify the operation type being requested. Based on this introspection, the runtime will also be responsible for any necessary conversion to the proper collection being expected as a result.</P>
+
+<H4><A name="SCAJavaimplementation.jpa-Composite"></A>Composite</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>     xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>     targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//sample/implementation.jpa&quot;</SPAN>
+</SPAN>     name=<SPAN class="code-quote">&quot;customer&quot;</SPAN>&gt;
+
+	&lt;component name=<SPAN class="code-quote">&quot;CustomerServiceComponent&quot;</SPAN>&gt;
+		&lt;tuscany:implementation.jpa&gt;
+			&lt;tuscany:persistence-unit name=<SPAN class="code-quote">&quot;customer&quot;</SPAN>&gt;
+				&lt;tuscany:class&gt;assets.Customer&lt;/tuscany:class&gt;
+			&lt;/tuscany:persistence-unit&gt;
+
+                &lt;tuscany:connectionInfo&gt;
+		      &lt;tuscany:connectionProperties
+			   driverClass=<SPAN class="code-quote">&quot;org.apache.derby.jdbc.EmbeddedDriver&quot;</SPAN>
+			   databaseURL=<SPAN class="code-quote">&quot;jdbc:derby:target/test-classes/customer; create = <SPAN class="code-keyword">true</SPAN>&quot;</SPAN>
+			   loginTimeout=<SPAN class="code-quote">&quot;600000&quot;</SPAN>/&gt;
+	        &lt;/tuscany:connectionInfo&gt;
+		&lt;/tuscany:implementation.jpa&gt;
+	&lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H1><A name="SCAJavaimplementation.jpa-Benefits"></A>Benefits</H1>
+
+<UL>
+	<LI>Simplify the programming model for accessing data, hiding some of the API details required for this kind of components</LI>
+	<LI>Allow exposing data services trough multiple SCA Bindings (e.g ws, json-rpc, feeds, etc)</LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationosgi.html b/site/trunk/site-publish/sca-java-implementationosgi.html
new file mode 100644
index 0000000000..cd327a4983
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationosgi.html
@@ -0,0 +1,219 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.osgi</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66255">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.osgi">SCA Java implementation.osgi</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.osgi-%3Cimplementation.osgi%3E"></A>&lt;implementation.osgi&gt;</H3>
+
+<P>Tuscany enables OSGi bundles to be used as the implementation of SCA components by using the &lt;implementation.osgi/&gt; SCDL extension. OSGi services registered in the OSGi service registry either using&nbsp;OSGi declarative services or &nbsp;through the OSGi procedural services API can be exposed as services of the SCA component.</P>
+
+<P>The OSGi component implementation SCDL has the following format:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;implementation.osgi
+        bundleSymbolicName=&quot;&quot;
+        [bundleVersion=&quot;&quot;]
+        [classes=&quot;&quot;]
+        [imports=&quot;&quot;]&gt;
+    &lt;properties service=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties reference=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties serviceCallback=&quot;&quot;&gt;...&lt;/properties&gt;*
+    &lt;properties referenceCallback=&quot;&quot;&gt;...&lt;/properties&gt;*
+&lt;/implementation.osgi&gt;
+</PRE>
+</DIV></DIV>
+<P>The bundle is identified by its symbolic name, which is used to locate the bundle in the SCA contribution. The version of the bundle can be optionally specified if multiple versions of the bundle are present in the contribution.</P>
+
+<P>The list of classes in the bundle which&nbsp;contain SCA annotations that should be processed by the SCA runtime can be specified in the classes attribute of &lt;implementation.osgi/&gt;. If this list is not provided, only the implementation classes of service instances will be scanned for SCA annotations.&nbsp;A list of&nbsp;dependent bundles can also be specified&nbsp;in the imports attribute. If provided, these bundles are installed and started before the implementation bundle.</P>
+
+<P>OSGi services registered in the OSGi registry can have properties associated with the service registration. These properties can be used to lookup services in the registry. The properties of services, references and callbacks associated with OSGi services can be optionally specified. These will be used to create the filter for locating these services in the OSGi registry.&nbsp;</P>
+
+<P>A component type file should be provided for SCA components using an OSGi bundle as its implementation. This file should have the same base name and location as the bundle.</P>
+
+<H4><A name="SCAJavaimplementation.osgi-Example%3A"></A>Example:</H4>
+
+<P>This example shows a simple composite with&nbsp;two components that use &lt;implementation.osgi/&gt;:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0
+</SPAN>    targetNamespace=http:<SPAN class="code-comment">//helloworld
+</SPAN>    name=<SPAN class="code-quote">&quot;HelloWorld&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldClient&quot;</SPAN>&gt;
+        &lt;implementation.osgi xmlns=http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0
+</SPAN>             bundleSymbolicName=<SPAN class="code-quote">&quot;helloworld.HelloWorldClient&quot;</SPAN>                   
+             bundleVersion=<SPAN class="code-quote">&quot;1.0.0&quot;</SPAN>&gt;
+            &lt;properties reference=<SPAN class="code-quote">&quot;helloWorldService&quot;</SPAN>&gt;
+                &lt;property name=<SPAN class="code-quote">&quot;language&quot;</SPAN>&gt;English&lt;/property&gt;
+            &lt;/properties&gt;
+        &lt;/implementation.osgi&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;helloWorldService&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>/&gt;
+   &lt;/component&gt;
+   &lt;component name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+        &lt;implementation.osgi xmlns=http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0
+</SPAN>             bundleSymbolicName=<SPAN class="code-quote">&quot;helloworld.HelloWorldService&quot;</SPAN>                         
+             bundleVersion=<SPAN class="code-quote">&quot;1.0.0&quot;</SPAN>&gt;
+            &lt;properties service=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN>&gt;
+                &lt;property name=<SPAN class="code-quote">&quot;language&quot;</SPAN>&gt;English&lt;/property&gt;
+            &lt;/properties&gt;
+        &lt;/implementation.osgi&gt;
+      &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+<P>This example shows two components which use OSGi implementation. Each component implementation is an OSGi bundle, and one of the services from&nbsp;each bundle is exposed through SCA. The bundles are identified using their symbolic name and version which are values of the manifest attributes Bundle-SymbolicName and Bundle-Version respectively in the bundle jar files. The bundle jar files can either be a contribution in the SCA domain, or contained in a contribution in the SCA domain.</P>
+
+<P>The properties specified for the reference of HelloWorldClient are used to lookup HelloWorldService in the OSGi registry. These properties should match the properties specified for the service of HelloWorldService.&nbsp;</P>
+
+<P>The OSGi bundles should register the services exposed through SCA when the bundle is activated. Services are registered using standard OSGi service registration mechanism. References should be looked up in the OSGi service registry using registry lookup. SCA runtime does not perform reference injection for OSGi-based component implementation. Reference lookup should always use the service registered with the highest ranking to ensure that SCA wiring and scope are maintained. When OSGi declarative services are used, service registration and reference binding are performed by the OSGi declarative services runtime. References from components using &lt;implementation.osgi/&gt; can be wired to non-OSGi services, and non-OSGi components can access OSGi services. For example, either of the two components in this example can use &lt;implementation.java/&gt; as their implementation.</P>
+
+<P>Default scope for OSGi-based components is COMPOSITE. For scopes other than composite scope, a service factory should be registered in the OSGi service registry. Service factories should also be used for OSGi services which are used in multiple SCA components with different component properties.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationresource.html b/site/trunk/site-publish/sca-java-implementationresource.html
new file mode 100644
index 0000000000..274e61f1fb
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationresource.html
@@ -0,0 +1,161 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.resource</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66258">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.resource">SCA Java implementation.resource</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.resource-%3Cimplementation.resource%3E"></A>&lt;implementation.resource&gt;</H3>
+<P>TBD</P>
+
+<H4><A name="SCAJavaimplementation.resource-Someexamples"></A>Some examples</H4>
+<P>TBD</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationscript.html b/site/trunk/site-publish/sca-java-implementationscript.html
new file mode 100644
index 0000000000..372450dfe2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationscript.html
@@ -0,0 +1,251 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.script</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55156">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.script">SCA Java implementation.script</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.script-%3Cimplementation.script%3E"></A>&lt;implementation.script&gt;</H3>
+
+<P>Tuscany supports SCA components implemented in a wide variety of dynamic or scripting languages by using the &lt;implementation.script&gt; SCDL extension.</P>
+
+<P>Any language that supports the &quot;Scripting for Java&quot; APIs defined by JSR-223 is supported, this includes Groovy, JavaScript, JRuby, Jython, and many others.</P>
+
+<P>To use these languages the SCA assembly SCDL is extended with an &quot;implementation.script&quot; element which has the following options:</P>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.script [ script=<SPAN class="code-quote">&quot;&quot; | language=&quot;</SPAN>&quot; ] &gt;
+     [inline src]
+&lt;/implementation.script&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The source code for the script may be defined in a seperate file pointed to by the 'script=' attribute, or the source code maybe embedded within the SCDL inline inside the &lt;implementation.script&gt; element.</P>
+
+<P>The 'language=' attribute defines the language of the program. The language attribute is optional when the source code is in a separate file in which case the file extension of the file is used to determine the language.</P>
+
+<H4><A name="SCAJavaimplementation.script-Someexamples%3A"></A>Some examples:</H4>
+
+
+<P>A Ruby program defined in a file 'myScript.rb' in a folder named 'test':</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.script script=<SPAN class="code-quote">&quot;test/myScript.rb&quot;</SPAN>/&gt;
+</PRE>
+</DIV></DIV>
+
+
+<P>A JavaScript program defined inline:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;
+      function sayHello(name) {
+         <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;Hello &quot;</SPAN> + name;
+      }
+&lt;/implementation.script&gt;
+</PRE>
+</DIV></DIV>
+
+
+<P>When using inline scripts which contain special characters such as XML markup you may need to enclose the source within a CDATA region, for example:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+      function sayHello(inXML) {
+         <SPAN class="code-keyword">return</SPAN> &lt;sayHelloResponse&gt;Hello { inXML..name }&lt;/sayHelloResponse&gt;;
+      }
+]]&gt;&lt;/implementation.script&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The previous example demonstrated using JavaScript's <A href="http://www.ecma-international.org/publications/standards/Ecma-357.htm" class="external-link" rel="nofollow">E4X</A> language extension for manipulating XML. Many dynamic languages have enhanced XML capabilities like this which can make working with XML much easier than in a more traditional language such as Java. For example, along with JavaScript's E4X, Ruby has ReXML and Groovy has its markup builders. </P>
+
+<P>Tuscany tries to simplify this for the script program developer and will try to automatically ensure arguments are in the native XML format of the language when the component is wired to a WSDL interface.  </P>
+
+<P>As an example of this the following shows a composite that can replace the Tuscany helloworld-ws-service sample and requires no other files other than the asscociated WSDL document packaged with the contribution:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>        xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>
+</SPAN>        name=<SPAN class="code-quote">&quot;helloworldws&quot;</SPAN>&gt;
+
+    &lt;service name=<SPAN class="code-quote">&quot;HelloWorldService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+       &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld#wsdl.<SPAN class="code-keyword">interface</SPAN>(HelloWorld)&quot;</SPAN> /&gt;
+</SPAN>       &lt;binding.ws/&gt;
+    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;HelloWorldServiceComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.script language=<SPAN class="code-quote">&quot;js&quot;</SPAN>&gt;&lt;![CDATA[
+
+           function getGreetings(xmlIn) {
+              <SPAN class="code-keyword">return</SPAN> &lt;ns1:getGreetingsResponse xmlns:ns1=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//helloworld&quot;</SPAN>&gt;
+</SPAN>                        &lt;ns1:getGreetingsReturn&gt;Hello { xmlIn..*::name.toString() }&lt;/ns1:getGreetingsReturn&gt;
+                     &lt;/ns1:getGreetingsResponse&gt;
+           }
+
+        ]]&gt;&lt;/tuscany:implementation.script&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Best practice?</B><BR>Using inline scripts can make creating simple components very easy however there are issues around whether or not this is best practice. <BR>
+Depending on the circumstance consideration should be given as to if it would be better to define the script in a seperate file.</TD></TR></TABLE></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationspring.html b/site/trunk/site-publish/sca-java-implementationspring.html
new file mode 100644
index 0000000000..76bb8cdfb1
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationspring.html
@@ -0,0 +1,473 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.spring</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66253">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.spring">SCA Java implementation.spring</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJavaimplementation.spring-%3Cimplementation.spring%3E"></A>&lt;implementation.spring&gt;</H2>
+
+<P>The Tuscany Java SCA runtime supports components implemented with Spring Framework by using the &lt;implementation.spring&gt; SCDL extension. </P>
+
+<P>The <A href="http://www.osoa.org/download/attachments/35/SCA_SpringComponentImplementationSpecification-V100.pdf?version=1" class="external-link" rel="nofollow">Spring specification</A> defines how Spring and SCA work with one another. The Spring Component implementation is one of the SCA extensions which is being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-opencsa.org/sca-spring" class="external-link" rel="nofollow">specifications </A> document.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> In <A href="http://static.springframework.org/spring/docs/2.5.5/reference" class="external-link" rel="nofollow">Spring Framework</A> an ApplicationContext is the main interface to the Spring IoC container. It is used to look up objects. It can be viewed as the Java object representation of the application-Context.xml file that contains the bean definitions.</P>
+
+<P>The integration with Spring will be at the SCA Composite level, where a Spring application context provides a complete composite, exposing services and using references via SCA. This means that a Spring application context defines the internal structure of a SCA composite implementation.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> Tuscany uses Spring Framework 2.5.5 (requires Java 1.4+)</P>
+
+<H3><A name="SCAJavaimplementation.spring-HowSpringApplicationContextisusedasSCACompositeImplementation%3F"></A>How Spring Application Context is used as SCA Composite Implementation?</H3>
+
+<UL>
+	<LI>A Spring Application Context is used as an implementation within an SCA composite component.</LI>
+	<LI>A component that uses Spring for an implementation can wire SCA services and references without introducing SCA metadata into the Spring configuration.<BR>
+The Spring context knows very little about the SCA environment. </LI>
+	<LI>SCA runtime enforces SCA policies and Spring Application Context is unaware of it.</LI>
+	<LI>It should be possible to generate an SCA Composite from any Spring context and use that composite within an SCA assembly.<BR>
+<EM>This feature is under review by the OASIS Specs Team, yet to be implemented in Tuscany</EM></LI>
+</UL>
+
+
+<H3><A name="SCAJavaimplementation.spring-HowtoUseSpringComponentImplementation%3F"></A>How to Use Spring Component Implementation?</H3>
+
+<P>The Spring component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.spring location=<SPAN class="code-quote">&quot;targetURI&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Where the location attribute of that element specifies the target uri of an archive file or directory or the fully qualified path that contains the Spring application context files. </P>
+
+<P>An example of all the three ways of specifying the target uri in the location attribute is shown below</P>
+
+<P>a) Specifying Fully Qualified Path:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring/application-context.xml&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>b) Specifying a Directory:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Here the target uri specifies the resource as a directory named &quot;spring&quot;, where all the spring related files are available.</P>
+
+<P>c) Specifying an Archive file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.spring location=<SPAN class="code-quote">&quot;./spring.jar&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Here the target uri specifies the resource as an archive file name &quot;spring.jar&quot;, where all the spring related files are available.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> In case of b) and c), If the resource identified by the location attribute is an archive file then the file META-INF/MANIFEST.MF is read from the archive. If the location URI identifies a directory, then META-INF/MANIFEST.MF must exist underneath that directory.</P>
+
+<P>If the manifest file contains a header &quot;Spring-Context&quot; of the format: <INS>Spring-Context ::= path ( ';' path )*</INS></P>
+
+<P>Where path is a relative path with respect to the location URI, then the set of paths specified in the header identify the context configuration files. If there is no MANIFEST.MF file or no Spring-Context header within that file, then the default behavior is to build an application context using application-context.xml file in the META-INF/spring directory.</P>
+
+<H3><A name="SCAJavaimplementation.spring-HowSpringApplicationContextisAwareofBeansusedinSCAcomposition%3F"></A>How Spring Application Context is Aware of Beans used in SCA composition?</H3>
+
+<P>Your existing Spring Application context should define the <A href="http://www.springframework.org/schema/sca" class="external-link" rel="nofollow">http://www.springframework.org/schema/sca</A> namespace in order to make the Spring aware of the SCA related beans. This is shown below.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;beans xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.springframework.org/schema/beans&quot;</SPAN>
+</SPAN>       xmlns:xsi=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema-instance&quot;</SPAN>
+</SPAN>       xmlns:sca=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.springframework.org/schema/sca&quot;</SPAN>
+</SPAN>       xsi:schemaLocation=&quot;
+       http:<SPAN class="code-comment">//www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+</SPAN>       http:<SPAN class="code-comment">//www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd&quot;&gt;
+</SPAN>       
+    &lt;sca:service name=<SPAN class="code-quote">&quot;StockQuoteService&quot;</SPAN>
+        type=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN> target=<SPAN class="code-quote">&quot;StockQuoteServiceBean&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;StockQuoteServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteImpl&quot;</SPAN>&gt;
+    &lt;/bean&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.spring-HandlingmultipleSpringApplicationContexts"></A>Handling multiple Spring Application Contexts </H3>
+
+<P>Tuscany supports the following configurations to handle multiple Spring Application Context XML files.</P>
+
+<H4><A name="SCAJavaimplementation.spring-Using%3Cimport%3EElement%3A"></A>Using &lt;import&gt; Element:</H4>
+<P>Each import element points to an application context xml file.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;beans&gt;
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;services.xml&quot;</SPAN>/&gt;
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;resources/messageSource.xml&quot;</SPAN>/&gt;
+
+    &lt;<SPAN class="code-keyword">import</SPAN> resource=<SPAN class="code-quote">&quot;/resources/themeSource.xml&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;bean1&quot;</SPAN> class=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;
+    &lt;bean id=<SPAN class="code-quote">&quot;bean2&quot;</SPAN> class=<SPAN class="code-quote">&quot;...&quot;</SPAN>/&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<H4><A name="SCAJavaimplementation.spring-UsingClassPathXmlApplicationContextBeanDefinition%3A"></A>Using ClassPathXmlApplicationContext Bean Definition:</H4>
+<P>Each list value points to an application context xml file.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;bean id=<SPAN class="code-quote">&quot;beanRefFactory&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.springframework.context.support.ClassPathXmlApplicationContext&quot;</SPAN>&gt;
+    &lt;constructor-arg&gt;
+        &lt;list&gt;
+            &lt;value&gt;services.xml&lt;/value&gt;
+            &lt;value&gt;resources/messageSource.xml&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/constructor-arg&gt;
+&lt;/bean&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaimplementation.spring-SomeExamples%3A"></A>Some Examples:</H3>
+
+<H4><A name="SCAJavaimplementation.spring-SpringBigBankSample"></A>Spring BigBank Sample</H4>
+<P>The spring-bigbank sample demonstrates most of the functionality that is specified in the <A href="http://www.oasis-opencsa.org/sca-spring" class="external-link" rel="nofollow">specifications </A>.</P>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/simple-bigbank-spring/" class="external-link" rel="nofollow">simple-bigbank-spring </A> sample for a complete example.</P>
+
+<H4><A name="SCAJavaimplementation.spring-DirectuseofSCAreferenceswithinaSpringconfiguration"></A>Direct use of SCA references within a Spring configuration</H4>
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-calculator/" class="external-link" rel="nofollow">spring-bigbank-calculator </A> sample for a complete example of using direct SCA references within Spring configuration.</P>
+
+<P>The properties like addService, subtractService, multiplyService and divideService defined in the Spring configuration as shown below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;beans&gt;
+
+    &lt;sca:service name=<SPAN class="code-quote">&quot;CalculatorService&quot;</SPAN>
+        type=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorService&quot;</SPAN> target=<SPAN class="code-quote">&quot;CalculatorServiceBean&quot;</SPAN>/&gt;
+
+    &lt;bean id=<SPAN class="code-quote">&quot;CalculatorServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorServiceImpl&quot;</SPAN>&gt;
+        &lt;!-- Here are some implicit references - a property with a ref not satisifed within the
+         * Spring application context.
+         --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;addService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;subtractService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;multiplyService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;divideService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;divideService&quot;</SPAN>/&gt;
+    &lt;/bean&gt;
+
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<P>are the direct representation of the SCA references defined in the composite file.</P>
+
+<H4><A name="SCAJavaimplementation.spring-ExplicitdeclarationofSCArelatedbeansinsideaSpringApplicationContext"></A>Explicit declaration of SCA related beans inside a Spring Application Context</H4>
+<P>It is also possible to explicitly declare SCA-related beans inside a Spring configuration to proxy SCA references. The primary reason you may do this is to enable the Spring container to decorate the bean (using Spring AOP for example).</P>
+
+<P>The properties checkingAccountService, calculatorService and stockQuoteService defined in the Spring configuration as shown below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;beans&gt;
+   &lt;bean id=<SPAN class="code-quote">&quot;AccountServiceBean&quot;</SPAN> class=<SPAN class="code-quote">&quot;bigbank.account.AccountServiceImpl&quot;</SPAN>&gt;     
+        &lt;property name=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN>/&gt;
+        
+        &lt;!-- Here are some implicit references &amp; properties - a property with a ref not satisifed 
+        * within the Spring application context.
+         --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;savingsAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;savingsAccountService&quot;</SPAN>/&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;stockAccountService&quot;</SPAN> ref=<SPAN class="code-quote">&quot;stockAccountService&quot;</SPAN>/&gt;              
+        &lt;property name=<SPAN class="code-quote">&quot;currency&quot;</SPAN> value=<SPAN class="code-quote">&quot;EURO&quot;</SPAN>/&gt;
+    &lt;/bean&gt;
+    
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;checkingAccountService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.account.checking.CheckingAccountService&quot;</SPAN>/&gt;
+    
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;calculatorService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.calculator.CalculatorService&quot;</SPAN>/&gt;
+    
+    &lt;sca:reference name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN> type=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN>/&gt;
+&lt;/beans&gt;
+</PRE>
+</DIV></DIV>
+
+<P>can be declared explicit as SCA beans in Spring Application Context using the &lt;sca:reference&gt; element.</P>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/simple-bigbank-spring/" class="external-link" rel="nofollow">simple-bigbank-spring </A> sample for a complete example of using explicit declaration of SCA related beans.</P>
+
+<H4><A name="SCAJavaimplementation.spring-UsingSCABindingsforSpringImplementation"></A>Using SCA Bindings for Spring Implementation</H4>
+
+<P>We know that a component that uses Spring for an implementation can wire SCA services and references without introducing SCA metadata into the Spring configuration. The Spring context knows very little about the SCA environment. Hence the SpringComponent implementation remains the same as shown from some of the examples above but different bindings are chosen at the SCA Composite level as shown below.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> All kind of bindings supported by SCA can be used for Spring Implementation as the bindings are independent of Spring context. Few examples can be seen below.</P>
+
+<H5><A name="SCAJavaimplementation.spring-WorkingwithSCAWebServicesBinding"></A>Working with SCA WebServices Binding</H5>
+
+<P>Declaring Service</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite name=<SPAN class="code-quote">&quot;StockQuote&quot;</SPAN>&gt;
+    
+    &lt;service name=<SPAN class="code-quote">&quot;StockQuoteService&quot;</SPAN> promote=<SPAN class="code-quote">&quot;StockQuoteServiceComponent&quot;</SPAN>&gt;
+        &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;bigbank.stockquote.StockQuoteService&quot;</SPAN>/&gt;
+        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8081/services/StockQuoteWebService&quot;</SPAN>/&gt;
+</SPAN>    &lt;/service&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;StockQuoteServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.spring location=<SPAN class="code-quote">&quot;META-INF/spring/StockQuoteService-context.xml&quot;</SPAN>/&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Declaring Reference in a component which consumes the Service declared above</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;AccountServiceComponent&quot;</SPAN>&gt;
+    &lt;implementation.spring location=<SPAN class="code-quote">&quot;spring-context/Account-spring-context.xml&quot;</SPAN>/&gt;
+
+    &lt;reference name=<SPAN class="code-quote">&quot;stockQuoteService&quot;</SPAN>&gt;
+       &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8081/services/StockQuoteWebService&quot;</SPAN>/&gt;
+</SPAN>    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-stockquote/" class="external-link" rel="nofollow">spring-bigbank-stockquote </A> sample for a complete example of using SCA Web Service binding.</P>
+
+<H5><A name="SCAJavaimplementation.spring-WorkingwithSCARMIBinding"></A>Working with SCA RMI Binding</H5>
+
+<P>See the <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/samples/spring-bigbank-calculator/" class="external-link" rel="nofollow">spring-bigbank-calculator </A> sample for a complete example of using SCA RMI binding.</P>
+
+<H3><A name="SCAJavaimplementation.spring-AccesstheSpringApplicationContextfromeverywhereinyourApplication"></A>Access the Spring-ApplicationContext from everywhere in your Application</H3>
+<P>Tuscany creates an custom Application context with an implementation logic for all SCA related beans like &lt;sca:service&gt;, &lt;sca:reference&gt; and &lt;sca:properties&gt; available in the Spring Application Context.</P>
+
+<P>To access the application context in your application we recommend to use the suggested approach in this article.<BR>
+<A href="http://blog.jdevelop.eu/2008/07/06/access-the-spring-applicationcontext-from-everywhere-in-your-application/" class="external-link" rel="nofollow">http://blog.jdevelop.eu/2008/07/06/access-the-spring-applicationcontext-from-everywhere-in-your-application/</A></P>
+
+<H3><A name="SCAJavaimplementation.spring-NonSupportedFeaturesinTuscany"></A>Non-Supported Features in Tuscany</H3>
+<P>Currently Tuscany does not support implicit SCA references and properties for scenario 1 &amp; 2 in spring context as shown below.</P>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario1%3AUsingimplicitSCAReferences%26PropertiesforConstructors"></A>Scenario 1: Using implicit SCA References &amp; Properties for Constructors</H5>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;constructor-arg&gt;&lt;ref bean=<SPAN class="code-quote">&quot;mySCAService1&quot;</SPAN>/&gt;&lt;/constructor-arg&gt;
+&lt;constructor-arg&gt;&lt;ref bean=<SPAN class="code-quote">&quot;mySCAService2&quot;</SPAN>/&gt;&lt;/constructor-arg&gt; 
+</PRE>
+</DIV></DIV>
+
+<P>In the above scenario, particularly in cases where the spring bean has defined only one constructor, implicit references / properties can be supported when the contructor-arg element specifies the type of the SCA reference/property that its trying to consume by specifying a type attribute in the contructor-arg OR when the appropriate index attribute is specified in the constructor-arg element.</P>
+
+<P>In cases where the spring bean has defined multiple contructors, its mandatory that all the SCA references / properties used by the constructors should be defined explicitly. And when the constructor-arg uses SCA reference/property within collections, those should be defined explicitly.</P>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario2%3AUsingimplicitSCAReferences%26PropertiesinList%2CMapandSetofbeanproperties."></A>Scenario 2: Using implicit SCA References &amp; Properties in List, Map and Set of bean properties.</H5>
+<P>Using implicit SCA references and properties within collection as shown in the below code sample will not be supported by Tuscany. Instead we recommed to use explicit SCA references/properties in such cases.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;bean id=<SPAN class="code-quote">&quot;moreComplexObject&quot;</SPAN> class=<SPAN class="code-quote">&quot;example.ComplexObject&quot;</SPAN>&gt;
+  &lt;!-- results in a setSomeList(java.util.List) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someList&quot;</SPAN>&gt;
+    &lt;list&gt;
+        &lt;value&gt;a list element followed by a reference&lt;/value&gt;
+        &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService1&quot;</SPAN> /&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+  &lt;!-- results in a setSomeMap(java.util.Map) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someMap&quot;</SPAN>&gt;
+    &lt;map&gt;
+        &lt;entry&gt;
+            &lt;key&gt;
+                &lt;value&gt;an entry&lt;/value&gt;
+            &lt;/key&gt;
+            &lt;value&gt;just some string&lt;/value&gt;
+        &lt;/entry&gt;
+        &lt;entry&gt;
+            &lt;key&gt;
+                &lt;value&gt;a ref&lt;/value&gt;
+            &lt;/key&gt;
+            &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService2&quot;</SPAN> /&gt;
+        &lt;/entry&gt;
+    &lt;/map&gt;
+  &lt;/property&gt;
+  &lt;!-- results in a setSomeSet(java.util.Set) call --&gt;
+  &lt;property name=<SPAN class="code-quote">&quot;someSet&quot;</SPAN>&gt;
+    &lt;set&gt;
+        &lt;value&gt;just some string&lt;/value&gt;
+        &lt;ref bean=<SPAN class="code-quote">&quot;mySCAService3&quot;</SPAN> /&gt;
+    &lt;/set&gt;
+  &lt;/property&gt;
+&lt;/bean&gt;
+</PRE>
+</DIV></DIV>
+
+<H5><A name="SCAJavaimplementation.spring-Scenario3%3AExposingSCAServicefromSpringBeanthatimplementsmultipleinterfaces."></A>Scenario 3: Exposing SCA Service from Spring Bean that implements multiple interfaces.</H5>
+
+<P>Raised as Specification Issue: <A href="http://www.osoa.org/jira/browse/JAVA-59" class="external-link" rel="nofollow">http://www.osoa.org/jira/browse/JAVA-59</A></P>
+
+<H3><A name="SCAJavaimplementation.spring-SpringSCANamespaceschema"></A>Spring SCA Namespace schema</H3>
+
+<P>The spring-sca.xsd can be found at the following location: <A href="http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd" class="external-link" rel="nofollow">http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd</A></P>
+
+<H3><A name="SCAJavaimplementation.spring-References"></A>References</H3>
+
+<P>Spring Framework - <A href="http://static.springframework.org/spring/docs/2.5.5/reference/index.html" class="external-link" rel="nofollow">http://static.springframework.org/spring/docs/2.5.5/reference/index.html</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationweb.html b/site/trunk/site-publish/sca-java-implementationweb.html
new file mode 100644
index 0000000000..b7e155b639
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationweb.html
@@ -0,0 +1,380 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.web</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=92446">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.web">SCA Java implementation.web</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.web-%3Cimplementation.web%3E"></A>&lt;implementation.web&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports components implemented as JEE web modules by using the &lt;implementation.web&gt; SCDL extension. Implementation.web is one of the SCA extensions being formalized in the OASIS Open Composite Services Architecture with a published <A href="http://www.oasis-open.org/committees/download.php/28798/SCA_JAVAEE_Integration_V100.pdf" class="external-link" rel="nofollow">specification </A> document.</P>
+
+<P>The web component implementation SCDL has the following format:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;implementation.web web-uri=<SPAN class="code-quote">&quot;&lt;module name&gt;&quot;</SPAN> /&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Implementation.web can be used by components such as Servlets, JSPs, and Web 2.0 style html pages. How it works depends on the way the Tuscany runtime is being used.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithServlets%2CFilters%2CandEventlisteners"></A>Using implementation.web with Servlets, Filters, and Event listeners</H4>
+
+<P>JEE Servlets, Filters, and Event listeners may acquire references to the services wired to a component which use implementation.web as shown in the following code snippets.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>/&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then when using a JEE container with SCA integration Servlets, Filters, and Event listeners can use annotations to acquire references to the services wired to the component as shown in the following Servlet code snippet (note the Servlet field name 'service' matches the reference name in the SCDL):</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class HelloworldServlet <SPAN class="code-keyword">extends</SPAN> HttpServlet {
+
+    @Reference
+    <SPAN class="code-keyword">protected</SPAN> HelloworldService service;
+
+  . . .
+}
+</PRE>
+</DIV></DIV>
+
+<P>When the container does not have SCA integration then injection via annotations does not work, so to work around this the services need to be manually got from the ComponentContext which may be obtained from the application context. This is shown in the following code snippet:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class HelloworldServlet <SPAN class="code-keyword">extends</SPAN> HttpServlet {
+
+    <SPAN class="code-keyword">public</SPAN> void init(ServletConfig config) {
+       ComponentContext context = (ComponentContext)config.getServletContext().getAttribute(<SPAN class="code-quote">&quot;org.osoa.sca.ComponentContext&quot;</SPAN>);
+       HelloworldService service = context .getService(HelloworldService.class, <SPAN class="code-quote">&quot;service&quot;</SPAN>);
+       . . .
+    }
+
+  . . .
+}
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/helloworld-servlet/" class="external-link" rel="nofollow">helloworld-servlet</A> sample for the complete code of the above Servlet example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithJSPs"></A>Using implementation.web with JSPs</H4>
+
+<P>A JSP tag library is available to expose SCA components in JSP pages. To use SCA references within a JSP use a taglib to include the SCA tags and define the reference field with the reference tag.  </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>/&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the .jsp file:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;%@ taglib uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/sca/sca_jsp.tld&quot;</SPAN> prefix=<SPAN class="code-quote">&quot;sca&quot;</SPAN> %&gt;
+</SPAN>&lt;sca:reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> type=<SPAN class="code-quote">&quot;sample.HelloworldService&quot;</SPAN> /&gt;
+
+&lt;html&gt;
+  &lt;body &gt;
+    &lt;%= service.sayHello(<SPAN class="code-quote">&quot;world&quot;</SPAN>) %&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/helloworld-jsp/" class="external-link" rel="nofollow">helloworld-jsp</A> sample for the complete code of the above JSP example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwithWeb2.0stylebrowserclients"></A>Using implementation.web with Web 2.0 style browser clients</H4>
+
+<P>Web 2.0 style pages can invoke SCA services by making RPC calls from the remote browser client to the service-side SCA service. To do this the HTML page includes Javascript code to import the SCA ComponentContext and then gets service proxys from that ComponentContext. The org.osoa.sca.componentContext.js script is generated by Tuscany when a component uses implementation.web.</P>
+
+<P>In the SCDL the reference needs to specify one of the Tuscany Web2.0 bindings such as binding.jsonrpc or binding.dwr. <BR>
+(TODO: could this be avoided - something like make binding.jsonrpc the default sca binding for web2.0 clients?) </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+   &lt;implementation.web web-uri=&quot;&quot;/&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>&gt;
+      &lt;tuscany:binding.jsonrpc /&gt;
+   &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the html page:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+  &lt;head&gt;
+
+    &lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;org.osoa.sca.componentContext.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+    &lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+    
+       function callSayHello() {
+          componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHello(
+             document.getElementById('name').value, 
+             function(reply) {
+                document.getElementById('result').innerHTML=reply;
+             });
+       }
+
+    &lt;/script&gt;
+
+  &lt;/head&gt;
+  &lt;body &gt;
+
+    . . . 
+
+     &lt;input type=<SPAN class="code-quote">&quot;text&quot;</SPAN> id=<SPAN class="code-quote">&quot;name&quot;</SPAN> width=<SPAN class="code-quote">&quot;10&quot;</SPAN>&gt;
+
+     &lt;button name=<SPAN class="code-quote">&quot;submit&quot;</SPAN> onclick=<SPAN class="code-quote">&quot;callSayHello()&quot;</SPAN>&gt;Say hello&lt;/button&gt;
+
+     &lt;div id='result'&gt;&lt;/div&gt;
+
+    . . . 
+
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/samples/samples/helloworld-web/" class="external-link" rel="nofollow">helloworld-web</A> sample for the complete code of the above example.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> The following on Web 2.0 callbacks is not yet fully implemented, describing here to encourage feedback </P>
+
+<P>Tuscany Web 2.0 clients using implementation.web support SCA asynchronous callbacks using what is known as <A href="http://en.wikipedia.org/wiki/Comet_(programming)" class="external-link" rel="nofollow">Comet or Reverse Ajax</A>. The only Tuscany binding that currently supports this in binding.dwr.</P>
+
+<P>The following shows the previous sample changed to use callbacks to receive the replies. A callback binding is added to the reference in the SCDL and the callback function is defined as a seperate Javascript function defined by the client and attached to the service proxy object. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;WebClient&quot;</SPAN>&gt;
+    &lt;implementation.web web-uri=&quot;&quot;/&gt;
+    &lt;reference name=<SPAN class="code-quote">&quot;service&quot;</SPAN> target=<SPAN class="code-quote">&quot;HelloworldService&quot;</SPAN>&gt;
+        &lt;tuscany:binding.dwr /&gt;
+        &lt;callback&gt;
+            &lt;tuscany:binding.dwr /&gt;
+        &lt;/callback&gt;
+    &lt;/reference&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>In the html page:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;html&gt;
+  &lt;head&gt;
+
+    &lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;org.osoa.sca.componentContext.js&quot;</SPAN>&gt;&lt;/script&gt;
+
+    &lt;script language=<SPAN class="code-quote">&quot;JavaScript&quot;</SPAN>&gt;
+
+       componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHelloCallback = 
+          function(reply) {
+             document.getElementById('result').innerHTML=reply;
+          };
+    
+       function callSayHello() {
+          componentContext.getService(<SPAN class="code-quote">&quot;service&quot;</SPAN>).sayHello(document.getElementById('name').value);
+       }
+
+    &lt;/script&gt;
+
+  &lt;/head&gt;
+  &lt;body &gt;
+
+    . . . 
+
+     &lt;input type=<SPAN class="code-quote">&quot;text&quot;</SPAN> id=<SPAN class="code-quote">&quot;name&quot;</SPAN> width=<SPAN class="code-quote">&quot;10&quot;</SPAN>&gt;
+
+     &lt;button name=<SPAN class="code-quote">&quot;submit&quot;</SPAN> onclick=<SPAN class="code-quote">&quot;callSayHello()&quot;</SPAN>&gt;Say hello&lt;/button&gt;
+
+     &lt;div id='result'&gt;&lt;/div&gt;
+
+    . . . 
+
+  &lt;/body&gt;
+&lt;/html&gt;
+</PRE>
+</DIV></DIV>
+
+<P>See the <A href="https://svn.apache.org/repos/asf/tuscany/java/sca/samples/helloworld-web-callback/" class="external-link" rel="nofollow">helloworld-web-callback</A> sample for the complete code of the above example.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanyruntimeembeddedwithinawebapp"></A>Using implementation.web with the Tuscany runtime embedded within a webapp</H4>
+
+<P>This is the style all the current Tuscany webapp samples use. When using implementation.web with the Tuscany runtime embedded within a webapp the implementation.web web-uri attribute is ignored.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanyruntimeintegratedintoaJEEserversuchasTomcatorGeronimo"></A>Using implementation.web with the Tuscany runtime integrated into a JEE server such as Tomcat or Geronimo</H4>
+
+<P>The only code that is currently working is some prototype code in the Tuscany runtime-tomcat module that supports injecting references into Servlets, Filters and Event listeners using the @Reference annotation.</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanystandaloneruntime"></A>Using implementation.web with the Tuscany standalone runtime</H4>
+
+<P>Nothing implemented yet</P>
+
+<H4><A name="SCAJavaimplementation.web-Usingimplementation.webwiththeTuscanydistributeddomainruntime"></A>Using implementation.web with the Tuscany distributed domain runtime</H4>
+
+<P>Nothing implemented yet</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationwidget.html b/site/trunk/site-publish/sca-java-implementationwidget.html
new file mode 100644
index 0000000000..988519ba38
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationwidget.html
@@ -0,0 +1,188 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.widget</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75841">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.widget">SCA Java implementation.widget</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJavaimplementation.widget-Introduction"></A>Introduction</H3>
+
+<P>The Tuscany Widget Implementation extends the SCA programing model to HTML and/or Web 2.0 client applications.</P>
+
+
+<H3><A name="SCAJavaimplementation.widget-UsingImplementation.WidgettomodelyourWeb2.0component"></A>Using Implementation.Widget to model your Web 2.0 component</H3>
+
+<P>This component type allows you to model your HTML and/or Web 2.0 as an SCA component, the implementation artifact would be html resource that represents the application, and you can define SCA References, that would be wired to server side services.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite	xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>		xmlns:t=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>		targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//store&quot;</SPAN>			
+</SPAN>		name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+		
+       &lt;component name=<SPAN class="code-quote">&quot;store&quot;</SPAN>&gt;
+           &lt;t:implementation.widget location=<SPAN class="code-quote">&quot;contents/store.html&quot;</SPAN>/&gt;
+           &lt;service name=<SPAN class="code-quote">&quot;Widget&quot;</SPAN>&gt;
+               &lt;t:binding.http/&gt; 
+           &lt;/service&gt;
+	   &lt;reference name=<SPAN class="code-quote">&quot;catalog&quot;</SPAN> target=<SPAN class="code-quote">&quot;Catalog&quot;</SPAN>&gt;
+               &lt;t:binding.jsonrpc/&gt;
+	   &lt;/reference&gt;
+	   &lt;reference name=<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN> target=<SPAN class="code-quote">&quot;ShoppingCart&quot;</SPAN>&gt;
+	       &lt;t:binding.atom/&gt;
+	   &lt;/reference&gt;
+        &lt;/component&gt;
+    
+        .....
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.widget-DefiningreferencesinHTMLresources"></A>Defining references in HTML resources</H3>
+
+<P>The widget implementation introduces SCA annotations to JavaScript code using the syntax below. These references will get properly introspected by the implementation.widget and wired to the proper server side services.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> catalog = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;catalog&quot;</SPAN>);
+
+<SPAN class="code-comment">//@Reference
+</SPAN><SPAN class="code-keyword">var</SPAN> shoppingCart = <SPAN class="code-keyword">new</SPAN> Reference(<SPAN class="code-quote">&quot;shoppingCart&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaimplementation.widget-IncludinggeneratedJavaScriptclientproxy"></A>Including generated JavaScript client proxy</H3>
+
+<P>The client application will need to include a generated JavaScript that will contain the necessary client proxy used to access the server side services. The name of the generated JavaScript is the same as the HTML resource being specified as the implementation artifact.</P>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;!-- one js include per sca component --&gt;
+&lt;script type=<SPAN class="code-quote">&quot;text/javascript&quot;</SPAN> src=<SPAN class="code-quote">&quot;store.js&quot;</SPAN>&gt;&lt;/script&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaimplementation.widget-Supportedbindingtypes"></A>Supported binding types</H3>
+
+<P>Currently, you can define references to remote services using the following bindings :</P>
+<UL>
+	<LI><A href="sca-java-bindingatom.html" title="SCA Java binding.atom">ATOM</A></LI>
+	<LI><A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">JSON-RPC</A></LI>
+	<LI><A href="sca-java-bindinghttp.html" title="SCA Java binding.http">HTTP</A></LI>
+</UL>
+
+
+<H3><A name="SCAJavaimplementation.widget-References"></A>References</H3>
+<P><A href="http://incubator.apache.org/tuscany/getting-started-with-tuscany.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/getting-started-with-tuscany.html</A></P>
+
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-implementationxquery.html b/site/trunk/site-publish/sca-java-implementationxquery.html
new file mode 100644
index 0000000000..43aca27959
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-implementationxquery.html
@@ -0,0 +1,320 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java implementation.xquery</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66257">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java implementation.xquery">SCA Java implementation.xquery</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaimplementation.xquery-%3Cimplementation.xquery%3E"></A>&lt;implementation.xquery&gt;</H3>
+<P>Tuscany provides an implementation type to support XQuery. With this extension, the business logic can be implemented by XQuery scripts. </P>
+
+<H3><A name="SCAJavaimplementation.xquery-TheXMLconfiguration"></A>The XML configuration</H3>
+
+<P>&lt;implementation.xquery&gt; is declared under namespace &quot;http://tuscany.apache.org/xmlns/sca/1.0&quot;. The location attribute specifies the XQuery script. It can be a file or resource name against the current classloader.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;QuoteJoinComponent&quot;</SPAN> xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>        &lt;tuscany:implementation.xquery location=<SPAN class="code-quote">&quot;META-INF/sca/quote_join.xq&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;quoteCalculator&quot;</SPAN> target=<SPAN class="code-quote">&quot;QuoteCalculatorComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaimplementation.xquery-Someexamples"></A>Some examples</H3>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http://quote.xquery/client&quot;</SPAN>
+</SPAN>    xmlns:tuscany=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/1.0&quot;</SPAN> xmlns:xq=<SPAN class="code-quote">&quot;http://quote.xquery/client&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;xqueryquotewsclient&quot;</SPAN>&gt;
+
+    ...
+    &lt;component name=<SPAN class="code-quote">&quot;QuoteJoinComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.xquery location=<SPAN class="code-quote">&quot;META-INF/sca/quote_join.xq&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;quoteCalculator&quot;</SPAN> target=<SPAN class="code-quote">&quot;QuoteCalculatorComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;QuoteJoinPropertiesComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.xquery location=<SPAN class="code-quote">&quot;META-INF/sca/quote_join_properties.xq&quot;</SPAN> /&gt;
+        &lt;!-- Reset the <SPAN class="code-keyword">default</SPAN> namespace as the sub-elements under pri:priceQuote are
+            unqualified --&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;priceQuoteDoc&quot;</SPAN>&gt;
+            &lt;pri:priceQuote xmlns:pri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/price&quot;</SPAN> xmlns=&quot;&quot;&gt;
+</SPAN>                &lt;customerName&gt;Acme Inc&lt;/customerName&gt;
+                &lt;shipAddress street=<SPAN class="code-quote">&quot;12 Springs Rd&quot;</SPAN> city=<SPAN class="code-quote">&quot;Morris Plains&quot;</SPAN> state=<SPAN class="code-quote">&quot;nj&quot;</SPAN> zip=<SPAN class="code-quote">&quot;07960&quot;</SPAN> /&gt;
+                &lt;priceRequests&gt;
+                    &lt;priceRequest&gt;
+                        &lt;widgetId&gt;12&lt;/widgetId&gt;
+                        &lt;price&gt;1.0&lt;/price&gt;
+                    &lt;/priceRequest&gt;
+                    &lt;priceRequest&gt;
+                        &lt;widgetId&gt;134&lt;/widgetId&gt;
+                        &lt;price&gt;34.1&lt;/price&gt;
+                    &lt;/priceRequest&gt;
+                    &lt;priceRequest&gt;
+                        &lt;widgetId&gt;211&lt;/widgetId&gt;
+                        &lt;price&gt;10.0&lt;/price&gt;
+                    &lt;/priceRequest&gt;
+                &lt;/priceRequests&gt;
+            &lt;/pri:priceQuote&gt;
+        &lt;/property&gt;
+        &lt;!-- Reset the <SPAN class="code-keyword">default</SPAN> namespace as the sub-elements under ava:availQuote are
+            unqualified --&gt;
+
+        &lt;property name=<SPAN class="code-quote">&quot;availQuoteDoc&quot;</SPAN>&gt;
+            &lt;ava:availQuote xmlns:ava=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/avail&quot;</SPAN> xmlns=&quot;&quot;&gt;
+</SPAN>                &lt;availRequest&gt;
+                    &lt;widgetId&gt;12&lt;/widgetId&gt;
+                    &lt;requestedQuantity&gt;10&lt;/requestedQuantity&gt;
+                    &lt;quantityAvail&gt;<SPAN class="code-keyword">true</SPAN>&lt;/quantityAvail&gt;
+                    &lt;shipDate&gt;2003-03-22&lt;/shipDate&gt;
+                &lt;/availRequest&gt;
+                &lt;availRequest&gt;
+                    &lt;widgetId&gt;134&lt;/widgetId&gt;
+                    &lt;requestedQuantity&gt;345&lt;/requestedQuantity&gt;
+                    &lt;quantityAvail&gt;<SPAN class="code-keyword">false</SPAN>&lt;/quantityAvail&gt;
+                    &lt;shipDate&gt;BackOrder&lt;/shipDate&gt;
+                &lt;/availRequest&gt;
+                &lt;availRequest&gt;
+                    &lt;widgetId&gt;211&lt;/widgetId&gt;
+                    &lt;requestedQuantity&gt;100&lt;/requestedQuantity&gt;
+                    &lt;quantityAvail&gt;<SPAN class="code-keyword">true</SPAN>&lt;/quantityAvail&gt;
+                    &lt;shipDate&gt;2003-04-21&lt;/shipDate&gt;
+                &lt;/availRequest&gt;
+            &lt;/ava:availQuote&gt;
+        &lt;/property&gt;
+        &lt;property name=<SPAN class="code-quote">&quot;taxRate&quot;</SPAN>&gt;0.1&lt;/property&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;quoteCalculator&quot;</SPAN> target=<SPAN class="code-quote">&quot;QuoteCalculatorComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;QuoteJoinExternalReferencesComponent&quot;</SPAN>&gt;
+        &lt;tuscany:implementation.xquery location=<SPAN class="code-quote">&quot;META-INF/sca/quote_join_external_references.xq&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;quoteCalculator&quot;</SPAN> target=<SPAN class="code-quote">&quot;QuoteCalculatorComponent&quot;</SPAN> /&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;priceQuoteProvider&quot;</SPAN> target=<SPAN class="code-quote">&quot;PriceQuoteProviderComponent&quot;</SPAN> /&gt;
+    &lt;/component&gt;
+    ...
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H4><A name="SCAJavaimplementation.xquery-DecalreSCAservices%2Freferences%2FpropertiesusingXQuerynamespaces"></A>Decalre SCA services/references/properties using XQuery namespaces</H4>
+<P>Please note you can use the following syntax in the XQuery script to declare SCA services, references, and properties.</P>
+
+<UL>
+	<LI>scaservice:java/&lt;java_interface_name&gt;</LI>
+	<LI>scareference:java/&lt;java_interface_name&gt;</LI>
+	<LI>scaproperty:xml/&lt;namespace&gt;:&lt;localName&gt;</LI>
+	<LI>scaproperty:java/&lt;java_class_name&gt;</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+declare namespace quoteJoin=<SPAN class="code-quote">&quot;scaservice:java/xquery.quote.PropertiesQuoteJoin&quot;</SPAN>;
+
+declare namespace quoteCalculator=<SPAN class="code-quote">&quot;scareference:java/xquery.quote.QuoteCalculator&quot;</SPAN>;
+
+declare namespace priceQuoteDoc=<SPAN class="code-quote">&quot;scaproperty:xml/http:<SPAN class="code-comment">//www.example.org/price:priceQuote&quot;</SPAN>;
+</SPAN>declare namespace availQuoteDoc=<SPAN class="code-quote">&quot;scaproperty:xml/http:<SPAN class="code-comment">//www.example.org/avail:availQuote&quot;</SPAN>;
+</SPAN>declare namespace taxRate=<SPAN class="code-quote">&quot;scaproperty:java/java.lang.<SPAN class="code-object">Float</SPAN>&quot;</SPAN>;
+
+declare namespace pri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/price&quot;</SPAN>;
+</SPAN>declare namespace ava=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/avail&quot;</SPAN>;
+</SPAN>declare namespace quo=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/quote&quot;</SPAN>;
+</SPAN>
+declare variable $quoteCalculator external;
+
+declare variable $priceQuoteDoc external;
+declare variable $availQuoteDoc external;
+declare variable $taxRate external;
+
+declare function quoteJoin:joinPriceAndAvailQuotes() {
+&lt;quo:quote&gt;
+    &lt;quo:name&gt;{ data($priceQuoteDoc/pri:priceQuote/customerName) }&lt;/quo:name&gt;
+    &lt;quo:address&gt;{ concat($priceQuoteDoc/pri:priceQuote/shipAddress/@street , <SPAN class="code-quote">&quot;,&quot;</SPAN>, 
+    $priceQuoteDoc/pri:priceQuote/shipAddress/@city ,<SPAN class="code-quote">&quot;,&quot;</SPAN>, 
+    fn:upper-<SPAN class="code-keyword">case</SPAN>($priceQuoteDoc/pri:priceQuote/shipAddress/@state) , <SPAN class="code-quote">&quot;,&quot;</SPAN>, 
+    $priceQuoteDoc/pri:priceQuote/shipAddress/@zip) }&lt;/quo:address&gt;
+    {
+        <SPAN class="code-keyword">for</SPAN> $priceRequest in $priceQuoteDoc/pri:priceQuote/priceRequests/priceRequest,
+            $availRequest in $availQuoteDoc/ava:availQuote/availRequest
+        where data($priceRequest/widgetId) = data($availRequest/widgetId)
+        <SPAN class="code-keyword">return</SPAN>
+            &lt;quo:quoteResponse&gt;
+                &lt;quo:widgetId&gt;{ data($priceRequest/widgetId) }&lt;/quo:widgetId&gt;
+                &lt;quo:unitPrice&gt;{ data($priceRequest/price) }&lt;/quo:unitPrice&gt;
+                &lt;quo:requestedQuantity&gt;{ data($availRequest/requestedQuantity) }&lt;/quo:requestedQuantity&gt;
+                &lt;quo:fillOrder&gt;{ data($availRequest/quantityAvail) }&lt;/quo:fillOrder&gt;
+                {
+                    <SPAN class="code-keyword">for</SPAN> $shipDate in $availRequest/shipDate
+                    <SPAN class="code-keyword">return</SPAN>
+                        &lt;quo:shipDate&gt;{ data($shipDate) }&lt;/quo:shipDate&gt;
+                }
+                &lt;quo:taxRate&gt;{ $taxRate }&lt;/quo:taxRate&gt;
+                &lt;quo:totalCost&gt;{ quoteCalculator:calculateTotalPrice(
+                				  $quoteCalculator,
+                				  
+                				  $taxRate,
+
+                                  $availRequest/requestedQuantity,
+
+                                  $priceRequest/price,
+
+                                  $availRequest/quantityAvail) }&lt;/quo:totalCost&gt;
+            &lt;/quo:quoteResponse&gt;
+    }
+    &lt;/quo:quote&gt;
+};
+
+</PRE>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-incubating-m1.html b/site/trunk/site-publish/sca-java-incubating-m1.html
new file mode 100644
index 0000000000..a641394a1d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-incubating-m1.html
@@ -0,0 +1,163 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Incubating-M1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56446">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Incubating-M1">SCA Java Incubating-M1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The SCA Java Incubating-M1 was released in June 2006.</P>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release is now very old, the latest release can be found <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<P>&nbsp;This release comprises a single package containing SCA, SDO and DAS.</P>
+
+<H3><A name="SCAJavaIncubating-M1-SCAJavaIncubatingM1"></A>SCA Java Incubating-M1</H3>
+<H3><A name="SCAJavaIncubating-M1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M1 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip" class="external-link" rel="nofollow">tuscany-incubating-M1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5" class="external-link" rel="nofollow">MD5 </A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip" class="external-link" rel="nofollow">tuscany-incubating-M1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaIncubating-M1-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-incubator-m2.html b/site/trunk/site-publish/sca-java-incubator-m2.html
new file mode 100644
index 0000000000..2e65c73d8a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-incubator-m2.html
@@ -0,0 +1,232 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Incubator-M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56279">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Incubator-M2">SCA Java Incubator-M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The SCA Java Incubator-M2 was released in Nov 2006.</P>
+
+<H3><A name="SCAJavaIncubator-M2-SCAJavaIncubatorM2"></A>SCA Java Incubator-M2</H3>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Warning</B><BR>This is release is now very old, the latest release can be found <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">here</A></TD></TR></TABLE></DIV>
+
+<H3><A name="SCAJavaIncubator-M2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-bin.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA Samples <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-samples.zip</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-src.zip</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaIncubator-M2-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">tuscany-sca-1.0--incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SCA Samples </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-samples.tar.gz</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-samples.tar.gz.asc" class="external-link" rel="nofollow">PGP </A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP </A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaIncubator-M2-JavaDocsArchive"></A>JavaDocs Archive</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Description </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany M2 SCA Javadocs </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip" class="external-link" rel="nofollow">tuscany-sca-1.0-incubator-M2-javadoc.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-sca-1.0-incubator-M2-javadoc.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany Commonj Specs </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip" class="external-link" rel="nofollow">tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-commonj-1.1-incubator-M2-javadoc.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Tuscany SCA Specs.r.0.95 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip" class="external-link" rel="nofollow">tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip</A> </TD>
+<TD class="confluenceTd"> &nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.0-incubator-M2/tuscany-spec-sca-r0.95-incubator-M2-javadoc.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-interfacewsdl.html b/site/trunk/site-publish/sca-java-interfacewsdl.html
new file mode 100644
index 0000000000..58f4c60e26
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-interfacewsdl.html
@@ -0,0 +1,328 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java interface.wsdl</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108128">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-reference.html" title="SCA Java User Reference">SCA Java User Reference</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java interface.wsdl">SCA Java interface.wsdl</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavainterface.wsdl-%3Cinterface.wsdl%3E"></A>&lt;interface.wsdl&gt;</H3>
+
+<P>The Tuscany Java SCA runtime supports interfaces that are described by Web Services Description Lanuage (WSDL) files. The files contain a description of the service interface, services, references, method requests and responses, and the data types. The implementation of this WSDL interface can be generated with the Java SDK tool <B>wsimport</B>. The <B>wsimport</B> tool generates a skeleton of the service interface, along with all associated request and response classes, and any complex data types passed on the interface. The user can augment the skeleton by putting implementation code in the approproate spot.</P>
+
+<P>The following snippet shows how the WSDL interface and the Java implementation are used in an SCA composite file and publicised as a component.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;OrderServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.example.orderservice.OrderServiceImpl&quot;</SPAN> /&gt;
+	    &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+	        &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/#wsdl.<SPAN class="code-keyword">interface</SPAN>(OrderService)&quot;</SPAN> /&gt;
+</SPAN>	        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/OrderService&quot;</SPAN>/&gt;
+</SPAN>	    &lt;/service&gt;
+    &lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavainterface.wsdl-Examples"></A>Examples</H3>
+
+<P>This example shows a component with its interface described via WSDL. The web service binding defaults are used so the endpoint of the Web service will be <A href="http://localhost:8085/OrderService" class="external-link" rel="nofollow">http://localhost:8085/OrderService</A>. (Note that this full sample is available in Tuscany 1.x branch under the samples/holder-ws-service sample).</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>
+</SPAN>	targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//orderservice&quot;</SPAN>
+</SPAN>	xmlns:hw=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//orderservice&quot;</SPAN>
+</SPAN>    name=<SPAN class="code-quote">&quot;orderws&quot;</SPAN>&gt;
+
+    &lt;component name=<SPAN class="code-quote">&quot;OrderServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;org.example.orderservice.OrderServiceImpl&quot;</SPAN> /&gt;
+	    &lt;service name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+	        &lt;<SPAN class="code-keyword">interface</SPAN>.wsdl <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/#wsdl.<SPAN class="code-keyword">interface</SPAN>(OrderService)&quot;</SPAN> /&gt;
+</SPAN>	        &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8085/OrderService&quot;</SPAN>/&gt;
+</SPAN>	    &lt;/service&gt;
+    &lt;/component&gt;
+
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>WSDL files can be generated with many tools and development environment plugins. This snippet shows a portion of the WSDL file that describes the business service data types and the assoicated method calls and responses:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;wsdl:portType name=<SPAN class="code-quote">&quot;OrderService&quot;</SPAN>&gt;
+        &lt;wsdl:operation name=<SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>&gt;
+            &lt;wsdl:input message=<SPAN class="code-quote">&quot;tns:reviewOrderRequest&quot;</SPAN>/&gt;
+            &lt;wsdl:output message=<SPAN class="code-quote">&quot;tns:reviewOrderResponse&quot;</SPAN>/&gt;
+        &lt;/wsdl:operation&gt;
+    &lt;/wsdl:portType&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;reviewOrderRequest&quot;</SPAN>&gt;
+        &lt;wsdl:part element=<SPAN class="code-quote">&quot;tns:reviewOrder&quot;</SPAN> name=<SPAN class="code-quote">&quot;myParameters&quot;</SPAN>/&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>&gt;
+        &lt;wsdl:part element=<SPAN class="code-quote">&quot;tns:reviewOrderResponse&quot;</SPAN> name=<SPAN class="code-quote">&quot;myResult&quot;</SPAN>/&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:types&gt;
+        &lt;xsd:schema targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>&gt;
+</SPAN>            &lt;xsd:complexType name=<SPAN class="code-quote">&quot;order&quot;</SPAN>&gt;
+                &lt;xsd:sequence&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;customerId&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>    minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;status&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:status&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;0&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;total&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">double</SPAN>&quot;</SPAN> /&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;orderId&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">int</SPAN>&quot;</SPAN> /&gt;
+                &lt;/xsd:sequence&gt;
+            &lt;/xsd:complexType&gt;
+
+            &lt;xsd:simpleType name=<SPAN class="code-quote">&quot;status&quot;</SPAN>&gt;
+                &lt;xsd:restriction base=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Created&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Submitted&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Approved&quot;</SPAN> /&gt;
+                    &lt;xsd:enumeration value=<SPAN class="code-quote">&quot;Rejected&quot;</SPAN> /&gt;
+                &lt;/xsd:restriction&gt;
+            &lt;/xsd:simpleType&gt;
+
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:order&quot;</SPAN>
+                            minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> /&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:order&quot;</SPAN>
+                            minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> /&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+
+        &lt;/xsd:schema&gt;
+    &lt;/wsdl:types&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The Java implementation for this web service can be generated with the Java SDK tool <B>wsimport</B>. Full documentation is in the Java SDK JavaDocs, but basically one specifies the source WSDL and the output directory for generated files.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    wsimport -d orderservice -keep orderservice.wsdl
+</PRE>
+</DIV></DIV>
+
+<P>The generated implementation files can be augmented with code that operates on provided business objects.</P>
+
+<H3><A name="SCAJavainterface.wsdl-WebServicesHolderPattern"></A>Web Services Holder Pattern</H3>
+
+<P>A pattern known as the Web Services Holder Pattern is supported by Tuscany in the 1.5 and later releases. WSDL files support a parameter mode known as INOUT. The INOUT mode is used for service interface parameters that are passed into a business interface and returned<BR>
+on the same interface.</P>
+
+<P>The advantages of the INOUT mode are:</P>
+<UL>
+	<LI>supports a well known pattern of parameter pass by reference. Normally SCA parameters are always passed by value.</LI>
+	<LI>saves instantiation and initialization for large or complex objects.</LI>
+	<LI>simplifies the signature of business interfaces</LI>
+	<LI>saves the user the cost of boxing and returning multiple return objects.</LI>
+</UL>
+
+
+<P>The Holder pattern is created by the Java SDK wsimport tool whenever data type is both input and output to a given operation&gt;</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+      &lt;xsd:element name=<SPAN class="code-quote">&quot;myOperation&quot;</SPAN>&gt;
+        &lt;xsd:complexType&gt;
+          &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:myDataType&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN>/&gt;
+          &lt;/xsd:sequence&gt;
+        &lt;/xsd:complexType&gt;
+      &lt;/xsd:element&gt;
+      &lt;xsd:element name=<SPAN class="code-quote">&quot;myOperationResponse&quot;</SPAN>&gt;
+        &lt;xsd:complexType&gt;
+          &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;myData&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:myDataType&quot;</SPAN> minOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN> maxOccurs=<SPAN class="code-quote">&quot;1&quot;</SPAN>/&gt;
+          &lt;/xsd:sequence&gt;
+        &lt;/xsd:complexType&gt;
+      &lt;/xsd:element&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The generated implemenation code contains annotations that mark the parameter data as an input output parameter. Also notice that the business object Order is passed in as a data type javax.xml.ws.Holder&lt;Order&gt;. This Holder class allows the input object to be returned as an output object, i.e. pass by reference.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    @WebMethod(action = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/reviewOrder&quot;</SPAN>)
+</SPAN>    @RequestWrapper(localName = <SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrder&quot;</SPAN>)
+</SPAN>    @ResponseWrapper(localName = <SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrderResponse&quot;</SPAN>)
+</SPAN>    <SPAN class="code-keyword">public</SPAN> void reviewOrder(
+        @WebParam(name = <SPAN class="code-quote">&quot;myData&quot;</SPAN>, targetNamespace = &quot;&quot;, mode = WebParam.Mode.INOUT)
+        javax.xml.ws.Holder&lt;Order&gt; myData);
+</PRE>
+</DIV></DIV>
+
+<P>The Java implemenation code can access the wrapped Holder object, perform updates on the object, and leave it in place to return the object as shown here with the Java object Order :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    @WebMethod(action = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/reviewOrder&quot;</SPAN>)
+</SPAN>    @RequestWrapper(localName = <SPAN class="code-quote">&quot;reviewOrder&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrder&quot;</SPAN>)
+</SPAN>    @ResponseWrapper(localName = <SPAN class="code-quote">&quot;reviewOrderResponse&quot;</SPAN>, targetNamespace = <SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/OrderService/&quot;</SPAN>, className = <SPAN class="code-quote">&quot;org.example.orderservice.ReviewOrderResponse&quot;</SPAN>)
+</SPAN>    <SPAN class="code-keyword">public</SPAN> void reviewOrder(
+        @WebParam(name = <SPAN class="code-quote">&quot;myData&quot;</SPAN>, targetNamespace = &quot;&quot;, mode = WebParam.Mode.INOUT)
+        Holder&lt;Order&gt; myData) {
+        Order order = myData.value;
+        <SPAN class="code-object">double</SPAN> total = order.getTotal();
+        <SPAN class="code-keyword">if</SPAN> ( total &lt; 100.0 ) {
+            order.setStatus( Status.APPROVED );
+        }
+    }
+</PRE>
+</DIV></DIV>
+
+<P>Tuscany, as of version 1.5 supports this input/output Holder pattern. At this point there is a limitation of only one in/out parameter, and this is only supported on methods with void return types.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-modules-dependencies.html b/site/trunk/site-publish/sca-java-modules-dependencies.html
new file mode 100644
index 0000000000..28b333e182
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-modules-dependencies.html
@@ -0,0 +1,294 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Modules Dependencies</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=96772">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Modules Dependencies">SCA Java Modules Dependencies</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> This page is under construction. </P>
+
+<H1><A name="SCAJavaModulesDependencies-Whatthisisabout"></A>What this is about</H1>
+<P>This page can be used by those who would like to pick and choose pieces of Tuscany and embed it with their software. It outlines dependencies and identifies the minimum set of modules required to use Tuscany.</P>
+
+<H1><A name="SCAJavaModulesDependencies-CurrentTuscanyPackagingState"></A>Current Tuscany Packaging State</H1>
+<P>As of release 1.3 Tuscany is distributed via one binary distribution that includes everything. Based on user feedback, choice of a smaller distribution packages is desireable. Tuscany community is in the process of addressing this requirement. Please see discussions on the mailing list and contribute if interested. </P>
+
+<H1><A name="SCAJavaModulesDependencies-Howtobuildyourowndistribution"></A>How to build your own distribution</H1>
+
+<P>Let's use the term &quot;feature&quot; to refer to a package. This is also used in Eclipse and many people are familiar with it. </P>
+
+<P>A Tuscany user has defined a set of features applicable to his application at <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/" class="external-link" rel="nofollow">this location</A>. Although these features can be addressing majority of lower granular packages that users may need (we would like to hear your opinion), we realize that there will always be a need for smaller features or a combination of features.  let's use the real examples that are available in the source code for the purpose of this discussion and first explain what is available as an example and then describe how you can create your own distribution.</P>
+
+<P>Here are the available <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/" class="external-link" rel="nofollow">feature types </A> at the moment:</P>
+<UL>
+	<LI><B>all feature</B> - includes everything</LI>
+	<LI><B>core feature</B> -  <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/core/pom.xml" class="external-link" rel="nofollow">pom.xml</A><BR>
+This package includes support for building applications based on Java components and also exposes SPIs for extending Tuscany SCA to include extensions such as binding types, implementation types, policies. <BR>
+<B>This is the minimum required to use Tuscany.</B>
+	<UL>
+		<LI>Included in this feature:<BR>
+1. Core runtime includes OSGI support<BR>
+2. Launchers <BR>
+   2a) j2Se<BR>
+   2b) equinox<BR>
+   2c) Webapp<BR>
+3. Bindings: <BR>
+   2a) SCA default binding<BR>
+   2b) corba  (as a light weight binding that you can use with the core distro<BR>
+4. Data Bindings: Jaxb<BR>
+5. Interfaces<BR>
+   4a) Java<BR>
+   4b) Wsdl</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>ejava feature</B> - <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/ejava/pom.xml" class="external-link" rel="nofollow">pom.xml</A><BR>
+This package is needed for enterprise Java development.
+	<UL>
+		<LI>Included in this feature:<BR>
+1. Core runtime: core package<BR>
+2. EJB suport: hosting ejb<BR>
+3. Spring<BR>
+4. Support for scripting languages <BR>
+<EM>In addition to what is included in Core:</EM><BR>
+5. Bindings: ejb binding, JMS binding<BR>
+6. Databindings: Axiom</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<UL>
+	<LI><B>manager feature</B> -<BR>
+This package includes features that can be used to manage SCA applications. For example, domain manager is in this.
+	<UL>
+		<LI>Included in this package:<BR>
+Domain Manager which manages SCA applications</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>process feature</B> - <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/process/pom.xml" class="external-link" rel="nofollow">pom.xml</A><BR>
+This package enables you to use BPEL components in a composition using Ode. 
+	<UL>
+		<LI>Included in this feature:<BR>
+1. Core Runtime: Core feature<BR>
+2. BPEL support; implementation.bpel<BR>
+3. XQuery support: implementaiton.zquery<BR>
+<EM>In addition to what is included in core feature:</EM><BR>
+4. Bindings: Corba<BR>
+5. Databindings: SDO, Saxon</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>web20 feature</B> - <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/web20/pom.xml" class="external-link" rel="nofollow">pom.xml</A><BR>
+This package enables you to use web20 with Tuscany.
+	<UL>
+		<LI>Included in this feature:<BR>
+1. Core Runtime: Core feature<BR>
+2. Support for resources and widgets<BR>
+<EM>In addition to what is included in core feature:</EM><BR>
+3. Bindings; Atom (via Abdrea), Jason, RSS (via Rome), HTTP,  <BR>
+4. Databindings: JSON</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI><B>webservice feature</B> - <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/distribution/features/webservice/pom.xml" class="external-link" rel="nofollow">pom.xml</A><BR>
+This package provides support for webservices binding based on Axis2. 
+	<UL>
+		<LI>Included in this feature:<BR>
+1. Core Runtime: Core feature<BR>
+2. support for webservices<BR>
+<EM>In addition to what is included in core feature:</EM><BR>
+3. Bindings; ws, ws-axi2, ws-wsdlgen, ws-xml<BR>
+4. Databindings: Jaxb-axiom, SDO, SDO-axiom</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>You will also notice the following under features:</P>
+<UL>
+	<LI><B>repository</B> -<BR>
+This package is a special feature that builds a Maven repository that you can use to mirror Tuscany. This can be useful for enterprises that build on top of Tuscany, or use Tuscany in their apps, but don't want to be broken any time the public Maven repos going down </LI>
+</UL>
+
+
+
+<H2><A name="SCAJavaModulesDependencies-MinimumRequired"></A>Minimum Required</H2>
+<P>Core feature set is the minimum that is required to be able to develop SCA applications using Java components. </P>
+
+<H2><A name="SCAJavaModulesDependencies-Howtobuildmyowndistribution%3F"></A>How to build my own distribution?</H2>
+
+<P>You can use the above features as examples to define what you need. For example, if you want to develop enterprise applications using webservices, you would need the following features: ejb feature (which includes core) and webservices feature. Alternatively you can find the dependencies amongst modules and create your own distribution.</P>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=to%20do&linkCreation=true&fromPageId=96772" class="createlink">to do</A>: Steps to build distributin?</P>
+
+<H2><A name="SCAJavaModulesDependencies-Understandingdependencies"></A>Understanding dependencies</H2>
+
+<P>To understand module dependencies, you can start with a particular feature and run one of the following commands.  </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+go to the feature directory and issue the command:
+
+mvn:site 
+
+This will create a file called dependencies.html that shows dependencies amongst modules that create <SPAN class="code-keyword">this</SPAN> feature.
+</PRE>
+</DIV></DIV>
+
+<P>or for the text version of the dependencies you can use the following command</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"> mvn dependency:tree </PRE>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-news-page.html b/site/trunk/site-publish/sca-java-news-page.html
new file mode 100644
index 0000000000..b6adf78fae
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-news-page.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java News Page</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63553">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java News Page">SCA Java News Page</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="50%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>SCA Java News</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><B>Community is working on the following topics on dev list</B>: BPEL integration with Ode (partially there), OSGI, distribution, Policy Framework, XQuery implementation component, Geronimo/Tuscany integration and tests to enhance Tuscany. A new thread on management was started by Mike Edwards... Get involved where you like.</LI>
+	<LI>*Would be great to update the user doc with new runtimes that you have tried. Simply go the user doc and add more sections. Thanks.
+	<UL>
+		<LI>First phase of Geronimo integeration is complete. See this <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg22495.html" class="external-link" rel="nofollow">thread</A>. There is much more to be done if interested.</LI>
+		<LI>XQuery implementation is now in SVN. More discussions are happening around use cases on the mailing list. There is more work to be done if interested to help.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>SCA Native News</B></DIV></DIV>
+<UL>
+	<LI><B>Next SCA Native release</B> is being discussed on the dev list. Help define the <A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/SCA%20Native%20Next%20Release%20Contents" class="external-link" rel="nofollow">content</A>and develop it.</LI>
+</UL>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="50%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Users Sharing News</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><EM>Please share information that you think will benefit other users or the project. link the information to this page.</EM></LI>
+</UL>
+
+
+<UL>
+	<LI>This book is getting good reviews: <A href="http://www.mc-store.com/5079.html" class="external-link" rel="nofollow">SOA for the Business Developer Concepts, BPEL, and SCA</A></LI>
+</UL>
+
+
+<UL>
+	<LI>A series of vendor neutral briefings on SCA/SDO are being held in various countrie. You can find more information <A href="http://www.ibm.com/developerworks/offers/techbriefings/details/scasdo.html" class="external-link" rel="nofollow">here</A>. Tuscany will be used to demo.</LI>
+</UL>
+
+
+<UL>
+	<LI>Short article on Tuscany at <A href="http://www.infoq.com/news/2007/09/tuscany-099" class="external-link" rel="nofollow">infoq</A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-next-release.html b/site/trunk/site-publish/sca-java-next-release.html
new file mode 100644
index 0000000000..a2d2075fac
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-next-release.html
@@ -0,0 +1,317 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Next Release</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54260">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Next Release">SCA Java Next Release</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>These are the items that have been worked on since Tuscany SCA Java was last released. If we record things that have been done as we check things into SVN there there are two big advantages.</P>
+<OL>
+	<LI>Its a lot easier to write the release notes</LI>
+	<LI>People can take a look to see what is likely to be in the next release</LI>
+</OL>
+
+
+<P>The next release is targeted for mid May 2007. The theme is stability and consumability for the runtime core functions. Since the M2 release we have added. </P>
+
+<H2><A name="SCAJavaNextRelease-General"></A>General </H2>
+<UL class="alternate" type="square">
+	<LI>A clear set of SPIs which we can keep stable over future releases
+	<UL class="alternate" type="square">
+		<LI>List???</LI>
+	</UL>
+	</LI>
+	<LI>Refactored extensions to use new SPIs (see below)</LI>
+	<LI>Extensions now loaded via Java service mechanism</LI>
+	<LI>Improved Package/Class naming consistency across modules</LI>
+	<LI>Tidied Package dependencies</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-Assembly%28Model%29"></A>Assembly(Model)</H2>
+<UL class="alternate" type="square">
+	<LI>New assembly model implementation taking into account SCA 1.0 artifacts</LI>
+	<LI>Data duplication between assembly model and runtime reduced</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-ImplementationExtensions"></A>Implementation Extensions</H2>
+<UL class="alternate" type="square">
+	<LI>Java</LI>
+	<LI>Script
+	<UL class="alternate" type="square">
+		<LI>Ruby</LI>
+		<LI>Python</LI>
+		<LI>Groovy</LI>
+		<LI>JavaScript</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-BindingExtensions"></A>Binding Extensions</H2>
+<UL class="alternate" type="square">
+	<LI>Axis2</LI>
+	<LI>RMI</LI>
+	<LI>JSONRPC</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-DatabindingExtensions"></A>Databinding Extensions</H2>
+<UL class="alternate" type="square">
+	<LI>Axiom</LI>
+	<LI>JAXB</LI>
+	<LI>SDO</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-Hosting"></A>Hosting</H2>
+<UL class="alternate" type="square">
+	<LI>Embedded</LI>
+	<LI>Tomcat</LI>
+	<LI>Jetty</LI>
+	<LI>RMI</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-DomainandContribution"></A>Domain and Contribution</H2>
+<UL class="alternate" type="square">
+	<LI>Simple single process domain support</LI>
+	<LI>Contributions support to scope items being deployed the runtime
+	<UL class="alternate" type="square">
+		<LI>Contribution service to remove the need of import.sdo (rfeng) - Is this now true?</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-Samples"></A>Samples</H2>
+<UL class="alternate" type="square">
+	<LI>A variety of samples testing most implementation and binding extensions
+	<UL class="alternate" type="square">
+		<LI>See /sca/samples</LI>
+	</UL>
+	</LI>
+	<LI>Maven and Ant base sample builds in the binary distribution</LI>
+</UL>
+
+
+<H2><A name="SCAJavaNextRelease-JavaAnnotationsandAPIsSpecCoverage"></A>Java Annotations and APIs Spec Coverage</H2>
+
+<H3><A name="SCAJavaNextRelease-Annotations"></A>Annotations</H3>
+
+<P>@AllowsPassByReference<BR>
+  Interface<BR>
+  Class<BR>
+  Method<BR>
+@Callback<BR>
+  Interface<BR>
+  Class<BR>
+  Method<BR>
+  Field<BR>
+@ComponentName<BR>
+  Method <BR>
+  Field<BR>
+@Conversation<BR>
+  Interface<BR>
+  Class<BR>
+@Constructor<BR>
+  Constructor<BR>
+@Context<BR>
+  Field<BR>
+  Setter<BR>
+@Conversational<BR>
+  Interface <BR>
+  Class  <BR>
+@Destroy<BR>
+  Method<BR>
+@EagerInit<BR>
+  Interface<BR>
+  Class<BR>
+@EndsConversation<BR>
+  Method<BR>
+@Init<BR>
+  Method<BR>
+@OneWay<BR>
+  Method<BR>
+@Property<BR>
+  Field<BR>
+  Method<BR>
+@Reference <BR>
+  Field<BR>
+  Setter<BR>
+  Constructor<BR>
+@Remotable<BR>
+  Interface<BR>
+  Class<BR>
+@Scope<BR>
+  Interface<BR>
+  Class<BR>
+    STATELESS<BR>
+    REQUEST<BR>
+    CONVERSATION<BR>
+    COMPOSITE<BR>
+@Service<BR>
+  Interface<BR>
+  Class<BR>
+@ConversationAttributes<BR>
+  Interface<BR>
+  Class<BR>
+@ConversationID<BR>
+  Field<BR>
+  Setter</P>
+
+
+<H3><A name="SCAJavaNextRelease-API"></A>API</H3>
+
+<P>CallableReference&lt;B&gt;<BR>
+  B getService();<BR>
+  Class&lt;B&gt; getBusinessInterface();<BR>
+  boolean isConversational();<BR>
+  Conversation getConversation();<BR>
+  Object getCallbackID();</P>
+
+<P>ComponentContext <BR>
+  String getURI();<BR>
+  &lt;B&gt; B getService(Class&lt;B&gt; businessInterface, String referenceName);<BR>
+  &lt;B&gt; ServiceReference&lt;B&gt; getServiceReference(Class&lt;B&gt; businessInterface, String referenceName);<BR>
+  &lt;B&gt; ServiceReference&lt;B&gt; createSelfReference(Class&lt;B&gt; businessInterface);<BR>
+  &lt;B&gt; ServiceReference&lt;B&gt; createSelfReference(Class&lt;B&gt; businessInterface,String serviceName);<BR>
+  &lt;B&gt; B getProperty(Class&lt;B&gt; type, String propertyName);<BR>
+  &lt;B, R extends CallableReference&lt;B&gt;&gt; R cast(B target) throws IllegalArgumentException;<BR>
+  RequestContext getRequestContext();<BR>
+  &lt;B&gt; ServiceReference&lt;B&gt; cast(B target) throws IllegalArgumentException;</P>
+
+<P>Conversation<BR>
+  Object getConversionID();<BR>
+  void end();</P>
+
+<P>ConversationEndedException</P>
+
+<P>NoRegsiteredCallbackException</P>
+
+<P>RequestContext<BR>
+  Subject getSecuritySubject();<BR>
+  String getServiceName();<BR>
+  CallbackReference&lt;CB&gt; getCallbackReference();<BR>
+  CB getCallback();<BR>
+ &lt;B&gt; CallableReference&lt;B&gt; getServiceReference();</P>
+
+<P>ServiceReference&lt;B&gt;<BR>
+  Object getConversationID();<BR>
+  void setConversationID(Object conversationId) throws IllegalStateException;<BR>
+  void setCallbackID(Object callbackID);<BR>
+  Object getCallback();<BR>
+  void setCallback(Object callback);</P>
+
+<P>ServiceRuntimeException</P>
+
+<P>ServiceUnavailableException</P>
+
+
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-previous-releases.html b/site/trunk/site-publish/sca-java-previous-releases.html
new file mode 100644
index 0000000000..24bb45c216
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-previous-releases.html
@@ -0,0 +1,173 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=110549">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Previous Releases">SCA Java Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Release Name <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-161.html" title="SCA Java 1.6.1"><B>SCA Java 1.6.1</B> <EM>(November 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-16.html" title="SCA Java 1.6"><B>SCA Java 1.6</B> <EM>(February, 2010)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-151.html" title="SCA Java 1.5.1"><B>SCA Java 1.5.1</B> <EM>(October, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-15.html" title="SCA Java 1.5"><B>SCA Java 1.5</B> <EM>(May, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-14.html" title="SCA Java 1.4"><B>SCA Java 1.4</B> <EM>(January, 2009)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-132.html" title="SCA Java 1.3.2"><B>SCA Java 1.3.2</B> <EM>(October, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-131.html" title="SCA Java 1.3.1"><B>SCA Java 1.3.1</B> <EM>(August, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-13.html" title="SCA Java 1.3"><B>SCA Java 1.3</B> <EM>(August, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-121-incubating.html" title="SCA Java 1.2.1-incubating"><B>SCA Java 1.2.1-incubating</B> <EM>(June, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-12-incubating.html" title="SCA Java 1.2-incubating"><B>SCA Java 1.2-incubating</B> <EM>(April, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-11-incubating.html" title="SCA Java 1.1-incubating"><B>SCA Java 1.1-incubating</B> <EM>(January, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-101-incubating.html" title="SCA Java 1.0.1-incubating"><B>SCA Java 1.0.1-incubating</B> <EM>(November, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-10-incubating.html" title="SCA JAVA 1.0-incubating"><B>SCA Java 1.0-incubating</B> <EM>(September, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-099-incubating.html" title="SCA Java 0.99-incubating"><B>SCA Java 0.99-incubating</B> <EM>(August, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-091-incubating.html" title="SCA Java 0.91-incubating"><B>SCA Java 0.91-incubating</B> <EM>(July, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-090-incubating.html" title="SCA Java 0.90-incubating"><B>SCA Java 0.90-incubating</B> <EM>(June, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-incubator-m2.html" title="SCA Java Incubator-M2"><B>SCA Java Incubator-M2</B> <EM>(November, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="sca-java-incubating-m1.html" title="SCA Java Incubating-M1"><B>SCA Java Incubating-M1</B> <EM>(June, 2006)</EM></A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-releases.data/getting-started-1.0.pdf b/site/trunk/site-publish/sca-java-releases.data/getting-started-1.0.pdf
new file mode 100644
index 0000000000..950e4b12cd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-releases.data/getting-started-1.0.pdf
diff --git a/site/trunk/site-publish/sca-java-releases.data/getting_started_06.pdf b/site/trunk/site-publish/sca-java-releases.data/getting_started_06.pdf
new file mode 100644
index 0000000000..f1d93a0034
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-releases.data/getting_started_06.pdf
diff --git a/site/trunk/site-publish/sca-java-releases.data/onlineStore.pdf b/site/trunk/site-publish/sca-java-releases.data/onlineStore.pdf
new file mode 100644
index 0000000000..f1d93a0034
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-releases.data/onlineStore.pdf
diff --git a/site/trunk/site-publish/sca-java-releases.html b/site/trunk/site-publish/sca-java-releases.html
new file mode 100644
index 0000000000..7337242ed0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-releases.html
@@ -0,0 +1,209 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55774">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Releases">SCA Java Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJavaReleases-TuscanySCAJavaReleaseDownloadsandDocumentation%28Stablereleases%29"></A>Tuscany SCA Java Release Downloads and Documentation (Stable releases)</H2>
+
+<P>There are currently two code streams, 1.x which is based on the original SCA specifications first published at <A href="http://www.osoa.org/display/Main/Home" class="external-link" rel="nofollow">OSOA</A>, and 2.x which is based on the latest SCA specifications being developed at <A href="http://www.oasis-opencsa.org/" class="external-link" rel="nofollow">OASIS</A> </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Project Release Download </TH>
+<TH class="confluenceTh"> Documentation </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.x</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Infrastructure implemented in Java for developing/running SCA applications</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases"><B>SCA Java Travel Sample 1.x</B></A></B> </TD>
+<TD class="confluenceTd"> See README file </TD>
+<TD class="confluenceTd"> Sample SCA Java application for Tuscany SCA Java 1.x</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.x</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="../TUSCANYxDOCx2x/index.html" title="Index">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Infrastructure implemented in Java for developing/running SCA applications</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<H2><A name="SCAJavaReleases-TuscanyNightlyBuildDownloads%28Builtagainsttrunk%2Clatestcode%29"></A>Tuscany Nightly Build Downloads (Built against trunk, latest code)</H2>
+
+<P>These nightly builds are listed here as an aid for Tuscany developers testing the latest code, they ARE NOT INTENDED FOR USE BY USERS. If you need a recent change thats not yet available in an official release then please do pester us to do a release. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Nightly Build Download </TH>
+<TH class="confluenceTh"> Build Status Log </TH>
+<TH class="confluenceTh"> Win32 bin </TH>
+<TH class="confluenceTh"> Win32 src </TH>
+<TH class="confluenceTh"> Linux bin </TH>
+<TH class="confluenceTh"> Linux src </TH>
+<TH class="confluenceTh"> Tomcat WAR </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SCA Java 2.x</B> </TD>
+<TD class="confluenceTd"> <A href="https://hudson.apache.org/hudson/job/Tuscany-2x-deploy/lastBuild/" class="external-link" rel="nofollow">Status Log</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT.zip" class="external-link" rel="nofollow">Win32 bin</A></TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT-src.zip" class="external-link" rel="nofollow">Win32 src</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT.tar.gz" class="external-link" rel="nofollow">Linux bin</A></TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT-src.gz" class="external-link" rel="nofollow">Linux src</A> </TD>
+<TD class="confluenceTd"> <A href="http://hudson.zones.apache.org/hudson/job/Tuscany-2x/lastSuccessfulBuild/org.apache.tuscany.sca$tuscany-war/artifact/org.apache.tuscany.sca/tuscany-war/2.0-SNAPSHOT/tuscany.war" class="external-link" rel="nofollow">tuscany.war</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="SCAJavaReleases-Documentation"></A>Documentation</H2>
+
+<P><A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A><BR>
+<A href="tuscany-cwiki-website-structure.html" title="Tuscany cwiki & Website Structure">Tuscany cwiki &amp; Website Structure</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-roadmap.html b/site/trunk/site-publish/sca-java-roadmap.html
new file mode 100644
index 0000000000..0108ef997f
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-roadmap.html
@@ -0,0 +1,266 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Roadmap</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=89958">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Roadmap">SCA Java Roadmap</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJavaRoadmap-Web2.0Roadmap"></A>Web 2.0 Roadmap</H2>
+
+<H3><A name="SCAJavaRoadmap-JSONRPC"></A>JSON-RPC</H3>
+
+<P><B>Scenarios:</B></P>
+<UL>
+	<LI>A client application invoke a SCA Service using JSON-RPC and the invocation returns a business exception. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g Empty catalog throws a Busines Exception. Business Exception should properly propagate and display nicely to client.</LI>
+	</UL>
+	</LI>
+	<LI>A client application invoke a SCA Service using JSON-RPC and the invocation returns a runtime exception. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+	<UL>
+		<LI>e.g Try to retrieve catalog items from a catalog service that is un-available. Runtime exception properly propagate and display nicely to client.</LI>
+	</UL>
+	</LI>
+	<LI>A client application needs to access a service exposed trough JSON-RPC binding that requires authentication.
+	<UL>
+		<LI>e.g make sure if nobody can get to the catalog if it's not authenticated</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P><B>Features/JIRAS</B></P>
+
+<UL>
+	<LI>Exceptions not properly reported to client by JSONRPC binding (TUSCANY-1961) <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Support for security (this will require exploratory work to understand what SCA security policies make sense to implement) (TUSCANY-2394 )</LI>
+	<LI>Business Exception reporting, business exceptions raised by a service should be transported to the client through JSON and reported to the client as proper JavaScript business exceptions (TUSCANY-2394 ) <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Better runtime exception reporting, runtime exceptions occurring as part of a JSON-RPC interaction should be properly reported to the JavaScript client. (TUSCANY-2394) <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Complete data binding support, a set of test cases should be written to make sure that the POJO and JAXB patterns supported in Java components have a proper mapping to JSON and that the application developer can easily understand the corresponding representation of these objects in JavaScript. (TUSCANY-2394) <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Build some samples that consume publicly available JSON services (e.g from programmableweb, or yahoo)</LI>
+</UL>
+
+
+
+<H3><A name="SCAJavaRoadmap-ATOM"></A>ATOM</H3>
+
+<P><B>Scenarios</B></P>
+
+<P><B>Features/JIRAS</B></P>
+
+<UL>
+	<LI>Complete support for ATOM API
+	<UL>
+		<LI>Analyze specification gaps</LI>
+		<LI>Complete support for location header</LI>
+		<LI>Full support for lastmodified in HTTP headers and etags <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0">
+		<UL>
+			<LI>needs to involve application logic, to properly find the lastmodified data...</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>Support for postMedia and putMedia, including the ability to stream that content in the target application component</LI>
+	<LI>Support for security (this will require exploratory work to understand what SCA security policies make sense to implement)
+	<UL>
+		<LI>Provide security support for verb actions (e.g. delete)</LI>
+		<LI>ATOM pub users often need to login.  Google GDATA supports SSO</LI>
+		<LI>Provide support for Authentication|Encryption|Signatures ???</LI>
+	</UL>
+	</LI>
+	<LI>Enhanced error reporting, mapping errors like resource not found to HTTP 404. Other errors might be mapped to HTTP 500 with proper exception in the message body. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Ability to negotiate content types (XML, JSON etc) and use the corresponding Tuscany data bindings to provide data with the requested content type <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Enhance performance on low-bandwidth by providing gZipped contents enabled by http headers</LI>
+	<LI>Improve the client side programming model by researching available JavaScript Atom API or investigate creating one.<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"></LI>
+	<LI>Integrate Atom binding with persistence repository (e.g database and implementation.data.xml)
+	<UL>
+		<LI>investigate how to handle relationships (e.g When you have a customer that owns multiple accounts, you can define HREF to a account feed, but how do you handle that sub-set of accounts that the customer owns.)</LI>
+	</UL>
+	</LI>
+	<LI>ATOM workspace support</LI>
+</UL>
+
+
+<P><B>References:</B></P>
+<UL>
+	<LI>Atom publish protocol : <A href="http://tools.ietf.org/html/rfc5023" class="external-link" rel="nofollow">http://tools.ietf.org/html/rfc5023</A></LI>
+	<LI>Atom syndcation protocol : <A href="http://tools.ietf.org/html/rfc4287" class="external-link" rel="nofollow">http://tools.ietf.org/html/rfc4287</A></LI>
+</UL>
+
+
+<H3><A name="SCAJavaRoadmap-Widget"></A>Widget</H3>
+
+<P><B>Scenarios</B></P>
+
+<P><B>Features/JIRAS</B></P>
+
+<UL>
+	<LI>Support references wiring to services from multiple hosts/ports (cross domain support using on demand js pattern)</LI>
+	<LI>Add support for other bindings (e.g DWR)</LI>
+	<LI>Support widget implementation over web-app</LI>
+</UL>
+
+
+<UL>
+	<LI>
+	<UL>
+		<LI>Discuss possible deprecation of scaDomain.js</LI>
+	</UL>
+	</LI>
+	<LI>Enable support for google widgets (using shindig)</LI>
+	<LI>Upgrade to latest open ajax (tutorial)</LI>
+</UL>
+
+
+
+<H2><A name="SCAJavaRoadmap-Sample%2CScenariosandTutorial"></A>Sample, Scenarios and Tutorial</H2>
+
+<UL>
+	<LI>Integrate implementation-data-xml to provide data feeds.
+	<UL>
+		<LI>Use store tutorial to drive this item</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>PhotoGallery scenario ?</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-sandbox.html b/site/trunk/site-publish/sca-java-sandbox.html
new file mode 100644
index 0000000000..6cb7cf7346
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-sandbox.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Sandbox : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43903">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Sandbox">SCA Java Sandbox</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-subproject-menu.html b/site/trunk/site-publish/sca-java-subproject-menu.html
new file mode 100644
index 0000000000..fd68dc47d3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-subproject-menu.html
@@ -0,0 +1,139 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55873">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Subproject Menu">SCA Java Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg b/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg
new file mode 100644
index 0000000000..2c7a85b0c2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg
diff --git a/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg.jpeg b/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg.jpeg
new file mode 100644
index 0000000000..bf56a9fcb0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-subproject.data/tuscanylogo.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-subproject.html b/site/trunk/site-publish/sca-java-subproject.html
new file mode 100644
index 0000000000..292fa3f0b7
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-subproject.html
@@ -0,0 +1,130 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Subproject : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47529">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Subproject">SCA Java Subproject</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="" title="SCA Java Subproject">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SCAJavaSubproject-TuscanySCAJava"></A>Tuscany SCA Java</H1>
+
+<P>Tuscany Java SCA provides the infrastructure to develop and run SCA based applications. At the very high level, Java SCA can be divided into core and extensions. The core supports the SCA assembly model, Tuscany value-add features and simple extension point to add extensions. Tuscany Java SCA is designed to be embedded in, or provisioned to, a number of different host environments.</P>
+
+<P>Tuscany SCA Java extension points allow any binding type, implementation types(programming model), policy and data binding to be easily added to it. The Tuscany community has contributed the extensions that are shown below. An extension becomes available for the latest Tuscany release as volunteers test and enhance the extension to work with that release. </P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Implementation Types</TH>
+<TH class="confluenceTh">Bindings</TH>
+<TH class="confluenceTh">Data Bindings </TH>
+<TH class="confluenceTh">Interface Types</TH>
+</TR>
+<TR>
+<TD class="confluenceTd">Java components<BR>
+Spring assemblies<BR>
+Scripting with JSR 223(JavaScript, Groovy, Ruby, Python &amp; XSLT)<BR>
+BPEL (a prototype using Apache ODE)</TD>
+<TD class="confluenceTd">Webservice using Apache Axis2<BR>
+JMS (tested with Apache ActiveMQ)<BR>
+JSON-RPC </TD>
+<TD class="confluenceTd">JAXB<BR>
+SDO<BR>
+Axiom<BR>
+Castor<BR>
+XMLBeans</TD>
+<TD class="confluenceTd">Java<BR>
+WSDL 1.1</TD>
+</TR>
+</TBODY></TABLE>
+
+<P>SCA Java is integrated with Tomcat, Jetty and Geronimo. </P></TD></TR></TBODY></TABLE>
+<P><SUB>Copyright &Acirc;&copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The</SUB> <SUB><SPAN class="nobr"><A href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow"><SUB>Apache Software Foundation (ASF)</SUB><SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></SUB><SUB>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</SUB></P>
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-tools-guides.html b/site/trunk/site-publish/sca-java-tools-guides.html
new file mode 100644
index 0000000000..89fb33d91c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-tools-guides.html
@@ -0,0 +1,176 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Tools Guides</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=118414">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Tools Guides">SCA Java Tools Guides</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="SCAJavaToolsGuides-contrib2wsdl"></A>contrib2wsdl</H1>
+
+<H2><A name="SCAJavaToolsGuides-Usage"></A>Usage</H2>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java org.apache.tuscany.tools.contrib2wsdl.Contrib2WSDL -c ./MyContribution -o ./myOutputDir
+</PRE>
+</DIV></DIV>
+
+<H2><A name="SCAJavaToolsGuides-Description"></A>Description</H2>
+
+<P>When you use binding.ws as a service binding you can ask the runtime to generate a WSDL description of the service endpoint. For example, given the component description...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;component name=<SPAN class="code-quote">&quot;Component1&quot;</SPAN>&gt;
+  &lt;implementation.java class=<SPAN class="code-quote">&quot;test.ComponentImpl&quot;</SPAN>/&gt;
+  &lt;service name=<SPAN class="code-quote">&quot;ComponentService&quot;</SPAN>&gt;
+    &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Component1/ComponentService&quot;</SPAN>/&gt;
+</SPAN>  &lt;/service&gt;
+&lt;/component&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then when you point your browser at <A href="http://localhost:8080/Component1?wsdl" class="external-link" rel="nofollow">http://localhost:8080/Component1?wsdl</A> you will get the WSDL document that describes the Component1/ComponentService service. </P>
+
+<P>The contrib2wsdl tool generates WSDL documents for all such service endpoints in the composite at the same time and writes the resulting WSDL documents to the specified directory. Given a contribution of the following structure...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+MyDirectory
+  MyContribution
+    test
+      CompoentImpl.class
+    mycomposite.composite
+      &lt;composite&gt;
+        &lt;component name=<SPAN class="code-quote">&quot;Component1&quot;</SPAN>&gt;
+          &lt;implementation.java class=<SPAN class="code-quote">&quot;test.ComponentImpl&quot;</SPAN>/&gt;
+          &lt;service name=<SPAN class="code-quote">&quot;ComponentService&quot;</SPAN>&gt;
+            &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Component1/ComponentService&quot;</SPAN>/&gt;
+</SPAN>          &lt;/service&gt;
+       &lt;/component&gt;
+        &lt;component name=<SPAN class="code-quote">&quot;Component2&quot;</SPAN>&gt;
+          &lt;implementation.java class=<SPAN class="code-quote">&quot;test.ComponentImpl&quot;</SPAN>/&gt;
+          &lt;service name=<SPAN class="code-quote">&quot;ComponentService&quot;</SPAN>&gt;
+            &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:8080/Component1/ComponentService&quot;</SPAN>/&gt;
+</SPAN>          &lt;/service&gt;
+       &lt;/component&gt;
+     &lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<P>WSDL files can be generated using the commands as follows...</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd MyDirectory
+java org.apache.tuscany.tools.contrib2wsdl.Contrib2WSDL -c MyContribution -o MyOutput
+</PRE>
+</DIV></DIV>
+
+<P>This results in two WSDL files in the MyOutput directory. One for the Component1/ComponentService and one for the Component2/ComponentService. </P>
+
+<P>Both -c and -o default to the current directory. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-travel-sample-10.html b/site/trunk/site-publish/sca-java-travel-sample-10.html
new file mode 100644
index 0000000000..0de3c89a40
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-travel-sample-10.html
@@ -0,0 +1,199 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Travel Sample 1.0</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=22315124">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Travel Sample 1.0">SCA Java Travel Sample 1.0</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCAJavaTravelSample1.0-SCAJavaTravelSample1.0%28June2010%29"></A>SCA Java Travel Sample 1.0 (June 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJavaTravelSample1.0-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip" class="external-link" rel="nofollow">apache-tuscany-scatours-1.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaTravelSample1.0-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz" class="external-link" rel="nofollow">apache-tuscany-scatours-1.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaTravelSample1.0-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-scatours-1.0.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-scatours-1.0.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-travel-sample-1x-releases.html b/site/trunk/site-publish/sca-java-travel-sample-1x-releases.html
new file mode 100644
index 0000000000..b5e4138225
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-travel-sample-1x-releases.html
@@ -0,0 +1,238 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Travel Sample 1.x Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=22315122">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-releases.html" title="SCA Java Releases">SCA Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Travel Sample 1.x Releases">SCA Java Travel Sample 1.x Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAJavaTravelSample1.xReleases-LatestRelease"></A>Latest Release</H2>
+
+<H3><A name="SCAJavaTravelSample1.xReleases-SCAJavaTravelSample1.0%28June2010%29"></A>SCA Java Travel Sample 1.0 (June 2010)</H3>
+
+<P>For full detail about the release please see the <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/RELEASE_NOTES" class="external-link" rel="nofollow">RELEASE_NOTES</A> and <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/CHANGES" class="external-link" rel="nofollow">CHANGES</A> files.</P>
+
+<H3><A name="SCAJavaTravelSample1.xReleases-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip" class="external-link" rel="nofollow">apache-tuscany-scatours-1.0.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaTravelSample1.xReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz" class="external-link" rel="nofollow">apache-tuscany-scatours-1.0.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sca/travelsample-1.0/apache-tuscany-scatours-1.0.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCAJavaTravelSample1.xReleases-Verifyingthedownloads"></A>Verifying the downloads</H3>
+
+<P>To ensure the integrity of the release artifacts they are digitally signed. You can find more information about the way that we sign releases <A href="http://www.apache.org/dev/release-signing.html#faq" class="external-link" rel="nofollow">here</A>. To verify the integrity of the downloaded files you <B>must</B> use signatures downloaded from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A> not from the distribution mirrors. </P>
+
+<P>MD5 checksums can be verified simply by regenerating the checksum and comparing it against the checksum (the md5 file) supplied with the release. There are various utilities that can be used to generate the checksum, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+openssl md5 apache-tuscany-scatours-1.0.tar.gz
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+md5sum apache-tuscany-scatours-1.0.tar.gz
+</PRE>
+</DIV></DIV>
+
+<P>PGP signatures can be verified using PGP or GPG. First download the <A href="http://www.apache.org/dist/tuscany/KEYS" class="external-link" rel="nofollow">KEYS</A> as well as the asc signature file for the relevant distribution. Make sure you get these files from our <A href="http://www.apache.org/dist/tuscany" class="external-link" rel="nofollow">main distribution directory</A>, rather than from a mirror. Then verify the signatures using, for example</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgpk -a KEYS
+pgpv apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+pgp -ka KEYS
+pgp apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+<P>or</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+gpg --<SPAN class="code-keyword">import</SPAN> KEYS
+gpg --verify apache-tuscany-scatours-1.0.tar.gz.asc
+</PRE>
+</DIV></DIV>
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651080; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="1478460e"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_hit_counter.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651080/0/1478460e/1/" alt="hit counter" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+
+<H2><A name="SCAJavaTravelSample1.xReleases-PreviousReleases"></A>Previous Releases</H2>
+
+<P>There are no previous releases of the SCA Java Travel Sample. </P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-tutorial.html b/site/trunk/site-publish/sca-java-tutorial.html
new file mode 100644
index 0000000000..96844f99c8
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-tutorial.html
@@ -0,0 +1,176 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Tutorial</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=81342">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Tutorial">SCA Java Tutorial</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<P>This is a tutorial for SCA sample.</P>
+
+
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SCA User Guide</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#SCAJavaTutorial-section1"><B>section1</B></A>
+<BR class="atl-forced-newline">
+&nbsp;</LI>
+</UL>
+</DIV></DIV>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><DIV class="" align="center">This page to be filled in</DIV>
+</TD></TR></TABLE></DIV>
+
+<H2><A name="SCAJavaTutorial-"></A><A name="SCAJavaTutorial-section1"></A><DIV class="" style="background-color: #C3CDA1;">section1</DIV>
+</H2>
+
+<P>This page will be used for SCA Java Tutorial</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-ug-introduction.html b/site/trunk/site-publish/sca-java-ug-introduction.html
new file mode 100644
index 0000000000..7ec9cc4ac9
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-ug-introduction.html
@@ -0,0 +1,125 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SCA Java UG - Introduction</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java UG - Introduction">SCA Java UG - Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java UG - Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=45009&originalId=45534">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavaUG-Introduction-WhatIsSCA%3F"></A>What Is SCA?</H1>
+
+<P>Service Component Architecture (SCA) is a simple model for creating service-oriented applications.</P>
+
+<P>Service Oriented Architecture (SOA) is an architectural approach driven by the need to overcome the challenges of tightly coupled and department-specific applications. SOA promises benefits such as improved business agility, improved flexibility, cost reduction, and the easy sharing of information in heterogeneous and distributed environments.</P>
+
+<P>Service Component Architecture (SCA) addresses the complexity of developing an SOA solution through its simple model for creating service-oriented applications for the whole enterprise - from the client to the back-end. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-ug-obtaining-tuscanys-java-sca-implementation.html b/site/trunk/site-publish/sca-java-ug-obtaining-tuscanys-java-sca-implementation.html
new file mode 100644
index 0000000000..d2c2f3578e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-ug-obtaining-tuscanys-java-sca-implementation.html
@@ -0,0 +1,137 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SCA Java UG - Obtaining Tuscany's Java SCA Implementation</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java UG - Obtaining Tuscany's Java SCA Implementation">SCA Java UG - Obtaining Tuscany's Java SCA Implementation</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java UG - Obtaining Tuscany's Java SCA Implementation</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44875">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44875">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44875">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=44875&originalId=45533">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavaUG-ObtainingTuscany%27sJavaSCAImplementation-Choosingbetweenapackageruntimeandbuildingyourown"></A>Choosing between a package runtime and building your own</H1>
+
+<H1><A name="SCAJavaUG-ObtainingTuscany%27sJavaSCAImplementation-Downloadingandinstallingarelease"></A>Downloading and installing a release</H1>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="pre-packaged-or-roll-your-own.html" title="Pre-packaged or roll your own?">Pre-packaged or roll your own?</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="building-your-own.html" title="Building your own">Building your own</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-user-documenations.html b/site/trunk/site-publish/sca-java-user-documenations.html
new file mode 100644
index 0000000000..f6161a4554
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-documenations.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java User Documenations</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105091">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-toc.html" title="Java SCA Documentation TOC">Java SCA Documentation TOC</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java User Documenations">SCA Java User Documenations</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Java User Documentations</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="http://tuscany.apache.org/quick-guide-to-sca.html" class="external-link" rel="nofollow">Introduction to SCA</A></LI>
+	<LI>Run a sample</LI>
+	<LI>Develop applications</LI>
+</UL>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-user-guide-introduction.html b/site/trunk/site-publish/sca-java-user-guide-introduction.html
new file mode 100644
index 0000000000..cdd852a0bd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide-introduction.html
@@ -0,0 +1,125 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SCA Java User Guide - Introduction</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca.html" title="Java SCA">Java SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java User Guide - Introduction">SCA Java User Guide - Introduction</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCA Java User Guide - Introduction</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45009">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45009">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45009">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=45009&originalId=45535">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H1><A name="SCAJavaUserGuide-Introduction-WhatIsSCA%3F"></A>What Is SCA?</H1>
+
+<P>Service Component Architecture (SCA) is a simple model for creating service-oriented applications.</P>
+
+<P>Service Oriented Architecture (SOA) is an architectural approach driven by the need to overcome the challenges of tightly coupled and department-specific applications. SOA promises benefits such as improved business agility, improved flexibility, cost reduction, and the easy sharing of information in heterogeneous and distributed environments.</P>
+
+<P>Service Component Architecture (SCA) addresses the complexity of developing an SOA solution through its simple model for creating service-oriented applications for the whole enterprise - from the client to the back-end. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg
new file mode 100644
index 0000000000..9cd3252a12
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg.jpeg
new file mode 100644
index 0000000000..1b26b264d4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg
new file mode 100644
index 0000000000..0c92c4ed66
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg.jpeg
new file mode 100644
index 0000000000..b482732c89
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/CalculatorBlocks2.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator.png b/site/trunk/site-publish/sca-java-user-guide.data/calculator.png
new file mode 100644
index 0000000000..995a57b1fd
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator.png
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator.png.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/calculator.png.jpeg
new file mode 100644
index 0000000000..54fee3f7ee
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png b/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png
new file mode 100644
index 0000000000..3cf9996360
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png.jpeg
new file mode 100644
index 0000000000..89386ff62e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator1.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png b/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png
new file mode 100644
index 0000000000..69b9027a44
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png.jpeg
new file mode 100644
index 0000000000..c52fe73a5c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator2.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png b/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png
new file mode 100644
index 0000000000..33d13a9ed1
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png.jpeg
new file mode 100644
index 0000000000..7c77067545
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/calculator3.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png b/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png
new file mode 100644
index 0000000000..cb0544939d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png.jpeg
new file mode 100644
index 0000000000..3341fd8a7f
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/distributed-abstract.png.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg b/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg
new file mode 100644
index 0000000000..597237981d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg
diff --git a/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg.jpeg b/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg.jpeg
new file mode 100644
index 0000000000..e7a34f439a
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.data/java_imp.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java-user-guide.html b/site/trunk/site-publish/sca-java-user-guide.html
new file mode 100644
index 0000000000..36d5aa8f17
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-guide.html
@@ -0,0 +1,239 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java User Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44873">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java User Guide">SCA Java User Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SCA User Guide</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#SCAJavaUserGuide-Intro"><B>About Tuscany User Guide</B></A></LI>
+	<LI><A href="#SCAJavaUserGuide-CreateYourFirstApplication"><B>Create Your First Application</B></A>
+	<UL>
+		<LI>Single node, Tuscany standalone environment</LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaUserGuide-webservices"><B>Create a Webservices component</B></A>
+	<UL>
+		<LI>Webservices as reference, Tuscany standalone envrionment</LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaUserGuide-distributedapplication"><B>Create a Distributed Application</B></A>
+	<UL>
+		<LI>Multiple nodes, Tuscany standalone environment</LI>
+	</UL>
+	</LI>
+	<LI><A href="http://tuscany.apache.org/sca-java-web-applications.html" class="external-link" rel="nofollow"><B>Deploying as Web Application</B></A></LI>
+	<LI><A href="#SCAJavaUserGuide-CreateAStoreEnterpriseApplication"><B>Create an enterprise Store Application</B></A>
+	<UL>
+		<LI>Multi node, presentation tier, web20 binding, web app</LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCAJavaUserGuide-HostEnvironments"><B>Host Environments</B></A></LI>
+	<LI><A href="#SCAJavaUserGuide-usingExtensions"><B>Using Extensions</B></A></LI>
+	<LI><A href="#SCAJavaUserGuide-security"><B>Running Tuscany with Java2 Security Enabled</B></A></LI>
+	<LI><A href="#SCAJavaUserGuide-Tuscanydependencies"><B>Do I need all of Tuscany?</B></A>
+<BR class="atl-forced-newline">
+&nbsp;</LI>
+</UL>
+</DIV></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><DIV class="" align="center">This page is undergoing complete re-write to be more like a user guide than it is today. You are welcome to help review and complete it. </DIV>
+</TD></TR></TABLE></DIV>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-Intro"></A><DIV class="" style="background-color: #C3CDA1;">About Tuscany User Guide</DIV>
+</H2>
+<P>It is assumed that by now you have browsed through the <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Quick%20Guide%20to%20SCA" class="external-link" rel="nofollow">introduction to SCA</A> section or are familiar with SCA. This user guide helps you learn more about SCA through Tuscany. It starts with building a simple application and progresses into more advanced features through references to samples that reside in Tuscany. </P>
+
+<P>Before we start, let's emphasise that it is Tuscany's goal to provide an implementaiton that avoids imposing rules and requirements on how you write your applications. In fact the goal is to let you write application code without being concerned about the technology you choose or the environment in which it will be used. You focus on your business logic and Tuscany infrastructure will handle the rest.  </P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-CreateYourFirstApplication"></A><DIV class="" style="background-color: #C3CDA1;">Create Your First Application</DIV>
+</H2>
+<P>This simple exercise provides you with a hands-on experience for creating an SCA calculator application. Although this is a simple application, it will cover the following items:</P>
+<UL>
+	<LI>Creating SCA POJO-based components</LI>
+	<LI>Composing an application</LI>
+	<LI>Deploying the application</LI>
+	<LI>Modifying the application to use a different binding</LI>
+</UL>
+
+
+<P>Give <A href="getting-started-with-tuscany-using-the-command-line.html" title="Getting Started with Tuscany ( using the Command Line)">create a calculator application</A> a try.  </P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-webservices"></A><DIV class="" style="background-color: #C3CDA1;">Create a Webservices component</DIV>
+</H2>
+<P>Learn how to expose your pojo components as webservices. This will cover</P>
+<UL>
+	<LI>Creating SCA POJO-based component and exposing it as a webservice</LI>
+</UL>
+
+
+<P>Give <A href="build-your-first-web-services-with-tuscany.html" title="Build your first Web Services with Tuscany">Building your first web services using Tuscany</A> a try.</P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-distributedapplication"></A><DIV class="" style="background-color: #C3CDA1;">Create a Distributed Application</DIV>
+</H2>
+<P>A Tuscany application can be run in a single or multi-node environment. Here we introduce the Tuscany node and SCA domain and explain how the calculator example can be distributed across multiple nodes. We will cover the following:</P>
+<UL>
+	<LI>What is a node?</LI>
+	<LI>What is the SCA domain</LI>
+	<LI>How to create and application that will run across multiple nodes in a domain</LI>
+</UL>
+
+
+<P>Take a look at <A href="distributed-sca-domain.html" title="Distributed SCA Domain">Distributed SCA Domain</A></P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-CreateanenterpriseApplication"></A><DIV class="" style="background-color: #C3CDA1;">Create a Store Enterprise Application</DIV>
+</H2>
+
+<P>Now that you have created a simple calculator application, let's move on to a more interesting application called store. This application is developed in Eclipse enviromment and uses more advanced features that are offered in Tuscany. You will notice that it is as simple to create this application as it was to create the calculator application.</P>
+
+<P><A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Getting Started with Tuscany using a Tuscany Distribution In Eclipse</A><BR>
+This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany SCA distribution manually installed into Eclipse</P>
+
+<P><A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Getting Started with Tuscany using the Tuscany Eclipse Plugin</A></P>
+
+<P>This is a quick getting started guide that go trough the steps of building the store scenario using the Tuscany Eclipse plugin.</P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-HostEnvironments"></A><DIV class="" style="background-color: #C3CDA1;">Host Environments</DIV>
+</H2>
+
+<P>Tusncany applications can be run in a Tuscany standalone environment or in multitude of different host environments. You have seen examples of how to run in standalone environments in the previous sections. Here we cover other platforms.</P>
+<H3><A name="SCAJavaUserGuide-Tomcat"></A>Tomcat</H3>
+<P>Running a Tuscany SCA Java enabled webapp in Tomcat is as simple as copying the webapp to the Tomcat webapps directory.</P>
+
+<H3><A name="SCAJavaUserGuide-Geronimo"></A>Geronimo</H3>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" align="absmiddle" alt="" border="0"> TODO ... get link from Vamsi</P>
+
+<H3><A name="SCAJavaUserGuide-WebSphere"></A>WebSphere</H3>
+
+<P>Please see this blog entry to learn how to do this: <A href="http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html" class="external-link" rel="nofollow">http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html</A></P>
+
+<H3><A name="SCAJavaUserGuide-WebLogic"></A>WebLogic</H3>
+
+<P>Please see this user's blog to learn how to do this: <A href="http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html" class="external-link" rel="nofollow">http://davesowerby.blogspot.com/2008/02/using-tuscany-with-weblogic.html</A></P>
+
+<H3><A name="SCAJavaUserGuide-Eclipse"></A>Eclipse</H3>
+
+<P>You can develop and run your applications in Eclipse environment.<BR>
+<A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Getting Started with Tuscany using a Tuscany Distribution In Eclipse</A><BR>
+Tuscany also provides a Tuscany Eclipse plug-in to facilitate the development of SCA applications on Tuscany in the Eclipse environment.<BR>
+<A href="getting-started-with-tuscany-using-tuscany-eclipse-plugin.html" title="Getting Started with Tuscany (using Tuscany Eclipse Plugin)">Getting Started with Tuscany using the Tuscany Eclipse Plugin</A></P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-usingextensions"></A><DIV class="" style="background-color: #C3CDA1;">Using Extensions </DIV>
+</H2>
+<P>What are extensions? Well, we call these extensions: bindings, implementation types, interface types, policies.  Think of SCA Java infrastructure as providing the framework that supports all these pluggable functionality. Bindings provide protocol handling, implementation types provide support for different languages and programming models, interface types allow enable you to define interfaces in different ways for example Java, WSDL and policies enable you to choose which type of policies you want to apply to your application. You can pick and choose what you need based on your requirements and the technologies that you use. For a complete list of available extensions and their documentation please check this link.</P>
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-security"></A><DIV class="" style="background-color: #C3CDA1;">Running Tuscany with Java2 Security Enabled</DIV>
+</H2>
+<P>Tuscany can be enabled to run with Java2 security on.<BR>
+<A href="running-tuscany-with-java-2-security-enabled.html" title="Running Tuscany with Java 2 Security Enabled">Running Tuscany with Java 2 Security Enabled</A></P>
+
+
+<H2><A name="SCAJavaUserGuide-"></A><A name="SCAJavaUserGuide-Tuscanydependencies"></A><DIV class="" style="background-color: #C3CDA1;">Do I need all of Tuscany?</DIV>
+</H2>
+<P>Tuscany SCA has a very modular architecture. Think of it as building blocks. You pick what you need for your particular application. In 1.x, there is one binary distribution. you can get to a smaller subset through building the source with the appropriate modules that you need. In 2.x code line, we are aiming to provide smaller distributions. For more information about how you can build a smaller distribution please see this <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Build%20Your%20Own%20Tuscany%20Distribution" class="external-link" rel="nofollow">link</A></P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-user-reference.html b/site/trunk/site-publish/sca-java-user-reference.html
new file mode 100644
index 0000000000..ceb336a408
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-user-reference.html
@@ -0,0 +1,143 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java User Reference</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54455">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java User Reference">SCA Java User Reference</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<TABLE class="wiki-table" cellpadding="0" cellspacing="0" border="0"><TR><TH><TR><TD></TH></TR><TR class="table-odd"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-ImplementationTypes"></A></H3></TD></TR><TR class="table-even"></TR><TR class="table-odd"><TD><DIV class="" style="background-color: #C3CDA1;">Implementation Types</DIV></TD></TR><TR class="table-even"><TD></TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-implementationjava.html" title="SCA Java implementation.java">implementation.java</A></TD></TD></TR><TR class="table-even"><TD><TD>Support for SCA components implemented with Java classes</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-implementationscript.html" title="SCA Java implementation.script">implementation.script</A></TD></TD></TR><TR class="table-odd"><TD><TD>Support for SCA components implemented with scripting languages</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-implementationspring.html" title="SCA Java implementation.spring">implementation.spring</A></TD></TD></TR><TR class="table-even"><TD><TD>Support for spring</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.91</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-implementationresource.html" title="SCA Java implementation.resource">implementation.resource</A></TD></TD></TR><TR class="table-odd"><TD><TD>exposes file resources</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.91</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-implementationbpel.html" title="SCA Java implementation.bpel">implementation.bpel</A></TD></TD></TR><TR class="table-even"><TD><TD>Support for components implemented in BPEL</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 1.0</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-implementationosgi.html" title="SCA Java implementation.osgi">implementation.osgi</A></TD></TD></TR><TR class="table-odd"><TD><TD>Support for osgi</TD></TD></TR><TR class="table-even"><TD><TD>Available from 1.0</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-implementationxquery.html" title="SCA Java implementation.xquery">implementation.xquery</A></TD></TD></TR><TR class="table-even"><TD><TD>Support for components implemented in xquery</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 1.0</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-implementationweb.html" title="SCA Java implementation.web">implementation.web</A></TD></TD></TR><TR class="table-odd"><TD><TD>Support JEE web apps as implementation types</TD></TD></TR><TR class="table-even"><TD><TD>Under development</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-implementationwidget.html" title="SCA Java implementation.widget">implementation.widget</A></TD></TD></TR><TR class="table-even"><TD><TD>Support wiring of SCA components in Web 2.0 style applications</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 1.0</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD></TD></TR><TR class="table-odd"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-ProtocolBindings"></A></H3></TD></TR><TR class="table-even"></TR><TR class="table-odd"><TD><DIV class="" style="background-color: #C3CDA1;">Protocol Bindings</DIV></TD></TR><TR class="table-even"><TD></TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-bindingajax.html" title="SCA Java binding.ajax">binding.ajax</A></TD></TD></TR><TR class="table-even"><TD><TD>Communication with AJAX clients</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-bindingcorba.html" title="SCA Java binding.corba">binding.corba</A></TD></TD></TR><TR class="table-odd"><TD><TD>CORBA Binding</TD></TD></TR><TR class="table-even"><TD><TD>Available from 1.4</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-bindingerlang.html" title="SCA Java binding.erlang">binding.erlang</A></TD></TD></TR><TR class="table-even"><TD><TD>Communication with Erlang nodes and clients. Supports Erlang remote procedure calls (RPC) and Erlang messaging, both service and reference side.</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 1.6 (source distribution only)</TD></TR></TD></TR><TR class="table-even"></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-bindingjms.html" title="SCA Java binding.jms">binding.jms</A></TD></TD></TR><TR class="table-even"><TD><TD>Asynchronous JMS messaging</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 1.1</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-bindingjsonrpc.html" title="SCA Java binding.jsonrpc">binding.jsonrpc</A></TD></TD></TR><TR class="table-odd"><TD><TD>The JSON-RPC protocol</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-bindingrmi.html" title="SCA Java binding.rmi">binding.rmi</A></TD></TD></TR><TR class="table-even"><TD><TD>The Java RMI protocol</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-bindingws.html" title="SCA Java binding.ws">binding.ws</A></TD></TD></TR><TR class="table-odd"><TD><TD>SOAP/HTTP web services</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD><A href="sca-java-bindingejb.html" title="SCA Java binding.ejb">binding.ejb</A></TD></TD></TR><TR class="table-even"><TD><TD>EJB Binding</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-bindinghttp.html" title="SCA Java binding.http">binding.http</A></TD></TD></TR><TR class="table-odd"><TD><TD>Supports binding of methods over standard Hyper Text Transfer Protocol (HTTP), allowing you to create, retrieve, update, delete items. Also supports conditional creates, retrieves, updates, and deletes using the ETag and LastModified caching protocol described in HTTP.</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90. Caching available from 1.3.2.</TD></TR></TD></TR><TR class="table-odd"><TD><TD><A href="sca-java-bindingatom.html" title="SCA Java binding.atom">binding.atom</A></TD></TD></TR><TR class="table-even"><TD><TD>supports Atom-publishing (a standard REST protocol), allowing you to create, retrieve, update, delete Atom entries</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.91</TD></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-bindingrss.html" title="SCA Java binding.rss">binding.rss</A></TD></TD></TR><TR class="table-odd"><TD><TD>Consumes or provides an RSS feed</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.91</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD></TD></TR><TR class="table-even"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-DataBindings"></A></H3></TD></TR><TR class="table-odd"></TR><TR class="table-even"><TD><DIV class="" style="background-color: #C3CDA1;">Data Bindings</DIV></TD></TR><TR class="table-odd"><TD></TD></TR></TD></TR><TR class="table-even"><TD><TR><TD>databinding-axiom</TD></TD></TR><TR class="table-odd"><TD><TD>Support for AXIOM databinding</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD>databinding-jaxb</TD></TD></TR><TR class="table-even"><TD><TD>Support for&nbsp;JAXB databinding</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD>databinding-sdo</TD></TD></TR><TR class="table-odd"><TD><TD>Support for&nbsp;SDO databinding&nbsp;</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD>databinding-sdo-axiom</TD></TD></TR><TR class="table-even"><TD><TD>Support optimzed SDO to AXIOM transformation</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD></TD></TR><TR class="table-odd"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-Interfaces"></A></H3></TD></TR><TR class="table-even"></TR><TR class="table-odd"><TD><DIV class="" style="background-color: #C3CDA1;">Interfaces</DIV></TD></TR><TR class="table-even"><TD></TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD>interface-java</TD></TD></TR><TR class="table-even"><TD><TD>Interfaces described with java interfaces</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-interfacewsdl.html" title="SCA Java interface.wsdl">interface.wsdl</A></TD></TD></TR><TR class="table-odd"><TD><TD>Interfaces described with WSDL definitions</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD></TD></TR><TR class="table-even"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-Hosts"></A></H3></TD></TR><TR class="table-odd"></TR><TR class="table-even"><TD><DIV class="" style="background-color: #C3CDA1;">Hosts</DIV></TD></TR><TR class="table-odd"><TD></TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-hostembedded.html" title="SCA JAVA host.embedded">host.embedded</A></TD></TD></TR><TR class="table-odd"><TD><TD>The original simple embeddable runtime</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD>http-jetty</TD></TD></TR><TR class="table-even"><TD><TD>The integration between Tuscany and the Jetty&nbsp;web container</TD></TD></TR><TR class="table-odd"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-even"><TD><TR><TD>http-tomcat</TD></TD></TR><TR class="table-odd"><TD><TD>The integration between Tuscany and the Tomcat web container</TD></TD></TR><TR class="table-even"><TD><TD>Available from 0.90</TD></TR></TD></TR><TR class="table-odd"><TD><TR><TD></TD></TR><TR class="table-even"><TD><H3><A name="SCAJavaUserReference-"></A><A name="SCAJavaUserReference-Policy"></A></H3></TD></TR><TR class="table-odd"></TR><TR class="table-even"><TD><DIV class="" style="background-color: #C3CDA1;">Policy</DIV></TD></TR><TR class="table-odd"><TD></TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><A href="sca-java-definitionsxml.html" title="SCA Java definitions.xml">definitions.xml</A></TD></TD></TR><TR class="table-odd"><TD><TD>Defined intents, policy sets and binding defaults</TD></TD></TR><TR class="table-even"><TD><TD>Available from 1.0</TD></TR></TD></TR><TR class="table-odd"><TD><TR></TR></TD></TR></TABLE></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-web-applications.html b/site/trunk/site-publish/sca-java-web-applications.html
new file mode 100644
index 0000000000..36d2dc61dc
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-web-applications.html
@@ -0,0 +1,248 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Web Applications</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106453">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Web Applications">SCA Java Web Applications</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAJavaWebApplications-UsingTuscanyinJEEWebApplications"></A>Using Tuscany in JEE Web Applications</H3>
+
+<P>This page describes how to use Tuscany in JEE Web Applications.</P>
+
+<P>You can use a JEE Web application as a container for running Tuscany SCA applications, and this enables building applications which combine both JEE features and SCA features. When running Tuscany in a Web application there is a single SCA domain contained entirely within the web application (see note at bottom of page). </P>
+
+<P>When using Tuscany in Web applications there are three aspects to consider:</P>
+<OL>
+	<LI>Configuring the Web application</LI>
+	<LI>Configuring the Tuscany SCA domain</LI>
+	<LI>Accessing the SCA services within the SCA domain</LI>
+</OL>
+
+
+<H3><A name="SCAJavaWebApplications-Configuringthewebapplication"></A>Configuring the web application</H3>
+
+<P>All the Tuscany jar's and dependencies must be included in the WEB-INF/lib folder. Some configuration in the web.xml file is required - a ContextListener is needed when using non-HTTP based SCA services so that the Tuscany runtime is started when the Web Application starts, a Servlet Filter is required when using HTTP based SCA services. The simplest approach is to always include both ContextListener and Filter definitions in the web.xml so that everything works for all types of SCA configuration.   </P>
+
+<P>The following show the XML snippets show the necessary definitions for the web.xml file: </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;listener&gt;
+   &lt;listener-class&gt;org.apache.tuscany.sca.host.webapp.TuscanyContextListener&lt;/listener-class&gt;
+&lt;/listener&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;filter&gt;
+    &lt;filter-name&gt;tuscany&lt;/filter-name&gt; 
+    &lt;filter-class&gt;org.apache.tuscany.sca.host.webapp.TuscanyServletFilter&lt;/filter-class&gt; 
+&lt;/filter&gt;
+
+&lt;filter-mapping&gt;
+    &lt;filter-name&gt;tuscany&lt;/filter-name&gt; 
+    &lt;url-pattern&gt;/*&lt;/url-pattern&gt; 
+&lt;/filter-mapping&gt;
+
+</PRE>
+</DIV></DIV>
+
+<H3><A name="SCAJavaWebApplications-ConfiguringtheTuscanySCAdomain"></A>Configuring the Tuscany SCA domain</H3>
+
+<P>Tuscany treats the entire Web application as a single contribution and the deployable composites within the contribution can be configured in three ways:</P>
+<OL>
+	<LI>by including a META-INF/sca-contributions.xml</LI>
+	<LI>by including deployable composite files within a folder named META-INF/sca-deployables</LI>
+	<LI>by using what is known as an &quot;application composite&quot; which is a single composite file named WEB-INF/web.composite</LI>
+</OL>
+
+
+
+<H3><A name="SCAJavaWebApplications-AccessingtheSCAserviceswithintheSCAdomain"></A>Accessing the SCA services within the SCA domain</H3>
+
+<P>For JSPs you can use an SCA taglib or access the SCADomain directly. To use the taglib, declare it with:</P>
+
+      <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;%@ taglib uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/sca/sca_jsp.tld&quot;</SPAN> prefix=<SPAN class="code-quote">&quot;sca&quot;</SPAN> %&gt;</SPAN></PRE>
+</DIV></DIV>
+
+<P>and then you can define references to services with the sca:reference tag, eg:</P>
+
+     <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">&lt;sca:reference name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN> type=<SPAN class="code-quote">&quot;calculator.CalculatorService&quot;</SPAN> /&gt;</PRE>
+</DIV></DIV>
+
+<P>That treats the domain as one big &quot;virtual&quot; component with every service in the domain being available as a reference in the JSP</P>
+
+<P>The Tuscany SCADomain object is stored in the Web applications ServletContext object so application code can get hold of that and use the SCADomain just like when running Tuscany applications in a standalone JSE environment. For example, a JSP can do the follow:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;%
+   SCADomain scaDomain = (SCADomain) application.getAttribute(<SPAN class="code-quote">&quot;org.apache.tuscany.sca.SCADomain&quot;</SPAN>);
+   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+%&gt;
+</PRE>
+</DIV></DIV>
+
+
+<H3><A name="SCAJavaWebApplications-SamplesshowingTuscanyinJEEWebApplications"></A>Samples showing Tuscany in JEE Web Applications</H3>
+
+<P>Tuscany comes with several samples using JEE Web Applications. The simplest is the <A href="https://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.3.2/samples/calculator-webapp/" class="external-link" rel="nofollow">calculator-webapp </A> which shows a JSP invoking an SCA component. Another is the <A href="https://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.3.2/samples/calculator-ws-webapp/" class="external-link" rel="nofollow">calculator-ws-webapp </A> which extends the calculator-webapp sample to use SCA Web Services, another is the <A href="https://svn.apache.org/repos/asf/tuscany/tags/java/sca/1.3.2/demos/alert-aggregator-webapp/" class="external-link" rel="nofollow">alert-aggregator</A> demo which shows a more complete application. </P>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>The OASIS SCA JEE specification</B><BR>What is described on this page is Tuscany support that has been implemented ahead of on going work in the OASIS JEE specification.  <BR>
+The OASIS JEE specification has now made more progress and Tuscany will be updating the Web application support in line with the specification.<BR>
+See the <A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j-jee" class="external-link" rel="nofollow">SCA-J JEE Subcommittee </A> page and the Tuscany dev list for more information.</TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>The Tuscany-Geronimo integration plugin</B><BR>As one of the steps to supporting the OASIS JEE specification there is ongoing work integrating Tuscany into the Apache Geronimo JEE application server. More information about that is available on the <A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Installing%20Tuscany%20Plugin%20for%20Geronimo" class="external-link" rel="nofollow">plugin </A> page.</TD></TR></TABLE></DIV>
+
+</TD></TR></TBODY></TABLE> 
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-whats-new.html b/site/trunk/site-publish/sca-java-whats-new.html
new file mode 100644
index 0000000000..fe5c5896f4
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-whats-new.html
@@ -0,0 +1,67 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Java Whats New : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54697">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="sca.html" title="SCA">SCA</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Whats New">SCA Java Whats New</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>Items of news relating to the SCA Java implementation...</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-java-wish-list.html b/site/trunk/site-publish/sca-java-wish-list.html
new file mode 100644
index 0000000000..9dfac3acda
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-wish-list.html
@@ -0,0 +1,173 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Wish List</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54256">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Wish List">SCA Java Wish List</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This is a list to capture those things you really want to see in Tuscany SCA Java.  Please consider youself invited to help develop content or provide feedback to enhance Apache Tuscany. If there are items that you want that are missing from the list add them. If there is something you want to work on then feel free to do so. If you want to tag your name against the item you are working on that would be great. Putting your name here is just an expression of interest it doesn't mean you have to go and do all the work on your own. If an item is done and finds its way into the code base then you can move it to the <A href="http://cwiki.apache.org/TUSCANY/sca-java-next-release.html" class="external-link" rel="nofollow">Next Release</A> page.</P>
+
+
+<H2><A name="SCAJavaWishList-General"></A>General</H2>
+<UL class="alternate" type="square">
+	<LI>Type scoping and contexts</LI>
+	<LI>Logging stratergy and better error reporting
+	<UL class="alternate" type="square">
+		<LI>in the assembly model (jsdelfino)</LI>
+		<LI>in the contribution service (lresende)</LI>
+	</UL>
+	</LI>
+	<LI>Lifecycle management improvements ?</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-CoreRuntime"></A>Core Runtime</H2>
+
+<H2><A name="SCAJavaWishList-Bindings"></A>Bindings</H2>
+
+<H2><A name="SCAJavaWishList-Implementations"></A>Implementations</H2>
+<UL class="alternate" type="square">
+	<LI>XSLT (we might get some level of function currently from the script extension)</LI>
+	<LI>Remove requirement to have .componentType side files for components implemented using scripting languages</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-Databindings"></A>Databindings</H2>
+<UL class="alternate" type="square">
+	<LI>Hook the script implementation up to the Tuscany databinding framework</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-Hosting"></A>Hosting</H2>
+<UL class="alternate" type="square">
+	<LI>Allow port to be specified on whicto start an http connector</LI>
+	<LI>Deeper Tomcat integration?</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-DomainandContribution"></A>Domain and Contribution</H2>
+<UL class="alternate" type="square">
+	<LI>SCA domain API improvements ?</LI>
+	<LI>Distributed domains (slaws)</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-Samples"></A>Samples</H2>
+<UL class="alternate" type="square">
+	<LI>Provide a version of Aggregator sample as per Tuscany Native SCA (slaws)</LI>
+	<LI>JSONRPC version of calculator sample that we can refer to in the user guide</LI>
+	<LI>Web services version of calculator sample that we can refer to in the user guide</LI>
+</UL>
+
+
+<H2><A name="SCAJavaWishList-ITests"></A>ITests</H2>
+
+<H2><A name="SCAJavaWishList-SCASpecCoverage"></A>SCA Spec Coverage</H2>
+
+<H2><A name="SCAJavaWishList-AnythingElseYouFancy"></A>Anything Else You Fancy</H2>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java-work-in-progress.html b/site/trunk/site-publish/sca-java-work-in-progress.html
new file mode 100644
index 0000000000..368a5b3c6d
--- /dev/null
+++ b/site/trunk/site-publish/sca-java-work-in-progress.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java Work-In-Progress</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43903">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png b/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png
new file mode 100644
index 0000000000..3fa9fab7ab
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png
diff --git a/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png.jpeg b/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png.jpeg
new file mode 100644
index 0000000000..4806f70f66
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/distributed-abstract smallest.png.jpeg
diff --git a/site/trunk/site-publish/sca-java.data/distributed-abstract.png b/site/trunk/site-publish/sca-java.data/distributed-abstract.png
new file mode 100644
index 0000000000..170d590f16
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/distributed-abstract.png
diff --git a/site/trunk/site-publish/sca-java.data/distributed-abstract.png.jpeg b/site/trunk/site-publish/sca-java.data/distributed-abstract.png.jpeg
new file mode 100644
index 0000000000..21d2977e9c
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/distributed-abstract.png.jpeg
diff --git a/site/trunk/site-publish/sca-java.data/getting_started_Rest_099_07.pdf b/site/trunk/site-publish/sca-java.data/getting_started_Rest_099_07.pdf
new file mode 100644
index 0000000000..3a628e1d6e
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/getting_started_Rest_099_07.pdf
diff --git a/site/trunk/site-publish/sca-java.data/javasca smaller.jpg b/site/trunk/site-publish/sca-java.data/javasca smaller.jpg
new file mode 100644
index 0000000000..78cad38be3
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/javasca smaller.jpg
diff --git a/site/trunk/site-publish/sca-java.data/javasca smaller.jpg.jpeg b/site/trunk/site-publish/sca-java.data/javasca smaller.jpg.jpeg
new file mode 100644
index 0000000000..cea158aeec
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/javasca smaller.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg b/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg
new file mode 100644
index 0000000000..6498d08553
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg
diff --git a/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg.jpeg b/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg.jpeg
new file mode 100644
index 0000000000..51b6935845
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/javascaSmall2.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg b/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg
new file mode 100644
index 0000000000..2c7a85b0c2
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg
diff --git a/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg.jpeg b/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg.jpeg
new file mode 100644
index 0000000000..bf56a9fcb0
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.data/tuscanylogo.jpg.jpeg
diff --git a/site/trunk/site-publish/sca-java.html b/site/trunk/site-publish/sca-java.html
new file mode 100644
index 0000000000..fdff772e62
--- /dev/null
+++ b/site/trunk/site-publish/sca-java.html
@@ -0,0 +1,155 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47529">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Java">SCA Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SCAJava-TuscanySCAJava"></A>Tuscany SCA Java</H1>
+
+<P>Tuscany Java SCA is a lightweight runtime that is designed to run standalone or provisioned to different host environments.   The modularized architecture allows users to pick and choose modules that cater to their business needs therefore resulting in small footprint.</P>
+
+<P>At a high level,Tuscany Java SCA infrastructure can be divided into two categories of modules: core and extensions. The core modules consist of selectable components that provide support for SCA and data handling as well as the core runtime. The core runtime includes functions such as loading system and application services, building and managing composites. The extension category consists of a set of selectable modules that support integration of various technologies that are required in SOA environment. This includes support for various protocols through bindings, programming languages through implementations, data types, security and transaction through policies. This whole thing constitutes an SCA node. An SCA composite application can be spread across multiple nodes in a cloud or be run on a single node. This administrative scope is referred to as the SCA domain.<BR>
+<SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="sca-java.data/javascaSmall2.jpg" style="border: 0px solid black"></SPAN><BR>
+For a complete list of supported extensions please see <A href="http://tuscany.apache.org/sca-java-user-reference.html" class="external-link" rel="nofollow">extension documentation </A>. The extensible architecture of SCA Java allows any missing extension to be easily added. </P>
+
+<P>Tuscany SCA Java has implemented SCA specifications 1.0 defined by www.osoa.org in its <A href="http://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x" class="external-link" rel="nofollow">1.x code line</A>. Tuscany community is working on compliance with OASIS version of SCA in <A href="http://svn.apache.org/repos/asf/tuscany/java/sca/" class="external-link" rel="nofollow">2.x code line</A>. To document the work in progress we have created a roadmap page on our wiki <A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Java SCA Roadmap Wiki Page</A>. Please consider yourself invited to get involved in any of these items or suggest new ones that you want to work on. </P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> <B>Build your first SCA application in 10 minutes!</B> <A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Give it a try</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-jumpstart.html b/site/trunk/site-publish/sca-jumpstart.html
new file mode 100644
index 0000000000..b40bc9fb4c
--- /dev/null
+++ b/site/trunk/site-publish/sca-jumpstart.html
@@ -0,0 +1,118 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Jumpstart : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47835">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Jumpstart">SCA Jumpstart</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H3><A name="SCAJumpstart-JumpStartGuide"></A>Jump-Start Guide</H3>
+
+<P>Note that the 2.0 alpha runtime samples distributions assume you have JDK 5 and <SPAN class="nobr"><A href="http://maven.apache.org/" title="Visit page outside Confluence" rel="nofollow">Maven 2.04 <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> installed.</P>
+
+<P>1. Download and unzip the 2.0 alpha runtime distribution <BR>
+2. Download and unzip the 2.0 alpha samples<BR>
+3. Build the common sample module from the samples root directory by doing:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn install</PRE>
+</DIV></DIV>
+
+<P>4. Go to <TT>standalone</TT> under the samples root directory and select the caculator sample<BR>
+5. Build the sample by doing:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">mvn install</PRE>
+</DIV></DIV>
+
+<P>6. Run the sample using the following command:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">java -jar &lt;path to launcher bin directory where you downloaded the standalone runtime&gt; calc.jar add 1 2</PRE>
+</DIV></DIV>
+
+<P>7. The loan application sample may also be run by building it executing the following:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">java -jar &lt;path to launcher bin directory where you downloaded the standalone runtime&gt; loanapplication.jar</PRE>
+</DIV></DIV>
+
+<P>Alternatively the samples can be run from the standalone runtime directory using:</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">java -jar bin/launcher.jar &lt;path to the loanapplication.jar&gt;</PRE>
+</DIV></DIV>
+
+
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-menu.html b/site/trunk/site-publish/sca-menu.html
new file mode 100644
index 0000000000..0bb4ddb9f2
--- /dev/null
+++ b/site/trunk/site-publish/sca-menu.html
@@ -0,0 +1,81 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50750">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Menu">SCA Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H4><A name="SCAMenu-Available"></A>Available</H4>
+<P><A href="sca-java.html" title="SCA Java">Java SCA</A><BR>
+<A href="sca-native.html" title="SCA Native">Native SCA</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A></P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-native-architecture-guide.html b/site/trunk/site-publish/sca-native-architecture-guide.html
new file mode 100644
index 0000000000..0d3e93f1bd
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-architecture-guide.html
@@ -0,0 +1,166 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Architecture Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51125">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Architecture Guide">SCA Native Architecture Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SCANativeArchitectureGuide-HighlevelarchitectureviewofSCANative"></A>High level architecture view of SCA Native</H1>
+
+<P>Tuscany SCA Native consists of the <A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca/runtime/core/" class="external-link" rel="nofollow">kernel</A> and <A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca/runtime/extensions/" class="external-link" rel="nofollow">extensions</A>.</P>
+
+<P>The kernel loads any .composite, .xsd, .wsdl or<BR>
+.componentType files found under a directory defined by the<BR>
+TUSCANY_SCACPP_ROOT environment variable. The kernel also loads any<BR>
+extensions found in the Tuscany extensions directory (found in the<BR>
+directory specified by the TUSCANY_SCACPP env variable). The kernel<BR>
+inspects the .composite files and checks that any required extensions<BR>
+that the SCA app uses are loaded, works out how the components are<BR>
+wired together, and then passes the details of the composite to the<BR>
+appropriate extensions. E.g. if the SCDL contains a<BR>
+&lt;implementation.python&gt; element, the contents of that element are<BR>
+passed to the Python extension which will load a defined script, etc.<BR>
+When the SCA app is invoked (via a local client call or a SOAP or REST<BR>
+service binding being called) the kernel uses the appropriate<BR>
+extension to invoke the right methods in the component implementation<BR>
+code.</P>
+
+<P>The language binding extensions (C++, Ruby, Python, PHP) provide<BR>
+wrapper and proxy code. The wrapper code wraps the component<BR>
+implemented in that language, initialising the component<BR>
+implementation, converting method arguments to the correct types and<BR>
+invoking the defined method with the converted arguments. The proxy<BR>
+code allows the component to call it's references, providing objects<BR>
+that look like standard objects in the component language, but which,<BR>
+when called, convert the method arguments from the language types and<BR>
+invoke the referenced component's wrapper code to invoke the component<BR>
+itself.</P>
+
+<P>The service and reference binding extensions (SOAP/Axis2C, REST)<BR>
+provide service and reference code. The service code allows Tuscany to<BR>
+run within a container as a service that can be invoked (e.g. as an<BR>
+Axis2C SOAP web service). The reference code allows Tuscany to call<BR>
+other services (that may or may not be other Tuscany services) using<BR>
+that technology to make the call out (e.g. a SOAP call to a Web<BR>
+Service).<BR>
+See the various samples we have for examples of all this.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-developer-guide.html b/site/trunk/site-publish/sca-native-developer-guide.html
new file mode 100644
index 0000000000..0bcab1c479
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-developer-guide.html
@@ -0,0 +1,328 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Developer Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56441">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Developer Guide">SCA Native Developer Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>How to get involved in development of Java SCA?</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P>This document is the development guideline for SCA Native project. </P>
+
+<UL>
+	<LI><A href="#SCANativeDeveloperGuide-GeneralGuide">General Guide</A></LI>
+	<LI><A href="#SCANativeDeveloperGuide-GettingSource">Getting Source code</A></LI>
+	<LI><A href="#SCANativeDeveloperGuide-Setup">Setting up your development environment</A>
+	<UL>
+		<LI><A href="#SCANativeDeveloperGuide-SetupLinux">Linux</A></LI>
+		<LI><A href="#SCANativeDeveloperGuide-SetupWindows">Windows</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#SCANativeDeveloperGuide-SystemRequirements">System Requirements</A></LI>
+	<LI><A href="#SCANativeDeveloperGuide-Building">Building the source code</A></LI>
+</UL>
+</DIV></DIV>
+
+<H3><A name="SCANativeDeveloperGuide-GeneralGuide"></A><A name="SCANativeDeveloperGuide-GeneralGuide"></A>General Guide</H3>
+
+
+<H3><A name="SCANativeDeveloperGuide-GettingSourcecode"></A><A name="SCANativeDeveloperGuide-GettingSource"></A>Getting Source code</H3>
+
+<P>The main Tuscany project repository is located at <A href="https://svn.apache.org/repos/asf/incubator/tuscany" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany</A>. You can use SVN to check out the entire project, and you will get both the java and C++ repositories. Alternatively you can check out just the cpp directory at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/cpp</A>, to get the SCA and SDO implementations for C++.</P>
+
+<UL>
+	<LI>From $HOME/tuscany, do svn co <A href="http://svn.apache.org/repos/asf/incubator/tuscany/cpp" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/cpp</A>, this will check out all the source code in $HOME/tuscany/cpp.</LI>
+	<LI>Configure your environment:
+	<UL>
+		<LI>export TUSCANY_SCACPP=$HOME/tuscany/cpp/sca/deploy</LI>
+		<LI>export TUSCANY_SDOCPP=$HOME/tuscany/cpp/sdo/deploy</LI>
+		<LI>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TUSCANY_SDOCPP/lib:$TUSCANY_SCACPP/lib</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SCANativeDeveloperGuide-Settingupyourdevelopmentenvironment"></A><A name="SCANativeDeveloperGuide-Setup"></A> Setting up your development environment 	</H3>
+
+<P>Below you can find detailed instructions on how to configure the C++ runtime and tools for Linux or Windows.</P>
+
+<H4><A name="SCANativeDeveloperGuide-Linux"></A><A name="SCANativeDeveloperGuide-SetupLinux"></A> Linux</H4>
+
+<P> These steps take no more than 15 mns to complete,starting from scratch. After you complete them, you should be all set to build the Tuscany C++ runtime.</P>
+
+<P>From a shell prompt, create a $HOME/tuscany directory.</P>
+
+<P><B>Prerequisites</B></P>
+
+<P>Install the following prerequisites:</P>
+
+<OL>
+	<LI>Subversion - SVN version 1.3.0 or later is good (most Linux distros already include SVN).</LI>
+	<LI>Ant and a Java JDK are required by the SCA code generation tool used to generate proxies and wrappers for C++ components.
+	<UL>
+		<LI>Download apache-ant-1.6.5-bin to '$HOME/tuscany' do tar xzf apache-ant-1.6.5-bin.tar.gz.</LI>
+		<LI>Configure your environment:
+		<UL>
+			<LI>export JAVA_HOME=$HOME/tuscany/jdk1.5.0_06</LI>
+			<LI>PATH=$JAVA_HOME/bin:$PATH</LI>
+		</UL>
+		</LI>
+		<LI>Download JDK 5.0 from java.sun.com.</LI>
+		<LI>From $HOME/tuscany run jdk-1_5_0_06-linux-i586.bin, this will extract the JDK in $HOME/tuscany/jdk1.5.0_06.</LI>
+		<LI>Configure your environment:
+		<UL>
+			<LI>export JAVA_HOME=$HOME/tuscany/jdk1.5.0_06</LI>
+			<LI>PATH=$JAVA_HOME/bin:$PATH</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>Libxml2 2.6.20 or later.Libxml2 is already in most Linux distros, just check that you have version 2.6.20 or later. To see which version of libxml2 is installed on your system do rpm -aq | grep libxml2.
+	<UL>
+		<LI>Configure your environment:
+		<UL>
+			<LI>export LIBXML2_LIB=/usr/lib</LI>
+			<LI>export LIBXML2_INCLUDE=/usr/include/libxml2</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+	<LI>Axis2C version 0.92.
+	<UL>
+		<LI>Download axis2c-bin-0.92-linux.tar.gz from Apache.org.</LI>
+		<LI>From $HOME/Tuscany do tar xzf axis2c-bin-0.92-linux.tar.gz, this will install Axis2C in $HOME/Tuscany/axis2c-bin-0.92-linux.</LI>
+		<LI>Configure your environment:
+		<UL>
+			<LI>export AXIS2C_HOME=$HOME/tuscany/axis2c-bin-0.92-linux</LI>
+			<LI>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AXIS2C_HOME/lib</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</OL>
+
+
+<H4><A name="SCANativeDeveloperGuide-Windows"></A><A name="SCANativeDeveloperGuide-SetupWindows"></A> Windows</H4>
+
+<P> These steps take no more than 15 mns to complete,starting from scratch. After you complete them, you should be all set to build the Tuscany C++ runtime.</P>
+
+<UL>
+	<LI>Right click on &quot;My Computer&quot; and select properties. Select the advanced tab and click on Enviroment Variables. Under User Variables, click on new.</LI>
+	<LI>In variable name type ANT_HOME</LI>
+	<LI>In variable value insert the path to where you expanded apache ant. EG, &quot;C:\tuscany\apache-ant-1.6.5&quot; and hit ok.</LI>
+</UL>
+
+
+<UL>
+	<LI>Now select the User variable PATH. Select new if it doesn't already create it.</LI>
+	<LI>Append to the end the path to the apache-ant bin directory. EG, &quot;C:\tuscany\apache-ant-1.6.5\bin;&quot;</LI>
+	<LI>Select ok and close the windows.</LI>
+</UL>
+
+
+<UL>
+	<LI>Run the JDK installer.</LI>
+	<LI>Right click on &quot;My Computer&quot; and select properties. Select the advanced tab and click on Enviroment Variables. Under User Variables, click on new.</LI>
+</UL>
+
+
+<UL>
+	<LI>In variable name type JAVA_HOME</LI>
+	<LI>In variable value insert the path to where you installed java. EG, &quot;C:\Program Files\Java\jdk1.5.0_07&quot;</LI>
+	<LI>Select ok and close the windows.</LI>
+</UL>
+
+
+
+<H3><A name="SCANativeDeveloperGuide-SystemRequirements"></A><A name="SCANativeDeveloperGuide-SystemRequirements"></A> System Requirements</H3>
+
+<P>In order to run the Tuscany Native runtimes there are some minimum system requirements:</P>
+
+<TABLE class="wiki-table" cellpadding="0" cellspacing="0" border="0"><TR><TH><TR><TD><P>Operating System</P></TD></TH></TR><TR class="table-odd"><TD><TD><UL></TD></TR><TR class="table-even"><TD><LI>Windows XP SP2</LI></TD></TR><TR class="table-odd"><TD><LI>Linux</LI></TD></TR><TR class="table-even"><TD></UL></TD></TR><TR class="table-odd"><TD></TD></TR></TD></TR><TR class="table-even"><TD><TR><TD><P>Other components</P></TD></TD></TR><TR class="table-odd"><TD><TD><UL></TD></TR><TR class="table-even"><TD><LI><A href="http://ws.apache.org/axis2/c/" class="external-link" rel="nofollow">Apache Axis2/C verion 0.92</A></LI></TD></TR><TR class="table-odd"><TD><LI><A href="http://xmlsoft.org/downloads.html" class="external-link" rel="nofollow">Libxml2 Parser version 2.6.20</A></LI></TD></TR><TR class="table-even"><TD></UL></TD></TR><TR class="table-odd"><TD></TD></TR></TD></TR></TABLE>
+
+
+<H3><A name="SCANativeDeveloperGuide-Buildingthesourcecode"></A><A name="SCANativeDeveloperGuide-Building"></A> Building the source code</H3>
+
+<P>The builds use the GNU automake + configure tools, which nicely analyze your environment and generate all the make files you need.</P>
+
+<P>To build the SDO C++ runtime:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd $HOME/tuscany/cpp/sdo
+./autogen.sh
+./configure --prefix=$TUSCANY_SDOCPP --enable-<SPAN class="code-keyword">static</SPAN>=no
+make
+make install
+cd $HOME/tuscany/cpp/sdo/samples
+./autogen.sh
+./configure --prefix=$TUSCANY_SDOCPP --enable-<SPAN class="code-keyword">static</SPAN>=no
+make
+make install
+</PRE>
+</DIV></DIV>    
+
+<P>Note: Tuscany already has build.sh scripts that do all of this for you, but I wanted to use the individual commands to understand what was going on at each step. Also, when you make code changes in general you just run make and make install and not the whole set of steps.</P>
+
+<P>To run the the SDO test suite:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd $HOME/tuscany/cpp/sdo
+./sdotest.sh
+</PRE>
+</DIV></DIV>
+
+<P>To build the SCA C++ runtime:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd $HOME/tuscany/cpp/sca
+./autogen.sh
+./configure --prefix=$TUSCANY_SCACPP --enable-<SPAN class="code-keyword">static</SPAN>=no
+make
+make install
+cd $HOME/tuscany/cpp/sdo/samples
+./autogen.sh
+./configure --prefix=$TUSCANY_SCACPP --enable-<SPAN class="code-keyword">static</SPAN>=no
+make
+make install
+</PRE>
+</DIV></DIV>
+
+<P>To run the SCA runtime tests:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd $HOME/tuscany/cpp/sdo
+./scatest.sh
+</PRE>
+</DIV></DIV>
+
+<P>To run the SCA calculator sample:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+cd $HOME/tuscany/cpp/sca/deploy/samples/Calculator/deploy/bin
+./runclient.sh
+</PRE>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-documentation-menu.html b/site/trunk/site-publish/sca-native-documentation-menu.html
new file mode 100644
index 0000000000..3bbe2ac0a8
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-documentation-menu.html
@@ -0,0 +1,143 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56254">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SCANativeDocumentationMenu-SCANativeDocumentation"></A>SCA Native Documentation</H1>
+
+<P><A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/README" class="external-link" rel="nofollow">README</A><BR>
+Rough guide to the Tuscany SCA C++ source tree.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/INSTALL" class="external-link" rel="nofollow">INSTALL</A><BR>
+How to build and install the Tuscany SCA C++ runtime.</P>
+
+<P><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow">OASIS Service Component Architecture / Assembly Specification</A><BR>
+The latest SCA Assembly specification documents (v1.1 - published drafts)</P>
+
+<P><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow">OASIS Service Component Architecture / C and C++ Specifications</A><BR>
+The latest SCA C and C++ language binding specification documents (v1.1 - published drafts)</P>
+
+<P><A href="http://www.osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">Open SOA Service Component Architecture Specifications</A><BR>
+Older SCA specification documents (v1.0)</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-faq.html b/site/trunk/site-publish/sca-native-faq.html
new file mode 100644
index 0000000000..9d2411ea36
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-faq.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50983">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native FAQ">SCA Native FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><B>This page contains frequently asked questions for SCA native project.</B><BR>
+Please follow use the following template to enhance this page.</P>
+
+<H4><A name="SCANativeFAQ-Questiontext"></A>Question text</H4>
+<P>Answer text</P>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-found-a-bug.html b/site/trunk/site-publish/sca-native-found-a-bug.html
new file mode 100644
index 0000000000..4f8c4d1bde
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-found-a-bug.html
@@ -0,0 +1,155 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Found a Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56436">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Found a Bug">SCA Native Found a Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SCANativeFoundaBug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="SCANativeFoundaBug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SCANativeFoundaBug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="SCANativeFoundaBug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-get-involved.html b/site/trunk/site-publish/sca-native-get-involved.html
new file mode 100644
index 0000000000..d755ef0471
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-get-involved.html
@@ -0,0 +1,228 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56435">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Get Involved">SCA Native Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SCANativeGetInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="SCANativeGetInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-incubator-m2.html b/site/trunk/site-publish/sca-native-incubator-m2.html
new file mode 100644
index 0000000000..e239736330
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-incubator-m2.html
@@ -0,0 +1,166 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Incubator-M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56462">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-releases.html" title="SCA Native Releases">SCA Native Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Incubator-M2">SCA Native Incubator-M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCANativeIncubator-M2-SCANativeIncubatorM2"></A>SCA Native Incubator-M2</H3>
+
+<P>The SCA Native Incubator-M2 was released in Nov 2006.</P>
+
+<H3><A name="SCANativeIncubator-M2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany SCA C+&#43; M2 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">tuscany_sca_cpp-1.0-incubator-M2-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA C+&#43; M2 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany_sca_cpp-1.0-incubator-M2-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sca_cpp-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCANativeIncubator-M2-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany SCA C+&#43; M2 <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP </A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Tuscany SCA C+&#43; M2 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5 </A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sca_cpp-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP </A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-incubator-m3.html b/site/trunk/site-publish/sca-native-incubator-m3.html
new file mode 100644
index 0000000000..32b3dd5ef3
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-incubator-m3.html
@@ -0,0 +1,164 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Incubator-M3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56066">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-releases.html" title="SCA Native Releases">SCA Native Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Incubator-M3">SCA Native Incubator-M3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SCANativeIncubator-M3-SCANativeIncubatorM3"></A>SCA Native Incubator-M3</H3>
+<P>The SCA Native Incubator-M3 was released in May 2007.</P>
+<H3><A name="SCANativeIncubator-M3-Windows%26nbsp%3B"></A>Windows&nbsp;</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-bin.zip</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCANativeIncubator-M3-LinuxandMacOSX"></A>Linux and Mac OS X</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Sugnature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3<BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-src.tar.gz</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-previous-releases.html b/site/trunk/site-publish/sca-native-previous-releases.html
new file mode 100644
index 0000000000..d567773141
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-previous-releases.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56463">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="sca-native-releases.html" title="SCA Native Releases">SCA Native Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Previous Releases">SCA Native Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-native-incubator-m2.html" title="SCA Native Incubator-M2"><B>SCA Native Incubator-M2</B>, <EM>(Nov, 2006)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-releases.html b/site/trunk/site-publish/sca-native-releases.html
new file mode 100644
index 0000000000..8d9bb30824
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-releases.html
@@ -0,0 +1,198 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56440">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Releases">SCA Native Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCANativeReleases-LatestRelease"></A>Latest Release</H2>
+
+<H3><A name="SCANativeReleases-SCANativeIncubatorM3"></A>SCA Native Incubator-M3</H3>
+<P>The SCA Native Incubator-M3 was released in May 2007.</P>
+<H3><A name="SCANativeReleases-Windows%26nbsp%3B"></A>Windows&nbsp;</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-bin.zip</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sca_native-1.0-incubator-M3-src.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SCANativeReleases-LinuxandMacOSX"></A>Linux and Mac OS X</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Sugnature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SCA Native M3<BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz" class="external-link" rel="nofollow">tuscany_sca_native-1.0-incubator-M3-src.tar.gz</A> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sca_native-1.0-incubator-M3-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="SCANativeReleases-PreviousReleases"></A>Previous Releases</H2>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh"> Release Name </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>1.</B> <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="sca-native-incubator-m2.html" title="SCA Native Incubator-M2"><B>SCA Native Incubator-M2</B>, <EM>(Nov, 2006)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-subproject-menu.html b/site/trunk/site-publish/sca-native-subproject-menu.html
new file mode 100644
index 0000000000..e66685b87e
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-subproject-menu.html
@@ -0,0 +1,124 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56220">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Subproject Menu">SCA Native Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-native.html" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native-subproject.html b/site/trunk/site-publish/sca-native-subproject.html
new file mode 100644
index 0000000000..0d76ddf25e
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-subproject.html
@@ -0,0 +1,119 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Native Subproject : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45202">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Subproject">SCA Native Subproject</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="" title="SCA Native Subproject">SCA Native Home</A><BR>
+<A href="sca-native-faq.html" title="SCA Native FAQ">FAQ</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+
+<H4><A name="SCANativeSubproject-TuscanySCANative"></A>Tuscany SCA Native</H4>
+
+<P>Tuscany SCA native is an extesible SCA runtime implementation written in C++ that supports component implementations written in:</P>
+<UL>
+	<LI>C++ (as defined in the <SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforCpp_V0.95.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">Service Component Architecture specification for C++ developers<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>)</LI>
+	<LI>Ruby</LI>
+	<LI>Python</LI>
+	<LI>PHP (under development)</LI>
+</UL>
+
+
+<P><B>Bindings - used for services and references</B><BR>
+Apache SOAP/Axis2c<BR>
+REST</P>
+
+<P><B>Data Bindings - for handling data</B><BR>
+SDO<BR>
+Axiom</P>
+
+
+<P>To try it out, we recommend using the latest SCA Native Milestone release available from our <A href="sca-downloads.html" title="SCA Downloads">downloads page</A>.  </P>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-native-user-guide.html b/site/trunk/site-publish/sca-native-user-guide.html
new file mode 100644
index 0000000000..00a6f6974f
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-user-guide.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Native User Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56441">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native-subproject.html" title="SCA Native Subproject">SCA Native Subproject</A>&nbsp;&gt;&nbsp;<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">SCA Native Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native User Guide">SCA Native User Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-native-work-in-progress.html b/site/trunk/site-publish/sca-native-work-in-progress.html
new file mode 100644
index 0000000000..4baace80dc
--- /dev/null
+++ b/site/trunk/site-publish/sca-native-work-in-progress.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native Work-in-progress</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56601">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native.html" title="SCA Native">SCA Native</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native Work-in-progress">SCA Native Work-in-progress</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-native.html b/site/trunk/site-publish/sca-native.html
new file mode 100644
index 0000000000..4cd6c564f3
--- /dev/null
+++ b/site/trunk/site-publish/sca-native.html
@@ -0,0 +1,141 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Native</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45202">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Native">SCA Native</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-native-get-involved.html" title="SCA Native Get Involved">Get Involved</A><BR>
+<A href="sca-native-found-a-bug.html" title="SCA Native Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Native</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SCA Native">SCA Native Home</A><BR>
+<A href="sca-native-releases.html" title="SCA Native Releases">Downloads</A><BR>
+<A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+
+<H4><A name="SCANative-TuscanySCANative"></A>Tuscany SCA Native</H4>
+
+<P>Tuscany SCA Native is an SCA runtime implementation written in C++.</P>
+
+<P>It supports SCA components written in C+&#43; and Python (other languages under construction.)</P>
+
+<P>SCA bindings are available for REST, JSON-RPC, ATOM Pub and SOAP.</P>
+
+<P>Releases can be dowloaded from our <A href="http://tuscany.apache.org/sca-native-releases.html" class="external-link" rel="nofollow">Downloads</A> page.</P>
+
+<P>Source code can be found in our Subversion <A href="https://svn.apache.org/repos/asf/tuscany/sca-cpp/" class="external-link" rel="nofollow">repository</A>.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-overview-sandbox.html b/site/trunk/site-publish/sca-overview-sandbox.html
new file mode 100644
index 0000000000..2eeecd7839
--- /dev/null
+++ b/site/trunk/site-publish/sca-overview-sandbox.html
@@ -0,0 +1,130 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Overview - sandbox</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47507">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Overview - sandbox">SCA Overview - sandbox</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>SCA provides developers with a simple, business-oriented, model for creating systems based on a service oriented architecture. It manages infrastructure complexities such as transactions, security and reliable messaging and frees the developer to focus on providing business function. The solutions developed using SCA can be changed declaratively to alter infrastructure capabilities or application configuration properties to meet changing business requirements. For example, infrastructure capabilities such as security policies may change from one environment to another and can be changed without the need for re-implementation. Application configuration may also be changed in this way, for example, the currency quoted by a stock quote feed may be changed though the SCA configuration mechanism.</P>
+
+<P>SCA divides up the steps in building a service-oriented application into two major parts:</P>
+
+<UL>
+	<LI>The Implementation of components which provide services and consume other services. SCA supports service implementations written using any one of many programming languages, both including conventional object-oriented and procedural languages such as Javatm, PHP, C ++. XML-centric languages such as BPEL and XSLT, and also declarative languages such as SQL and XQuery. SCA also supports a range of programming styles, including asynchronous and message-oriented styles, in addition to the synchronous call-and-return style.</LI>
+</UL>
+
+
+<UL>
+	<LI>The Assembly of sets of components to build composite business applications that addresses specific business requirements. This is performed by wiring together the service implementation components.</LI>
+</UL>
+
+
+<P>Tuscany implements SCA in Java and C++. For more information about each implementation or to get involved please refer to the following links.<BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Sandbox%20SCA%20Java" class="external-link" rel="nofollow">SCA Java</A><BR>
+&lt;link to C++ SCA&gt;</P>
+
+<P>A PHP implementation for SCA is also available at &lt;link for PECL&gt;.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-overview.data/Tuscany-Overview-0407.pdf b/site/trunk/site-publish/sca-overview.data/Tuscany-Overview-0407.pdf
new file mode 100644
index 0000000000..464204178f
--- /dev/null
+++ b/site/trunk/site-publish/sca-overview.data/Tuscany-Overview-0407.pdf
diff --git a/site/trunk/site-publish/sca-overview.data/getting_started_Rest_099_07.pdf b/site/trunk/site-publish/sca-overview.data/getting_started_Rest_099_07.pdf
new file mode 100644
index 0000000000..3a628e1d6e
--- /dev/null
+++ b/site/trunk/site-publish/sca-overview.data/getting_started_Rest_099_07.pdf
diff --git a/site/trunk/site-publish/sca-overview.html b/site/trunk/site-publish/sca-overview.html
new file mode 100644
index 0000000000..463f10e072
--- /dev/null
+++ b/site/trunk/site-publish/sca-overview.html
@@ -0,0 +1,173 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Overview</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47534">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Overview">SCA Overview</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SCAOverview-WhatisSCA%3F"></A>What is SCA?</H3>
+
+<P>SCA is a programming model for abstracting business functions as components and using them as building blocks to assemble business solutions. An SCA component offers services and depends on functions that are called references. It also has an implementation associated it with it which is the business logic that can be implemented in any technology. </P>
+
+<P>SCA provides a declarative way to describe how the services in an assembly interact with one another and what quality of services (security, transaction, etc) is applied to the interaction.  Since service interaction and quality of service is declarative, solution developers remain focus on business logic and therefore development cycle is simplified and shortened. This also promotes the development of reusable services that can be used in different contexts.  For example, a shopping cart service can be used in a retail application or a travel application without changing. Services can interact with one another synchronously or asynchronously and can be implemented in any technology.</P>
+
+<P>SCA also brings flexibility to deployment. A solution assembled with SCA is deployed as a unit and can be distributed over one or more nodes in the network and can be reconfigured without programming changes. </P>
+
+<P>Applications that adopt SCA programming model can interact with non-SCA applications. Meaning non-SCA application can call into SCA enabled applications and SCA enabled applications can call out into non-SCA enabled applications.</P>
+
+<P>Apache Tuscany SCA is implemented in <A href="http://tuscany.apache.org/sca-java.html" class="external-link" rel="nofollow">Java</A>  and <A href="http://tuscany.apache.org/sca-native.html" class="external-link" rel="nofollow">C++ (referred to as Native) </A>. </P>
+
+<P>SCA is in the process of becoming a standard through OASIS open CSA.<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"><B>Build your first SCA application in 10 minutes!</B> <A href="getting-started-with-tuscany.html" title="Getting Started with Tuscany">Give it a try</A></P>
+
+<P><A href="" title="SCA Overview">SCA business values?</A></P>
+
+
+<H3><A name="SCAOverview-LearnMoreaboutSCA"></A>Learn More about SCA</H3>
+
+<UL>
+	<LI><A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" class="external-link" rel="nofollow">Introducing SCA</A>, David Chappell and Associates  ** Excellent introduction</LI>
+	<LI><A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part1.pdf?version=1" class="external-link" rel="nofollow">OASIS SCA Tutorial Part 1</A>, Given at the 2007 OASIS Symposium held in San Diego in April 2007</LI>
+	<LI><A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part2.pdf?version=1" class="external-link" rel="nofollow">OASIS SCA Tutorial Part 2 - focus on policies</A>,Given at the 2007 OASIS Symposium held in San Diego in April 2007</LI>
+	<LI><A href="http://webservices.sys-con.com/read/325183.htm" class="external-link" rel="nofollow">What is SCA? A quick view of concepts through and an example walkthrough </A>, Java Developer Journal, Article by Simon Laws, Raymond Feng, Haleh Mahbod</LI>
+	<LI><A href="http://java.sys-con.com/read/458183.htm" class="external-link" rel="nofollow">Building SOA with Tuscany SCA, A simple service-oriented infrastructure</A>, Java Developer Journal, Article by Simon Laws, Raymond Feng, Haleh Mahbod</LI>
+	<LI><A href="http://www.ddj.com/architect/201202701" class="external-link" rel="nofollow">Service-Component Architectures-A programming model for SOA</A>, Dr Dobb's Portal, August 2007</LI>
+	<LI>You can also find various white papers and articles on www.osoa.org <A href="http://www.osoa.org/display/Main/SCA%20Resources" class="external-link" rel="nofollow">SCA Resources </A> about SCA.</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca-releases.html b/site/trunk/site-publish/sca-releases.html
new file mode 100644
index 0000000000..cee4a3fcf8
--- /dev/null
+++ b/site/trunk/site-publish/sca-releases.html
@@ -0,0 +1,102 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Releases : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55776">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Releases">SCA Releases</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentations</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java</A><BR>
+<A href="sca-native-subproject.html" title="SCA Native Subproject">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="SCAReleases-SCAJavaReleases"></A>SCA Java Releases</H2>
+
+<OL>
+	<LI><B><A href="sca-java-releases.html" title="SCA Java Releases">0.90-incubating </A><A href="sca-java-releases.html" title="SCA Java Releases"><EM>(June 1st, 2007)</EM></A></B></LI>
+</OL>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-subproject-menu.html b/site/trunk/site-publish/sca-subproject-menu.html
new file mode 100644
index 0000000000..f056998b28
--- /dev/null
+++ b/site/trunk/site-publish/sca-subproject-menu.html
@@ -0,0 +1,81 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCA Subproject Menu : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55873">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Subproject Menu">SCA Subproject Menu</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Releases&linkCreation=true&fromPageId=55873" title="Create Page: SCA Java Releases" class="createlink">Downloads<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-documentation.html" title="SCA Java Documentation">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sca-videos.html b/site/trunk/site-publish/sca-videos.html
new file mode 100644
index 0000000000..f96c702b8f
--- /dev/null
+++ b/site/trunk/site-publish/sca-videos.html
@@ -0,0 +1,211 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA Videos</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=96331">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCA Videos">SCA Videos</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SCAVideos-SCAVideoSeries"></A>SCA Video Series</H1>
+
+<P>On this web site, look for the <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> symbol for Tuscany topics with video.</P>
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Dan Becker, (Length 4:50), Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A><BR>
+A guide to the Tuscany web pages, blogs, mailing lists, and wikis.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/3068" class="external-link" rel="nofollow">&quot;SCA in a Nutshell&quot;, Jean-Sebastien Delfino, (Length 9:23), Vcasmo site (password <B>tuscany</B>)</A><BR>
+Introduces you to SCA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/3126" class="external-link" rel="nofollow">&quot;SCA Quick Tour&quot;, Jean-Sebastien Delfino, (Length 15:04), Vcasmo site (password <B>tuscany</B>)</A><BR>
+Introduces you to SCA concepts: Construct, Assemble and Deploy</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/3125" class="external-link" rel="nofollow">&quot;Apache Tuscany Overview&quot;, Jean-Sebastien Delfino, (Length 7:04), Vcasmo site (password <B>tuscany</B>)</A><BR>
+Introduction to Tuscany</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/3216" class="external-link" rel="nofollow">&quot;SCA Specification Overview Part 1&quot;, Jean-Sebastien Delfino, (Length 19:08), Vcasmo site (password <B>tuscany</B>)</A><BR>
+Covers the construction part of SCA. Assembly and deployment is covered in part 2 video.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://vcasmo.com/video/beckerdo/3215" class="external-link" rel="nofollow">&quot;SCA Specification Overview Part 2&quot;, Jean-Sebastien Delfino, (Length 25:24), Vcasmo site (password <B>tuscany</B>)</A><BR>
+Covers Assembly and deployment part of SCA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/x/RXoB" class="external-link" rel="nofollow">&quot;Get Started with Store Demo in Eclipse&quot;, Dan Becker, (Length 10:00)</A><BR>
+A step-by-step walk through of the Store Demo in Eclipse.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/x/N38B" class="external-link" rel="nofollow">&quot;Installing the Apache Tuscany Eclipse Plugins&quot;, Dan Becker, (Length 02:05)</A><BR>
+A quick step-by-step walk through of downloading, installing, and verifying the Tuscany Eclipse Plugins.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/x/O38B" class="external-link" rel="nofollow">&quot;Creating Your First Web Service with Apache Tuscany&quot;, Dan Becker, (Length 05:20)</A><BR>
+A desktop demonstration of creating a web service with Apache Tuscany in Eclipse.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/x/1YMB" class="external-link" rel="nofollow">&quot;Features of the Apache Tuscany Eclipse Plugins&quot;, Dan Becker, (Length 07:15)</A><BR>
+See the ease-of-use features of the Tuscany Eclipse Plugin using the Calculator sample.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://download.eclipse.org/stp/documents/sca/090910SCAToolsDemo.htm" class="external-link" rel="nofollow">SCA Tools 2.0.1 Quick Tour (video - about 7 minutes)</A><BR>
+See the ease-of-use features of the Eclipse SCA Tools project.</LI>
+</UL>
+
+</TD> </TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100???.pdf b/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100???.pdf
new file mode 100644
index 0000000000..3c8881fff8
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100???.pdf
diff --git a/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100中文版.pdf b/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100中文版.pdf
new file mode 100644
index 0000000000..3c8881fff8
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_AssemblyModel_V100中文版.pdf
diff --git a/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs???.pdf b/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs???.pdf
new file mode 100644
index 0000000000..0398ec6d3d
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs???.pdf
diff --git a/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs中文版.pdf b/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs中文版.pdf
new file mode 100644
index 0000000000..0398ec6d3d
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_JavaAnnotationsAndAPIs中文版.pdf
diff --git a/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100???.pdf b/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100???.pdf
new file mode 100644
index 0000000000..733a343bba
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100???.pdf
diff --git a/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100中文版.pdf b/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100中文版.pdf
new file mode 100644
index 0000000000..733a343bba
--- /dev/null
+++ b/site/trunk/site-publish/sca.data/SCA_JavaComponentImplementation_V100中文版.pdf
diff --git a/site/trunk/site-publish/sca.html b/site/trunk/site-publish/sca.html
new file mode 100644
index 0000000000..36a91ede9a
--- /dev/null
+++ b/site/trunk/site-publish/sca.html
@@ -0,0 +1,119 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SCA规范中文版</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=96720">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal</A>&nbsp;&gt;&nbsp;<A href="" title="SCA规范中文版">SCA规范中文版</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>&nbsp;SCA相关规范的中文文档经过大家的努力，终于完成了，会陆续发布。</P>
+
+<P>本次翻译活动由满江红开放技术研究组织 (<A href="http://www.redsaga.com/" class="external-link" rel="nofollow">http://www.redsaga.com</A>) 和 SOA 中文社区 ( O <A href="http://www.osoa.org/pages/viewpage.action?pageId=416" class="external-link" rel="nofollow">http://www.osoa.org/pages/viewpage.action?pageId=416</A>)&nbsp; 共同发起、组织，并得到goCom社区(<A href="http://www.gocom.cc/" class="external-link" rel="nofollow">http://www.gocom.cc/</A>)的赞助，在此感谢大家的辛勤劳动。</P>
+
+<P>&nbsp;相关下载：<BR>
+<A href="sca.data/SCA_AssemblyModel_V100%E4%B8%AD%E6%96%87%E7%89%88.pdf">AssemblyModel 装配模型规范</A><BR>
+<A href="sca.data/SCA_JavaComponentImplementation_V100%E4%B8%AD%E6%96%87%E7%89%88.pdf">JavaComponentImplementation JAVA构件实现规范</A><BR>
+<A href="sca.data/SCA_JavaAnnotationsAndAPIs%E4%B8%AD%E6%96%87%E7%89%88.pdf">JavaAnnotationsAndAPIs JAVA通用注解和API规范</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/scajava-tutorial.html b/site/trunk/site-publish/scajava-tutorial.html
new file mode 100644
index 0000000000..85fe3c86f1
--- /dev/null
+++ b/site/trunk/site-publish/scajava-tutorial.html
@@ -0,0 +1,80 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SCAJava-Tutorial : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=81342">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SCAJava-Tutorial">SCAJava-Tutorial</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>This page will be used for SCA Java Tutorial</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/scajavabusinessexceptions.html b/site/trunk/site-publish/scajavabusinessexceptions.html
new file mode 100644
index 0000000000..f5a3e45b87
--- /dev/null
+++ b/site/trunk/site-publish/scajavabusinessexceptions.html
@@ -0,0 +1,141 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SCAJavaBusinessExceptions</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="SCAJavaBusinessExceptions">SCAJavaBusinessExceptions</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SCAJavaBusinessExceptions</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43968">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43968">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=43968">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=43968">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=43968">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=43968">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=cr22rc">Rick R.</A>, last edited by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A> on Feb 02, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=43968&originalId=44001">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H2><A name="SCAJavaBusinessExceptions-SupportingBusinessExceptions"></A>Supporting Business Exceptions</H2>
+<OL>
+	<LI>How to declare business exceptions.<BR>
+   What defines business exception on each interface type. (ie Java wsdl)<BR>
+   In Java interface, business exceptions are declared checked exceptions specified on the operations of the services interface.<BR>
+       Note declared unchecked (runtime) exceptions are not considered business exceptions.<BR>
+   WSDL need to determine if all WSDL defined faults are business exceptions.  Need to in investigate JAX-WS mapping of exceptions JAX-B databinding..<BR>
+  SDO has no similar specification.  Need to determine a similar means for SDO to provide reliable transforms between JAX-B and SDO.</LI>
+	<LI>How to represent business exceptions.<BR>
+    In  Java business exception are represented as non runtime exceptions. But not all runtime exceptions delivered in a message maybe a Business exception.<BR>
+    If a non runtime exceptions is delivered to a component that is does not declare the exception the exception will be wrappered in a specified runtime exception.<BR>
+    Jax-b need to further investigate the JAX-B specification and follow how it models business exceptions as objects.<BR>
+    SDO there are no specific mappings provided for.  May need to wrapper complex parts of an exception as  SDO objects in a specific Java exception.</LI>
+	<LI>How to transform business exceptions.<BR>
+      Provide in the data binding transformations between Axiom OMElement, SDO represented faults and JAX-B exceptions.<BR>
+     How to identify as business exceptions during the transforms.</LI>
+	<LI>How to propagate business exceptions.<BR>
+    Determine how to propagate  exception in the Tuscany  runtime message in local interactions. Make sure TargetInvocation exceptions become unwrappered<BR>
+    How in the case of webservice's binding propagate the message through web service binding. </LI>
+</OL>
+
+
+<P> <A href="feature-areas-and-what-folks-are-working-on.html" title="Feature areas and what folks are working on">BACK </A></P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-10-incubating.html b/site/trunk/site-publish/sdo-10-incubating.html
new file mode 100644
index 0000000000..e68669c0ef
--- /dev/null
+++ b/site/trunk/site-publish/sdo-10-incubating.html
@@ -0,0 +1,131 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SDO 1.0-incubating : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=63485">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO 1.0-incubating">SDO 1.0-incubating</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H3><A name="SDO1.0-incubating-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.0-incubating is the first such release<BR>
+with full coverage of the SDO 2.1 specification.</P>
+
+<P>In addition to adding the few remaining SDO 2.1 features not included in the<BR>
+1.0-incubating-beta1 release and fixing a number of bugs <BR>
+there are a number of new features relating to XML serialization, and new<BR>
+support for handling dynamic derivation from static classes.  There has also<BR>
+been significant focus on making the SDO sample programs more accessible.</P>
+
+<P>For the full change history take a look <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">here <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H3><A name="SDO1.0-incubating-Windows"></A>Windows</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+</TBODY></TABLE>
+
+<H3><A name="SDO1.0-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+<TD class="confluenceTd"> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">ASC<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> <SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">MD5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> </TD>
+</TR>
+</TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-c-documentation-menu.html b/site/trunk/site-publish/sdo-c-documentation-menu.html
new file mode 100644
index 0000000000..35f41a3801
--- /dev/null
+++ b/site/trunk/site-publish/sdo-c-documentation-menu.html
@@ -0,0 +1,136 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO C++ Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56496">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="sdo-c-subproject-menu.html" title="SDO C++ Subproject Menu">SDO C++ Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SDO C++ Documentation Menu">SDO C++ Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H4><A name="SDOC%2B%2BDocumentationMenu-SDOCDocuments"></A>SDO C++ Documents</H4>
+<P><A href="http://www.osoa.org/download/attachments/791/SDO_Specification_CPP_V2.01.pdf?version=1" class="external-link" rel="nofollow">SDO Specification for C++ V2.01</A><BR>
+The Service Data Objects specification for C++ Describes the data programming interfaces of SDO in the C++ language.</P>
+
+<P><A href="http://www.osoa.org/download/attachments/791/Next-Gen-Data-Programming-Whitepaper.pdf?version=1" class="external-link" rel="nofollow">SDO White Paper</A><BR>
+A white paper that explains the SDO programming model</P>
+
+<P><A href="http://www-128.ibm.com/developerworks/webservices/library/ws-sdo-api/" class="external-link" rel="nofollow">Introducing SDO for C++</A><BR>
+An article introducing the SDO for C++ API</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-c-get-involved.html b/site/trunk/site-publish/sdo-c-get-involved.html
new file mode 100644
index 0000000000..9117c1bb4a
--- /dev/null
+++ b/site/trunk/site-publish/sdo-c-get-involved.html
@@ -0,0 +1,118 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>SDO C++ Get Involved : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56477">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="sdo.html" title="SDO">SDO</A>&nbsp;&gt;&nbsp;<A href="" title="SDO C++ Get Involved">SDO C++ Get Involved</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SDOC%2B%2BGetInvolved-GettingInvolved"></A>Getting Involved</H3>
+
+<P>A successful project requires many people to play many roles, for example write code, documentation, test, provide suggestions or feedback. If you would like to become involved, join the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</P>
+
+<P><B>Here are some suggestions for getting started and welcome to the project.</B></P>
+
+<P>Read the overview pages for each <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subproject</A> and decide where you'd like to get involved.</P>
+
+<UL>
+	<LI>Contribute new ideas for improving Tuscany <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>.</LI>
+	<LI>Answer questions posted to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</LI>
+	<LI>Contribute to the FAQ under each subproject or to the wiki website.</LI>
+	<LI>Contribute to the user or developer documentation for each subproject on the wiki.</LI>
+	<LI>Investigate <A href="issue-tracking.html" title="Issue Tracking">bugs</A> that have been reported and provide patches.</LI>
+	<LI>Help with development for the next release of Apache Tuscany subprojects.</LI>
+</UL>
+
+
+<P>If in doubt about where to start, send a note to the mailing list and mention your area of interest. </P>
+
+<P>Please note that a single mailing list is used for all the subprojects.</P>
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <SPAN class="nobr"><A href="http://www.apache.org/foundation/how-it-works.html" title="Visit page outside Confluence" rel="nofollow">this link<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<TD class="confluenceTd" valign="top"></TD>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE></TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-c-releases.html b/site/trunk/site-publish/sdo-c-releases.html
new file mode 100644
index 0000000000..4af1c096c6
--- /dev/null
+++ b/site/trunk/site-publish/sdo-c-releases.html
@@ -0,0 +1,134 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO C++ Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56484">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SDO C++ Releases">SDO C++ Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<H2><A name="SDOC%2B%2BReleases-LatestRelease"></A>Latest Release</H2>
+<P><B>Add M3 info</B></P>
+
+<H2><A name="SDOC%2B%2BReleases-PreviousReleases"></A>Previous Releases</H2>
+<P>Here is a complete list of all Apache Tuscany SCA downloads:<BR>
+<B>Add previous releases info</B></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-c-subproject-menu.html b/site/trunk/site-publish/sdo-c-subproject-menu.html
new file mode 100644
index 0000000000..2386a8dee6
--- /dev/null
+++ b/site/trunk/site-publish/sdo-c-subproject-menu.html
@@ -0,0 +1,125 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO C++ Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56224">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO C++ Subproject Menu">SDO C++ Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cpp-documentation-menu.html b/site/trunk/site-publish/sdo-cpp-documentation-menu.html
new file mode 100644
index 0000000000..59f9143151
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cpp-documentation-menu.html
@@ -0,0 +1,131 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CPP Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56481">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CPP Documentation Menu">SDO CPP Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SDOCPPDocumentationMenu-SDOCDocumentation"></A>SDO C++ Documentation</H1>
+
+<P>Please help add documentation.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cpp-faq.html b/site/trunk/site-publish/sdo-cpp-faq.html
new file mode 100644
index 0000000000..481f90a7d8
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cpp-faq.html
@@ -0,0 +1,158 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CPP FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35043">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CPP FAQ">SDO CPP FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SDOCPPFAQ-TuscanySDOFrequentlyAskedQuestions"></A>Tuscany SDO - Frequently Asked Questions</H3>
+
+
+<OL>
+	<LI><B>Does SDO for C++ provide a static interface as the Java implementation does?</B><BR>
+No. It is not clear that this is a useful feature in a language like C++ so we have no plans to implement it.</LI>
+	<LI><B>How do I load an XML file using SDO static type?</B><BR>
+The basic pattern is fairly simple. 
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>  // Get hold of a helper context. This holds an XMLHelper instance
+  HelperContext scope = SDOUtil.createHelperContext();
+   
+  // Register all of the types we have generated into the HelperContext
+  GenerateFactory.INSTANCE.register(scope);
+
+  // A normal input stream to read the XML file
+  fis = new FileInputStream(&quot;some.xml&quot;);
+ 
+  // Use the HelperContext to get and XMLHelper and use this to load the XML
+  XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
+
+  // Now we have a document we can get the root object and cast it to the expected type
+  GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
+</PRE>
+</DIV></DIV>
+<P>There are some unit tests that show how to do this. You have to look in the tools tests cases as the Java static generator is in the tools project. Try looking in sdo\tools\src\test\java\org\apache\tuscany\sdo\test&#42;.java. </P></LI>
+</OL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cpp-found-a-bug.html b/site/trunk/site-publish/sdo-cpp-found-a-bug.html
new file mode 100644
index 0000000000..2f2c95c45d
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cpp-found-a-bug.html
@@ -0,0 +1,156 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CPP Found A Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56479">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CPP Found A Bug">SDO CPP Found A Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SDOCPPFoundABug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="SDOCPPFoundABug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SDOCPPFoundABug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="SDOCPPFoundABug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cpp-get-involved.html b/site/trunk/site-publish/sdo-cpp-get-involved.html
new file mode 100644
index 0000000000..3f7f44663c
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cpp-get-involved.html
@@ -0,0 +1,229 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CPP Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56477">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CPP Get Involved">SDO CPP Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-cpp.html" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SDOCPPGetInvolved-GettingInvolvedwithApacheTuscanyWelcome%21"></A>Getting Involved with Apache Tuscany - Welcome!</H3>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="80%">
+<P>Getting involved in the project is easy. First, any help is welcome and we are excited to help you come on board. Here are some suggestions for how you can get involved in Apache Tuscany. </P>
+
+<UL>
+	<LI>Tuscany consists of several <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>. Identify what areas you are interested in. Take a look at samples for that area.</LI>
+	<LI>Subscribe to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>. If you are interested to get involved at the user level, subscribe to user mailing list. If you are interested to get involved in the development of Tuscany, subscribe to the developer list. Rememer that you can always unsubscribe later.</LI>
+	<LI>Help answer questions posted to the user mailing list for areas that you are familiar with. Your real usage experience can be very valueable to other users as well as developers on the project.</LI>
+	<LI>Would like to get invovled in development? Have new ideas? Start with the mailing list and share your thoughts.</LI>
+	<LI>Contribute to feature developement. Just let the community know what you'd like to work on. It is as easy as that.</LI>
+	<LI>Identify <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRAs</A>in the area that you are interested in and provide <A href="http://tuscany.apache.org/issue-tracking.html" class="external-link" rel="nofollow">patches</A>.</LI>
+	<LI>Contribute to the user or developer documentation or website. Make your update on the on the <A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Wiki</A>, create a JIRA and attach the link for your update.</LI>
+	<LI>If in doubt about where to start, send a note to the mailing list and mention your area of interest. Any questions is welcomed. We'd like you to be involved!</LI>
+	<LI><B>If you are new to open source</B> and would like to learn more about how to work in open source, check <A href="http://tuscany.apache.org/working-in-open-source.html" class="external-link" rel="nofollow">this page</A>.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Provide feedback</B>: What is working well? What is missing? Get involved in creating software that addresses real pain points in SOA. Any help is good. Be part of the community.</LI>
+</UL>
+
+
+<P>You can get a quick overview of many Tuscany information resources by watching the video <A href="http://vcasmo.com/video/beckerdo/4177" class="external-link" rel="nofollow">&quot;A Tour of the Tuscany Information Resources&quot;, Vcasmo site (password <B>tuscany</B>)</A>, <A href="http://youtube.com/watch?v=jgC_597HrC0" class="external-link" rel="nofollow">You Tube</A>.</P>
+
+<P><B>communication</B></P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+	<LI>Pidgin <A href="http://www.pidgin.im/" class="external-link" rel="nofollow">http://www.pidgin.im/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+
+<H4><A name="SDOCPPGetInvolved-OpenCSA%28SCAstandards%29"></A>Open CSA (SCA standards)</H4>
+
+<P>The SCA specifications which are implemented by Tuscany have moved to OASIS for formal<BR>
+standardization.  This is being done as a series of OASIS technical<BR>
+committees, each dealing with one or more of aspects of the SCA specifications.</P>
+
+<P>The OASIS activities are carried out in public. You can either observe the activities in the various technical committees, or join one or more of the committees to contribute to.</P>
+
+<P>There are 6 SCA technical committees and by clicking on the links below you can find information about how to join as an observer or contributor. You will also have access to the minutes of meetings of the meetings on the same page.</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow"><B>OASIS SCA Assembly TC</B></A>: Defining core SCA composition model to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow"><B>OASIS SCAPolicy TC</B></A>:Defining an SCA policy framework to simplify SOA application development</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow"><B>OASIS SCA Bindings TC</B></A>:Standardizing bindings for SCA services and references to communication protocols, technologies and frameworks</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow"><B>OASIS SCA-Java TC</B></A>: Standardizing Java (tm) use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow"><B>OASIS SCA-C &amp; C++ TC</B></A>: Standardizing C and C++ use within an SCA domain for SOA</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow"><B>OASIS SCA BPEL TC</B></A>:Specifying how SCA component implementations for SOA can be written using BPEL</LI>
+</UL>
+
+
+<P>Each OASIS SCA TC mailing list archives can be found here:</P>
+
+<UL>
+	<LI><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">OASIS SCA TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">OASIS SCA Policy TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">OASIS SCA Binding TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">OASIS SCA-Java TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">OASIS SCA-C &amp; C++ TC mail archive</A></LI>
+	<LI><A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">OASIS SCA BEPL TC mail archive</A></LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cpp.html b/site/trunk/site-publish/sdo-cpp.html
new file mode 100644
index 0000000000..198c82850a
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cpp.html
@@ -0,0 +1,137 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CPP</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47550">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CPP">SDO CPP</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-cpp-get-involved.html" title="SDO CPP Get Involved">Get Involved</A><BR>
+<A href="sdo-cpp-found-a-bug.html" title="SDO CPP Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO C++</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SDO CPP">SDO C++ Home</A><BR>
+<A href="sdo-cpp-faq.html" title="SDO CPP FAQ">FAQ</A><BR>
+<A href="sdo-c-releases.html" title="SDO C++ Releases">Downloads</A><BR>
+<A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/cpp/sdo/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+<H3><A name="SDOCPP-TuscanySDOCsubproject"></A>Tuscany SDO C++ subproject</H3>
+
+<P>Tuscany SDO C++ is an implementation of the <A href="http://www.osoa.org/download/attachments/791/SDO_Specification_CPP_V2.01.pdf?version=1" class="external-link" rel="nofollow">Service Data Objects 2.01 specification for C++ developers</A>. To try it out, we recommend using the latest SDO C++ Milestone release available from our <A href="sdo-downloads.html" title="SDO Downloads">downloads page</A>. Alternatively, if you would like to work with the latest (possibly unstable) SDO C++ code, follow the general instructions for downloading and building SDO C++ from the Tuscany SVN repository.</P>
+
+<H3><A name="SDOCPP-GettingStartedwiththeSDOCMilestonerelease"></A>Getting Started with the SDO C++ Milestone release</H3>
+
+<P>If you haven't already done so, the first step is to download the latest SDO C++ Milestone release of Apache Tuscany from our downloads page.<BR>
+Please follow the Getting Started information found within the download packages to begin using Tuscany SDO C++</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-cts-overview.html b/site/trunk/site-publish/sdo-cts-overview.html
new file mode 100644
index 0000000000..97a7176eb1
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cts-overview.html
@@ -0,0 +1,163 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SDO CTS Overview</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CTS Overview">SDO CTS Overview</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SDO CTS Overview</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46768">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46768">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=46768">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=46768">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=46768">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=46768">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 12, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=46768&originalId=51439">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="SDOCTSOverview-WhatisServiceDataObjectCommunityTestSuite%28SDOCTS%29%3F"></A>What is Service Data Object Community Test Suite (SDO CTS)?</H3>
+
+<P>The SDO CTS provides a set of test that exercise <B>any</B> SDO 2.1 implementation. The tests validate an SDO implementation behaves as expected, according to the community's understanding of the SDO specification.</P>
+
+<P>The SDO CTS enables developers to choose or switch SDO implementations without the concern of having to re-code a significant proportion of their application due to differences between implementations. This community test suite is initially focues on areas seen as important to developers of SDO applications.</P>
+
+<P>Over time this will grow to include a larger proportion of the SDO specification according to the community's desire. The SDO CTS does not claim to be a validation or compliancy suite, nor does it endorse any specific implementation.</P>
+
+<P>If the SDO specification appears ambiguous or unclear then the community may decide what to do; it could decide to test the area with an agreed expected behaviour, or decide not to test this area. Ambiguities will be fed back to the specification group for clarification.</P>
+
+<H3><A name="SDOCTSOverview-Howtogetinvolved%3F"></A>How to get involved?</H3>
+<P>SDO users feedback and involvement would be greatly appreciated. Tell us what is important to you, and if you can provide test cases.</P>
+
+<P>Start by sending an email to the Tuscany Users &lt;tuscany-user at ws.apache.org&gt; mailing list, if possible add a [SDO CTS] at the start of the subject line to make it easier to spot.</P>
+
+<P>If you already have suitable test cases that you'd like to contribute, then go ahead and open an <EM>improvement</EM> in <SPAN class="nobr"><A href="http://issues.apache.org/jira/browse/TUScany" title="Visit page outside Confluence" rel="nofollow">our tracking system<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H3><A name="SDOCTSOverview-ObtainingandusingtheCTS"></A>Obtaining and using the CTS</H3>
+
+<P>Currently the SDO CTS is only available in source form from the subversion repository. You will need the following:</P>
+<UL>
+	<LI>A <SPAN class="nobr"><A href="http://subversion.tigris.org/" title="Visit page outside Confluence" rel="nofollow">subversion<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> client</LI>
+	<LI>A <SPAN class="nobr"><A href="http://maven.apache.org/" title="Visit page outside Confluence" rel="nofollow">Maven 2<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> build environment.</LI>
+</UL>
+
+
+<P>The code can be down loaded from <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/cts/" title="Visit page outside Confluence" rel="nofollow">the subversion repository<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> using :</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn co http:<SPAN class="code-comment">//svn.apache.org/repos/asf/incubator/tuscany/java/cts/</SPAN></PRE>
+</DIV></DIV>
+
+<P>The SDO CTS project currently contains two sub-projects:</P>
+<UL>
+	<LI>cts/sdo2.1 contains the acutal test cases</LI>
+	<LI>cts/sdo2.1-tuscany executes the test cases against the current Tuscany Implementation</LI>
+</UL>
+
+
+<P>To build the CST and run it against the Tuscany implementation all you need do is:</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">me@mine:~$ cd cts
+me@mine:~/cts$  mvn</PRE>
+</DIV></DIV>
+
+<P>If you would like to execute the SDO CTS against a different implementation then you will need to provide a helper class. For more info on this see the <A href="contributing-to-the-sdo-cts.html" title="Contributing to the SDO CTS">Contributing</A> section.</P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-cts.html b/site/trunk/site-publish/sdo-cts.html
new file mode 100644
index 0000000000..a6a09300a5
--- /dev/null
+++ b/site/trunk/site-publish/sdo-cts.html
@@ -0,0 +1,246 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO CTS</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46768">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SDO CTS">SDO CTS</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SDO Community Test Suite</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#SDOCTS-Definition">What is SDO Community Test Suite (SDO CTS)</A></LI>
+	<LI><A href="#SDOCTS-Howtogetinvolved%253F">How to get involved? </A></LI>
+	<LI><A href="#SDOCTS-ObtainingandusingtheCTS">Obtaining and using the CTS</A></LI>
+	<LI><A href="#SDOCTS-Runit">Running the CTS against Tuscany in Eclipse</A></LI>
+</UL>
+
+
+<P><BR class="atl-forced-newline">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SDOCTS-"></A><A name="SDOCTS-CoreDefinition"></A> <DIV class="" style="background-color: #C3CDA1;">What is SDO Community Test Suite (SDO CTS) </DIV>
+</H3>
+
+<P>The SDO CTS provides a set of test that exercise SDO 2.1 implementations. The tests validate an SDO implementation behaves as expected, according to the community's understanding of the SDO specification.</P>
+
+<P>The SDO CTS enables developers to choose or switch SDO implementations without the concern of having to re-code a significant proportion of their application due to differences between implementations. This community test suite is initially focused on areas seen as important to developers of SDO applications.</P>
+
+<P>Over time this will grow to include a larger proportion of the SDO specification according to the community's desire. The SDO CTS does not claim to be a validation or compliance suite, nor does it endorse any specific implementation.</P>
+
+<P>If the SDO specification appears ambiguous or unclear then the community may decide what to do; it could decide to test the area with an agreed expected behavior, or decide not to test this area. Ambiguities will be fed back to the specification group for clarification.</P>
+
+<H3><A name="SDOCTS-"></A><A name="SDOCTS-Howtogetinvolved%3F"></A> <DIV class="" style="background-color: #C3CDA1;">How to get involved?</DIV>
+</H3>
+<P>SDO users feedback and involvement would be greatly appreciated. Tell us what is important to you, and if you can provide test cases.</P>
+
+<P>Start by sending an email to the Tuscany Users' &lt;tuscany-user@ws.apache.org&gt; mailing list, if possible add a [SDO CTS] at the start of the subject line to make it easier to spot.</P>
+
+<P>If you already have suitable test cases that you'd like to contribute, then go ahead and open an <EM>improvement</EM> in <A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">our tracking system</A>.</P>
+
+<H3><A name="SDOCTS-"></A><A name="SDOCTS-ObtainingandusingtheCTS"></A> <DIV class="" style="background-color: #C3CDA1;">Obtaining and using the CTS</DIV>
+</H3>
+
+<P>Currently the SDO CTS is only available in source form from the subversion repository. You will need the following:</P>
+<UL>
+	<LI>A <A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">subversion</A> client</LI>
+	<LI>A <A href="http://maven.apache.org/" class="external-link" rel="nofollow">Maven 2</A> build environment.</LI>
+</UL>
+
+
+<P>The code can be downloaded from <A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk-cts/" class="external-link" rel="nofollow">the subversion repository</A> using :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+svn co http:<SPAN class="code-comment">//svn.apache.org/repos/asf/tuscany/sdo-java/trunk-cts/</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>The SDO CTS project currently contains two sub-projects:</P>
+<UL>
+	<LI>cts/sdo2.1 contains the actual test cases</LI>
+	<LI>cts/sdo2.1-tuscany executes the test cases against the current Tuscany Implementation</LI>
+</UL>
+
+
+<P>To build the CTS and run it against the Tuscany implementation all you need to do is:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+me@mine:~$ cd cts
+me@mine:~/cts$  mvn
+</PRE>
+</DIV></DIV>
+<P>Note that some users report that 0 tests are executed when performing these instructions.  This is reported in Jira <A href="https://issues.apache.org/jira/browse/TUSCANY-1249" class="external-link" rel="nofollow">TUSCANY-1249</A>. If you see these symptoms and have any insights please report them in the Jira.  An alternative means of running the tests is to run them from within the Eclipse platform as described below.</P>
+
+<P>If you would like to execute the SDO CTS against a different implementation then you will need to provide a helper class.</P>
+
+<H4><A name="SDOCTS-"></A><A name="SDOCTS-Runit"></A> <DIV class="" style="background-color: #C3CDA1;">Running the CTS against Tuscany in Eclipse</DIV>
+</H4>
+
+<P>Within the Tuscany svn repository there are two distinct source code hierarchies related to the CTS.  The first,  under the directory sdo2.1 is the real community test suite,  and the second,  sdo2.1-tuscany is the code that Tuscany uses to exercise the CTS. Another SDO implementation wishing to use the CTS would need to produce code similar to the Tuscany specific code to run the CTS tests against itself.  It is important to maintain the separation of these two source hierarchies,  so that no Tuscany code leaks into the generic CTS code, otherwise other SDO implementations would see compile failures in the core CTS because of the absence of the Tuscany code from their environment.</P>
+
+<P>If you are running and perhaps modifying the CTS in Eclipse then you can get help from Eclipse to ensure that this separation is maintained by setting up two Eclipse projects. By ensuring that there is a one way dependency of the Tuscany specific eclipse project on the CTS generic Eclipse project you will benefit from Eclipse signalling compile failures when an attempt is made to create an inappropriate dependency.</P>
+
+<UL>
+	<LI>In a command window in the root folder, issue the command &quot;mvn&quot; to compile the CTS artifacts and install them into your local maven repository</LI>
+	<LI>Change directory to the sdo2.1 directory and issue the command &quot;mvn eclipse:eclipse&quot;</LI>
+	<LI>Change directory to the sdo2.1-tuscany directory and issue the command &quot;mvn eclipse:eclipse&quot;</LI>
+	<LI>Open eclipse and import the two projects into your existing workspace
+	<UL>
+		<LI>Switch to the Java perspective</LI>
+		<LI>Execute &quot;File =&gt; Import ... =&gt; General =&gt; Existing project into workspace</LI>
+		<LI>Click &quot;Browse ...&quot; Navigate to the CTS/sdo2.1 directory and click OK</LI>
+		<LI>Select the sdo2.1-cts project and click OK</LI>
+	</UL>
+	</LI>
+	<LI>After Eclipse has built the project you may see that there are compile errors.  This is because Maven has created build dependencies for the project on the contents of your maven repository,  but Eclipse doesn't yet know where that repository is.  If you see this, you must create and assign a value to the M2_REPO variable within eclipse to resolve these dependencies
+	<UL>
+		<LI>Right click in the Package Explorer frame on the root of the newly created project and select Properties =&gt; Java Build Path</LI>
+		<LI>Click on the &quot;Libraries&quot; tab and select &quot;Add Variable...&quot;, &quot;Configure Variables ...&quot;, &quot;New ...&quot;</LI>
+		<LI>Set Name to M2_REPO and Click on &quot;Folder...&quot;</LI>
+		<LI>Navigate to the &quot;repository&quot; folder/directory (on Windows this is \Documents and Settings\&lt;user&gt;\.m2\repository, on Linux it is ~/.m2/repository) and click OK</LI>
+		<LI>Accept the request for doing a full rebuild</LI>
+		<LI>Cancel away from the &quot;Configure Variables&quot; dialog</LI>
+		<LI>Click &quot;OK&quot; on the Project Properties Window</LI>
+		<LI>When building is complete the project should now have no errors</LI>
+	</UL>
+	</LI>
+	<LI>Now you need to import the Tuscany specific CTS project in the same way, by navigating to the sdo2.1-tuscany folder and importing the sdo2.1-tuscany project</LI>
+	<LI>Next,  add a dependency for the Tuscany specific Eclipse project on the generic CTS Eclipse project
+	<UL>
+		<LI>Right click on the sdo2.1-tuscany project in the Package Explorer frame of the Eclipse Java perspective, and select &quot;Properties&quot;</LI>
+		<LI>Click on the &quot;Java Build Path&quot; option, and then the &quot;Projects&quot; tab</LI>
+		<LI>Click &quot;Add..&quot; and select the sdo2.1-cts project (Note that if you are also developing the tuscany implementation then you may wish to also select your sdo implementation and api projects at this point)</LI>
+		<LI>Click OK twice, and wait for the Eclipse compilation operation to complete</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Now you can edit the CTS generic code, and the Tuscany harness, and any inadvertent attempt to introduce Tuscany dependencies on the generic CTS project will result in red flags from Eclipse due to compilation failures.</P>
+
+<P>To execute the two main suites of tests in the CTS against Tuscany you must run either</P>
+<UL>
+	<LI>test.sdo21.vendor.tuscany.tests.AdoptedCtsTestSuite or</LI>
+	<LI>test.sdo21.vendor.tuscany.tests.OptionalCtsTestSuite<BR>
+in the Tuscany specific project.</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-das-menu.html b/site/trunk/site-publish/sdo-das-menu.html
new file mode 100644
index 0000000000..4928b0eaed
--- /dev/null
+++ b/site/trunk/site-publish/sdo-das-menu.html
@@ -0,0 +1,141 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO-DAS Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=102271">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO-DAS Menu">SDO-DAS Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-downloads.html b/site/trunk/site-publish/sdo-downloads.html
new file mode 100644
index 0000000000..67c1774890
--- /dev/null
+++ b/site/trunk/site-publish/sdo-downloads.html
@@ -0,0 +1,735 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Downloads</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48669">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="main-menu.html" title="Main Menu">Main Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Downloads">SDO Downloads</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+
+<P>
+This section provides information on downloads related to Tuscany SDO
+</P>
+
+<TABLE border="0" width="100%">
+    <TBODY>
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SDO Java - 
+        Releases</FONT></B></TD>
+    </TR>
+
+    		<TR bgcolor="white">
+			<TD align="left" valign="top">The distribution of Tuscany SDO 1.0-incubator-beta1 is made
+			in 4 archives, available in two formats, one suitable for unpacking on
+			Linux and the other on Windows. The source distributions are split into the SDO 2.1 API and the
+			Tuscany implementation of that API. The binary distribution contains the result of building those two source distributions. The sample
+			distribution contains sample source code which may be used to experiment with the binary distribution.</TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+
+			<TD align="left" width="100%"><I><FONT color="#00254a"><B> </B><B>&gt;Incubating-beta1
+			(May 16th 2007) </B></FONT></I></TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+			<TD align="center" width="100%">
+			<TABLE bgcolor="#f7f7f7" border="0" width="100%">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+
+						</TD><TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" height="33" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany SDO 1.0 beta1 </TD>
+						<TD align="center" height="33" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz">tuscany-sdo-1.0-incubating-beta1-bin.tar.gz</A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.md5">MD5</A></TD><TD align="center" height="33" width="7%"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 API</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Implementation</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany 1.0 SDO beta1 Sample</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz</A></TD>
+
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Binary</FONT></TD>
+						<TD align="center" width="290">Tuscany 1.0 SDO beta1</TD>
+
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip">tuscany-sdo-1.0-incubating-beta1-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 API</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip">tuscany-sdo-api-1.0-incubating-beta1-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Implementation</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip">tuscany-sdo-impl-1.0-incubating-beta1-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Sample</TD>
+						<TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip">tuscany-sdo-sample-1.0-incubating-beta1-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+
+
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top">The distribution of Tuscany SDO is made in 4 
+        archives, and in two formats, one suitable for unpacking on Linux and the other 
+        on Windows. The source distributions are split into the SDO 2.0.1 API and the 
+        Tuscany implementation of that API. The binary distribution contains the result 
+        of building those two source distributions. The sample distribution contains 
+        sample source code which may be used to experiment with the binary distribution 
+        (Note that the samples are already included in the implementation source 
+        distribution).</TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="left" width="100%"><I><FONT color="#00254a"><B></B><B>&gt;Incubating-M2 
+        (Nov 14th, 2006) </B></FONT></I></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+
+        <TD align="center" width="100%">
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" height="33" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" height="33" width="290">Tuscany M2 SDO </TD>
+                    <TD align="center" height="33" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz">tuscany-sdo-1.0-incubator-M2-bin.tar.gz</A></TD>
+
+                    <TD align="center" height="33" width="7%"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" height="33" width="7%"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO API</TD>
+
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz">tuscany-sdo-api-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+
+                    <TD align="center" width="290">Tuscany M2 SDO Implementation</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz">tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+
+                        Source</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO Sample</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz">tuscany-sdo-sample-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.asc">PGP</A></TD>
+                </TR>
+
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip">tuscany-sdo-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO API</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip">tuscany-sdo-api-1.0-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO Implementation</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip">tuscany-sdo-impl-1.0-incubator-M2-src.zip</A></TD>
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="290">Tuscany M2 SDO Sample</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip">tuscany-sdo-sample-1.0-incubator-M2-src.zip</A></TD>
+
+                    <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.md5">MD5</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.asc">PGP</A></TD>
+                </TR>
+    </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+
+        <TD align="left"><I><B><FONT color="#00254a">&gt;Incubating-M1 (June 7th, 2006)</FONT></B></I>
+            <BR>
+            <I>Note</I> : <I>This is a single package release containing SCA and DAS besides 
+            SDO.</I></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="left">
+
+            <TABLE border="0" width="100%">
+                <TBODY>
+                <TR>
+                    <TD align="center" bgcolor="white" width="100%">
+                        <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                            <TBODY>
+                            <TR bgcolor="#f7f7f7">
+                                <TD align="center" width="10%"></TD>
+                                <TD align="center" width="32%"><B><I>Description</I></B></TD>
+
+                                <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                                <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+                                <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                            </TR>
+                            <TR bgcolor="#ffffff">
+                                <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                                    <BR>
+                                    Binary</FONT></TD>
+
+                                <TD align="center" width="287">Tuscany M1 SDO</TD>
+                                <TD align="center" width="414"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz">tuscany-incubating-M1.tar.gz</A></TD>
+                                <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.md5">MD5</A></TD>
+                                <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.asc">PGP</A></TD>
+
+
+                            </TR>
+                            <TR bgcolor="#ffffff">
+
+                                <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                                    <BR>
+                                    Source</FONT></TD>
+                                <TD align="center" width="287">Tuscany M1 SDO</TD>
+                                <TD align="center" width="414"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz">tuscany-incubating-M1-src.tar.gz</A></TD>
+                                <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5">MD5</A></TD>
+                                <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+                            </TR>
+                            <TR bgcolor="#ffffff">
+                                <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                                    <BR>
+                                    Binary</FONT></TD>
+                                <TD align="center" width="287">Tuscany M1 SDO</TD>
+                                <TD align="center" width="414"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip">tuscany-incubating-M1.zip</A></TD>
+
+                                <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5">MD5</A></TD>
+                                <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc">PGP</A></TD>
+
+
+                            </TR>
+                            <TR bgcolor="#ffffff">
+                                <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                                    <BR>
+                                    Source</FONT></TD>
+
+                                <TD align="center" width="287">Tuscany M1 SDO</TD>
+                                <TD align="center" width="414"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip">tuscany-incubating-M1-src.zip</A></TD>
+                                <TD align="center" width="66"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5">MD5</A></TD>
+                                <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+                            </TR>
+                            </TBODY>
+
+                        </TABLE>
+                        <FONT face="Trebuchet MS" size="-1"><B></B></FONT>
+
+                    </TD>
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SDO Java - 
+        Development</FONT></B></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD>Apache Tuscany source code, documentation and web site are managed under 
+        version control using Subversion in
+
+            <A href="https://svn.apache.org/repos/asf/incubator/tuscany" target="_blank">Tuscany 
+            Subversion Repository</A> . The source for the SDO Java project can be found at <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/sca" target="_blank">http://svn.apache.org/repos/asf/incubator/tuscany/java/sdo
+
+            </A>. </TD>
+    </TR>
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+    <TR bgcolor="white">
+        <TD align="left" valign="top"></TD>
+    </TR>
+
+
+    <TR bgcolor="#e0e0c2">
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SDO C++ - 
+        Releases</FONT></B></TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M3 (May, 2007) </B></FONT></I>
+            <BR>
+            <I>Win32 binary distribution is built on Windows XP with Microsoft VCExpress and 
+            is a Release build.
+
+            </I></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux and <BR>
+                        Mac OS X<BR>
+                        Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SDO C++ M3 Source Release for linux and 
+                    Mac OS X</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sdo_cpp-1.0-incubator-M3-src.tar.gz">tuscany_sdo_cpp-1.0-incubator-M3-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sdo_cpp-1.0-incubator-M3-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/linux-macosx/tuscany_sdo_cpp-1.0-incubator-M3-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M3 Binary Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-bin.zip">tuscany_sdo_cpp-1.0-incubator-M3-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M3 Source Release for Windows</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-src.zip">tuscany_sdo_cpp-1.0-incubator-M3-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M3/win32/tuscany_sdo_cpp-1.0-incubator-M3-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><FONT color="#00254a"><B></B><B>&gt;Incubator-M2 (Nov 3rd, 
+        2006) </B></FONT></I><BR>
+            <I>Linux binary distribution is built on Red Hat Enterprise Linux 3. Win32 
+            binary distribution is built on Windows XP with Microsoft VC7.
+
+            </I></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-bin.tar.gz">tuscany_sdo_cpp-1.0-incubator-M2-bin.tar.gz</A></TD>
+
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+
+                    <TD align="center" width="287">Tuscany SDO C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-src.tar.gz">tuscany_sdo_cpp-1.0-incubator-M2-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/linux/tuscany_sdo_cpp-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-bin.zip">tuscany_sdo_cpp-1.0-incubator-M2-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M2</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-src.zip">tuscany_sdo_cpp-1.0-incubator-M2-src.zip</A></TD>
+
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/1.0-incubator-M2/win32/tuscany_sdo_cpp-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+
+    <TR bgcolor="#f0f0f0">
+        <TD align="left"><I><B><FONT color="#00254a">&gt;Incubating-M1 (August 1st, 2006)</FONT></B></I>
+            <BR>
+            <I>Linux binary distribution is built on Red Hat Enterprise Linux 3. Win32 
+            binary distribution is built on Windows XP with Microsoft VC6.
+
+            </I></TD>
+    </TR>
+    <TR width="100%" bgcolor="#f0f0f0">
+        <TD align="center" width="100%">
+
+            <TABLE bgcolor="#f7f7f7" border="0" width="100%">
+
+                <TBODY>
+                <TR bgcolor="#f7f7f7">
+                    <TD align="center" width="10%"></TD>
+                    <TD align="center" width="32%"><B><I>Description</I></B></TD>
+                    <TD align="center" width="46%"><B><I>Download link</I></B></TD>
+                    <TD align="center" width="7%"><B><I>MD5</I></B></TD>
+                    <TD align="center" width="7%"><B><I>PGP</I></B></TD>
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M1</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-bin.tar.gz">tuscany_sdo_cpp-0.1.incubating-M1-bin.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-bin.tar.gz.md5">MD5</A></TD>
+
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-bin.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M1</TD>
+
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-src.tar.gz">tuscany_sdo_cpp-0.1.incubating-M1-src.tar.gz</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-src.tar.gz.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/linux/tuscany_sdo_cpp-0.1.incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+
+                        Binary</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M1</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-bin.zip">tuscany_sdo_cpp-0.1.incubating-M1-bin.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-bin.zip.md5">MD5</A></TD>
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-bin.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                <TR bgcolor="#ffffff">
+                    <TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows
+                        <BR>
+                        Source</FONT></TD>
+                    <TD align="center" width="287">Tuscany SDO C++ M1</TD>
+                    <TD align="center" width="413"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-src.zip">tuscany_sdo_cpp-0.1.incubating-M1-src.zip</A></TD>
+                    <TD align="center" width="67"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-src.zip.md5">MD5</A></TD>
+
+                    <TD align="center" width="64"><A href="http://archive.apache.org/dist/incubator/tuscany/cpp/incubating-M1/win32/tuscany_sdo_cpp-0.1.incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+                </TR>
+                </TBODY>
+            </TABLE>
+        </TD>
+    </TR>
+    <TR bgcolor="#e0e0c2">
+
+        <TD align="center"><B><FONT color="#804040" face="Gourmand" size="-1">SDO C++ - 
+        Development</FONT></B></TD>
+    </TR>
+    <TR bgcolor="#f0f0f0">
+        <TD>Apache Tuscany source code, documentation and web site are managed under 
+        version control using Subversion in
+
+            <A href="https://svn.apache.org/repos/asf/incubator/tuscany" target="_blank">Tuscany 
+            Subversion Repository</A> . The source for the SDO C++ project can be found at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/">http://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/</A>.</TD>
+    </TR>
+</TABLE>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-general-menu.html b/site/trunk/site-publish/sdo-general-menu.html
new file mode 100644
index 0000000000..10c95ce7f8
--- /dev/null
+++ b/site/trunk/site-publish/sdo-general-menu.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO General Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54959">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="SDO General Menu">SDO General Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-general.html b/site/trunk/site-publish/sdo-general.html
new file mode 100644
index 0000000000..31ab62787a
--- /dev/null
+++ b/site/trunk/site-publish/sdo-general.html
@@ -0,0 +1,83 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SDO General : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54959">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO General">SDO General</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-java-10-incubating-beta1.html b/site/trunk/site-publish/sdo-java-10-incubating-beta1.html
new file mode 100644
index 0000000000..793a49fbaf
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-10-incubating-beta1.html
@@ -0,0 +1,196 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.0-incubating-beta1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55501">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.0-incubating-beta1">SDO Java 1.0-incubating-beta1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.0-incubating-beta1-SDOJava1.0incubatingbeta"></A>SDO Java 1.0-incubating-beta</H3>
+
+<P>SDO Java Beta1 is a superset of previous SDO Java M2 release.&nbsp; Anything in M2 is also in Beta1, but Beta1 contains features and bugfixes not present in M2 release. SDOJava Beta1 is an implementation of the SDO 2.1 specification.</P>
+
+<P>There are 3 SDO 2.1 features which do not have an implementation in this release,  those being&nbsp;</P>
+
+<P>XMLHelper load/save with Source/Result (TUSCANY-1214)  DataHelper.convert (TUSCANY-1213)<BR>
+Property.isNullable() and<BR>
+Property.isOpenContent()(TUSCANY-1212)</P>
+
+<H3><A name="SDOJava1.0-incubating-beta1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip" class="external-link" rel="nofollow">tuscany-sdo-1.0-incubating-beta1-bin.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.asc" class="external-link" rel="nofollow">PGP</A> <BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 API </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip" class="external-link" rel="nofollow">tuscany-sdo-api-1.0-incubating-beta1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 Implementation </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip" class="external-link" rel="nofollow">tuscany-sdo-impl-1.0-incubating-beta1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 Sample </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip" class="external-link" rel="nofollow">tuscany-sdo-sample-1.0-incubating-beta1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJava1.0-incubating-beta1-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-1.0-incubating-beta1-bin.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 API </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 Implementation </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany SDO 1.0 beta1 Sample </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-10-incubating-release-summary.html b/site/trunk/site-publish/sdo-java-10-incubating-release-summary.html
new file mode 100644
index 0000000000..87bee14aae
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-10-incubating-release-summary.html
@@ -0,0 +1,122 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.0-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63486">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="sdo-java-10-incubating.html" title="SDO Java 1.0-incubating">SDO Java 1.0-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.0-incubating Release Summary">SDO Java 1.0-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.0-incubatingReleaseSummary-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.0-incubating is the <B>first release with full coverage of the SDO 2.1 specification</B>.</P>
+
+<P>In addition to adding the few remaining SDO 2.1 features not included in the<BR>
+1.0-incubating-beta1 release and fixing a number of bugs <BR>
+there are a number of new features relating to XML serialization, and new<BR>
+support for handling dynamic derivation from static classes.  There has also<BR>
+been significant focus on making the SDO sample programs more accessible.</P>
+
+<P>For the full change history take a look <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">here </A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-10-incubating.html b/site/trunk/site-publish/sdo-java-10-incubating.html
new file mode 100644
index 0000000000..d85528179c
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-10-incubating.html
@@ -0,0 +1,168 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.0-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63485">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.0-incubating">SDO Java 1.0-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.0-incubating-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.0-incubating is the <B>first release with full coverage of the SDO 2.1 specification</B>.</P>
+
+<P>In addition to adding the few remaining SDO 2.1 features not included in the<BR>
+1.0-incubating-beta1 release and fixing a number of bugs <BR>
+there are a number of new features relating to XML serialization, and new<BR>
+support for handling dynamic derivation from static classes.  There has also<BR>
+been significant focus on making the SDO sample programs more accessible.</P>
+
+<P>For the full change history take a look <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating/distribution/src/main/release/RELEASE_NOTES" class="external-link" rel="nofollow">here </A></P>
+
+<H3><A name="SDOJava1.0-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.0-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.0-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJava1.0-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.0-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.0-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating/apache-tuscany-sdo-1.0-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-11-incubating-release-summary.html b/site/trunk/site-publish/sdo-java-11-incubating-release-summary.html
new file mode 100644
index 0000000000..77420c1519
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-11-incubating-release-summary.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.1-incubating Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82677">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating">SDO Java 1.1-incubating</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.1-incubating Release Summary">SDO Java 1.1-incubating Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.1-incubatingReleaseSummary-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.1-incubating is the first update afer the 1.0 release where full coverage for SDO 2.1 specification was provided.<BR>
+This release includes new features, improvements and many bug fixes, please see <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/RELEASE_NOTES" class="external-link" rel="nofollow">release notes </A> for more detalil.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-11-incubating.html b/site/trunk/site-publish/sdo-java-11-incubating.html
new file mode 100644
index 0000000000..9f2460eb7f
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-11-incubating.html
@@ -0,0 +1,173 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.1-incubating</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82676">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.1-incubating">SDO Java 1.1-incubating</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.1-incubating-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.1-incubating is the first update afer the 1.0 release where full coverage for SDO 2.1 specification was provided.<BR>
+This release includes new features, improvements and many bug fixes, please see <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/RELEASE_NOTES" class="external-link" rel="nofollow">release notes </A> for more detalil.</P>
+
+<H3><A name="SDOJava1.1-incubating-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1-incubating.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1-incubating-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJava1.1-incubating-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1-incubating.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1-incubating-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.1-incubating/apache-tuscany-sdo-1.1-incubating-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651091; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="068d05c8"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_web_stats.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651091/0/068d05c8/1/" alt="web statistics" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-111-release-summary.html b/site/trunk/site-publish/sdo-java-111-release-summary.html
new file mode 100644
index 0000000000..3aab8205e3
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-111-release-summary.html
@@ -0,0 +1,114 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.1.1 Release Summary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91091">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="sdo-java-111.html" title="SDO Java 1.1.1">SDO Java 1.1.1</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.1.1 Release Summary">SDO Java 1.1.1 Release Summary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.1.1ReleaseSummary-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.1.1 represents a minor fix level above the 1.1-incubating release,  but is the first SDO release to be made since Tuscany became a top level Apache project (hence the absence of the incubating postfix). Please see <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sdo/1.1.1-RC2a/RELEASE_NOTES" class="external-link" rel="nofollow">release notes </A> for more detail.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-111.html b/site/trunk/site-publish/sdo-java-111.html
new file mode 100644
index 0000000000..c3ad4ed222
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-111.html
@@ -0,0 +1,171 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java 1.1.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91087">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java 1.1.1">SDO Java 1.1.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJava1.1.1-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.1.1 represents a minor fix level above the 1.1-incubating release,  but is the first SDO release to be made since Tuscany became a top level Apache project (hence the absence of the incubating postfix). Please see <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sdo/1.1.1-RC2a/RELEASE_NOTES" class="external-link" rel="nofollow">release notes </A> for more detail.</P>
+<H3><A name="SDOJava1.1.1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJava1.1.1-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1-apache-tuscany-sdo-1.1.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651091; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="068d05c8"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_web_stats.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651091/0/068d05c8/1/" alt="web statistics" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-architecture-guide.html b/site/trunk/site-publish/sdo-java-architecture-guide.html
new file mode 100644
index 0000000000..fb032e076f
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-architecture-guide.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Architecture Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52004">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Architecture Guide">SDO Java Architecture Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>To be done</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-documentation-menu.html b/site/trunk/site-publish/sdo-java-documentation-menu.html
new file mode 100644
index 0000000000..f57748fd77
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-documentation-menu.html
@@ -0,0 +1,143 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Documentation Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56226">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Documentation Menu">SDO Java Documentation Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="SDOJavaDocumentationMenu-SDOJavaDocumentation"></A>SDO Java Documentation</H1>
+
+<P>The following guides are available for SDO Java.</P>
+
+<UL>
+	<LI><A href="sdo-java-user-guide.html" title="SDO Java User Guide">User Guide</A><BR>
+This introduces you to SDO concepts and walks you through a simple example.</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="developing-sdo-java.html" title="Developing SDO Java">Developer Guide</A><BR>
+If you would like to contribute to the project, this guide explains how to build Java SDO and how to contribute code back to the project. </LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-documents.html b/site/trunk/site-publish/sdo-java-documents.html
new file mode 100644
index 0000000000..2d2313e82d
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-documents.html
@@ -0,0 +1,162 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>SDO Java Documents</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Documents">SDO Java Documents</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">SDO Java Documents</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=48492">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=48492">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=48492">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=48492">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=48492">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=48492">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=kelvingoodson@apache.org">kelvin goodson</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 18, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=48492&originalId=52013">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SDO Java User Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+<UL>
+	<LI><A href="#SDOJavaDocuments-GettingStarted" title="Getting Started on SDO Java Documents">Getting Started</A></LI>
+	<LI><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What%20is%20SCA%20Articles&linkCreation=true&fromPageId=48492" title="Create Page: What is SCA Articles" class="createlink">Sample Walkthrough <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><A href="#SDOJavaDocuments-Specification" title="Specification on SDO Java Documents">Service Data Object Specification, Version 2.1</A></LI>
+</UL>
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="SDOJavaDocuments-"></A><A name="SDOJavaDocuments-GettingStarted"></A><FONT color="#0099cc">Getting Started</FONT></H3>
+<P>As an SDO user,  you have (at least) three ways of establishing a Tuscany SDO runtime environment on your machine.  In decreasing order of likelihood, you can either </P>
+<UL>
+	<LI><A href="sdo-java-download.html" title="SDO Java Download">download</A> a binary distribution of a Tuscany Java SDO milestone release, and follow the instructions in the release archive</LI>
+	<LI>Or you can <A href="getting-source.html" title="Getting Source">download</A> a Tuscany source distribution, and follow the instruction in the release archive to recreate the corresponding binary release</LI>
+	<LI>or you can <A href="getting-source.html" title="Getting Source">build from the svn repository</A> source code, giving you the flexibility to base your runtime on the most recent code, or a particular level of your choice.</LI>
+</UL>
+
+
+<P>If you are going to take either of the latter two approaches you will need to <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">establish a development environment</A>.</P>
+
+<P>For examples of how to use SDO, you can look at the <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SDO%20Java%20User%20Guide&linkCreation=true&fromPageId=48492" title="Create Page: SDO Java User Guide" class="createlink">documents<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> or at the samples.  If you have downloaded the source distribution, the sample code will be part of that distribution.  If however you have downloaded a binary distribution,  you'll need to go and <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/sca_downloads.html" title="Visit page outside Confluence" rel="nofollow">download<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> the sample source code as a separate archive.</P>
+
+<P>Other sources of inspiration might come from the use of SDO within the Tuscany DAS and SCA code.  When you come across issues, please look at and/or post to the Tuscany <A href="mailing-lists.html" title="Mailing Lists">mailing lists</A>.</P>
+
+
+
+<H3><A name="SDOJavaDocuments-"></A><A name="SDOJavaDocuments-Specification"></A><FONT color="#0099cc">Specification</FONT></H3>
+
+<P>The <SPAN class="nobr"><A href="http://www.osoa.org/display/Main/Service%20Data%20Objects%20Specifications" title="Visit page outside Confluence" rel="nofollow">SDO Specification 2.1 for Java<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> describes the data programming interface for Java language. 	  </P>
+
+<H3><A name="SDOJavaDocuments-"></A><A name="SDOJavaDocuments-WhatisSCAArticles"></A><FONT color="#0099cc">Sample Walkthrough</FONT></H3>
+
+<P>The following articles published by Tuscany committers, Kelvin Goodson and Geoffrey Winn, in Java Developer Journal  provide a quick view of SDO concepts accompanied by a sample code for a real scenario.</P>
+
+<UL>
+	<LI><SPAN class="nobr"><A href="http://soa.sys-con.com/read/313547.htm" title="Visit page outside Confluence" rel="nofollow">What is SDO? Part1<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://java.sys-con.com/read/358059.htm" title="Visit page outside Confluence" rel="nofollow">What is SDO? Part 2<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+</UL>
+
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-java-download.html b/site/trunk/site-publish/sdo-java-download.html
new file mode 100644
index 0000000000..ae1603d04d
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-download.html
@@ -0,0 +1,419 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Download</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48654">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Download">SDO Java Download</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+<TABLE>
+    		<TR bgcolor="white">
+			<TD align="left" valign="top">The distribution of Tuscany SDO 1.0-incubator-beta1 is made
+			in 4 archives, available in two formats, one suitable for unpacking on
+			Linux and the other on Windows. The source distributions are split into the SDO 2.1 API and the
+			Tuscany implementation of that API. The binary distribution contains the result of building those two source distributions. The sample
+			distribution contains sample source code which may be used to experiment with the binary distribution.</TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+
+			<TD align="left" width="100%"><I><FONT color="#00254a"><B> </B><B>&gt;Incubating-beta1
+			(May 16th 2007) </B></FONT></I></TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+			<TD align="center" width="100%">
+			<TABLE bgcolor="#f7f7f7" border="0" width="100%">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+
+						</TD><TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" height="33" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany SDO 1.0 beta1 </TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz">tuscany-sdo-1.0-incubating-beta1-bin.tar.gz</A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.md5">MD5</A></TD><TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 API</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Sample</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz">tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz</A></TD>
+
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Binary</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1</TD>
+
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip">tuscany-sdo-1.0-incubating-beta1-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 API</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip">tuscany-sdo-api-1.0-incubating-beta1-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/api/apache-tuscany-sdo-api-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip">tuscany-sdo-impl-1.0-incubating-beta1-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/impl/apache-tuscany-sdo-impl-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany SDO 1.0 beta1 Sample</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip">tuscany-sdo-sample-1.0-incubating-beta1-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/sample/apache-tuscany-sdo-sample-1.0-incubating-beta1-src.zip.asc">PGP</A></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+
+
+		<TR bgcolor="white">
+			<TD align="left" valign="top">The distribution of Tuscany SDO is made
+			in 4 archives, and in two formats, one suitable for unpacking on
+			Linux and the other on Windows. The source distributions are split into the SDO 2.0.1 API and the
+			Tuscany implementation of that API. The binary distribution contains the result of building those two source distributions. The sample
+			distribution contains sample source code which may be used to experiment with the binary distribution (Note that the
+			samples are already included in the implementation source
+			distribution).</TD>
+		</TR>
+
+		<TR bgcolor="#f0f0f0">
+
+			<TD align="left" width="100%"><I><FONT color="#00254a"><B> </B><B>&gt;Incubating-M2
+			(Nov 14th, 2006) </B></FONT></I></TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+			<TD align="center" width="100%">
+			<TABLE bgcolor="#f7f7f7" border="0" width="100%">
+				<TBODY>
+					<TR bgcolor="#f7f7f7">
+						<TD align="center" width="10%">
+
+						</TD><TD align="center" width="32%"><B><I>Description</I></B></TD>
+						<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+						<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+						<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" height="33" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+
+						Binary</FONT></TD>
+						<TD align="center" height="33" width="290">Tuscany M2 SDO </TD>
+						<TD align="center" height="33" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz">tuscany-sdo-1.0-incubator-M2-bin.tar.gz</A></TD>
+						<TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.md5">MD5</A></TD><TD align="center" height="33" width="7%"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO API</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz">tuscany-sdo-api-1.0-incubator-M2-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+						
+						
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz">tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO Sample</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz">tuscany-sdo-sample-1.0-incubator-M2-src.tar.gz</A></TD>
+
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.asc">PGP</A></TD>
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Binary</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO</TD>
+
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip">tuscany-sdo-1.0-incubator-M2-bin.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+
+						<TD align="center" width="290">Tuscany M2 SDO API</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip">tuscany-sdo-api-1.0-incubator-M2-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.md5">MD5</A></TD><TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+						
+						
+					</TR>
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO Implementation</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip">tuscany-sdo-impl-1.0-incubator-M2-src.zip
+						</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.md5">MD5</A></TD>
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.asc">PGP</A></TD>
+					</TR>
+
+					<TR bgcolor="#ffffff">
+						<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Windows<BR>
+						Source</FONT></TD>
+						<TD align="center" width="290">Tuscany M2 SDO Sample</TD>
+						<TD align="center" width="413"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip">tuscany-sdo-sample-1.0-incubator-M2-src.zip</A></TD>
+						<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.md5">MD5</A></TD>
+
+						<TD align="center" width="67"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.asc">PGP</A></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+			<TD align="left"><I><B><FONT color="#00254a">&gt;Incubating-M1 (June 7th,
+			2006)</FONT></B></I><BR>
+
+			<I>Note</I>
+			: <I>This is a single package release containing SCA and DAS besides
+			SDO.</I>
+			</TD>
+		</TR>
+		<TR bgcolor="#f0f0f0">
+			<TD align="left">
+			<TABLE border="0" width="100%">
+
+				<TBODY>
+					<TR>
+						<TD align="center" bgcolor="white" width="100%">
+						<TABLE bgcolor="#f7f7f7" border="0" width="100%">
+							<TBODY>
+								<TR bgcolor="#f7f7f7">
+									<TD align="center" width="10%">
+									</TD><TD align="center" width="32%"><B><I>Description</I></B></TD>
+
+									<TD align="center" width="46%"><B><I>Download link</I></B></TD>
+									<TD align="center" width="7%"><B><I>MD5</I></B></TD>
+									<TD align="center" width="7%"><B><I>PGP</I></B></TD>
+								</TR>
+								<TR bgcolor="#ffffff">
+									<TD align="right" bgcolor="#ffffff" width="64"><FONT face="Gourmand" size="-2">Linux<BR>
+									Binary</FONT></TD>
+
+									<TD align="center" width="287">Tuscany M1 SDO</TD>
+									<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz">tuscany-incubating-M1.tar.gz</A></TD>
+									<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.md5">MD5</A></TD>
+									<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.asc">PGP</A></TD>
+
+
+								</TR>
+								<TR bgcolor="#ffffff">
+
+									<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Linux<BR>
+									Source</FONT></TD>
+									<TD align="center" width="287">Tuscany M1 SDO</TD>
+									<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz">tuscany-incubating-M1-src.tar.gz</A></TD>
+									<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5">MD5</A></TD>
+									<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc">PGP</A></TD>
+
+
+								</TR>
+								<TR bgcolor="#ffffff">
+									<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows<BR>
+									Binary</FONT></TD>
+									<TD align="center" width="287">Tuscany M1 SDO</TD>
+									<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip">tuscany-incubating-M1.zip</A></TD>
+
+									<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5">MD5</A></TD>
+									<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc">PGP</A></TD>
+
+
+								</TR>
+								<TR bgcolor="#ffffff">
+									<TD align="right" bgcolor="#ffffff" width="60"><FONT face="Gourmand" size="-2">Windows<BR>
+									Source</FONT></TD>
+
+									<TD align="center" width="287">Tuscany M1 SDO</TD>
+									<TD align="center" width="414"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip">tuscany-incubating-M1-src.zip
+									</A></TD>
+									<TD align="center" width="66"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5">MD5</A></TD>
+									<TD align="center" width="64"><A href="http://people.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc">PGP</A></TD>
+
+
+								</TR>
+							</TBODY>
+
+						</TABLE>
+						<FONT face="Trebuchet MS" size="-1"><B> </B></FONT>
+						
+						</TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+</TABLE>
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-found-a-bug.html b/site/trunk/site-publish/sdo-java-found-a-bug.html
new file mode 100644
index 0000000000..63449b763e
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-found-a-bug.html
@@ -0,0 +1,156 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Found a Bug</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56228">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="sdo-java-subproject-menu.html" title="SDO Java Subproject Menu">SDO Java Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Found a Bug">SDO Java Found a Bug</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SDOJavaFoundaBug-ReportinganIssueorAskingForNewFeatures"></A>Reporting an Issue or Asking For New Features</H3>
+
+<P><B>Please use Apache<A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">JIRA</A> system to report bugs or request new features.</B> First time users need to create a login.</P>
+
+<P>Search the existing JIRAs to see if what you want to create is already there. If not, create a new one. Make sure JIRAs are categorized correctly using JIRA categories and are created under the correct component area. Please include as much information as possible in your JIRA to help resolve the issue quicker. This can include version of the software used, platforms running on, steps to reproduce, test case, details of your requirement or even a patch if you have one. </P>
+
+<H3><A name="SDOJavaFoundaBug-SubmittingaPatch"></A>Submitting a Patch</H3>
+
+<P>Please follow the steps below to create a patch. It will be reviewed and committed by a committer in the project.</P>
+
+<UL>
+	<LI>Perform a full build with all tests enabled for the module the fix is for. Specific build procedures vary by sub-project.</LI>
+	<LI>Confirm that the problem is fixed and include a test case where possible to help the person who is applying the patch to verify the fix.</LI>
+	<LI>Generate the patch using <TT>svn diff File &gt; patchfile</TT></LI>
+	<LI>Try to give your patch files meaningful names, including the JIRA number</LI>
+	<LI>Add your patch file as an attachment to the associated JIRA issue
+	<UL>
+		<LI>Clicking on the 'Patch Available' box in the screen where the patch is being submitted will help identify available patches quicker.</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="SDOJavaFoundaBug-HowdoIgetmyJIRAsintoarelease%3F"></A>How do I get my JIRAs into a release?</H3>
+<P>You can always propose a release and drive the release with the content that you want. Another way to get a JIRA into a release is by providing a patch or working with other community members (volunteers) to help you get the problem fixed. You can also help by providing test cases.</P>
+
+<P>Each release is managed by a release manager. Make sure that the Release Manager is aware of why a fix to a JIRA is important to your business. In general, the best attempt is made to include as many JIRAs as possible depending on the level of community help. The voting mechanism in the JIRA system can be used to raise the importance of a JIRA to the attention of the release manager. Adding comments in the JIRA would help the release manager understand why a JIRA is important to include in a given release. </P>
+
+<H3><A name="SDOJavaFoundaBug-Howisareleasedone%3F"></A>How is a release done?</H3>
+<P>Anyone can volunteer to be a release manager and drive a release. Based on Apache guidelines, a release requires at least three PMC +1 votes and more +1s than -1s. A release can not be vetoed so a -1 does not block a release.  The steps for how to create a Tuscany release are documented <A href="http://tuscany.apache.org/making-releases.html" class="external-link" rel="nofollow">here </A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-get-involved.html b/site/trunk/site-publish/sdo-java-get-involved.html
new file mode 100644
index 0000000000..1b19eaa2a9
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-get-involved.html
@@ -0,0 +1,160 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Get Involved</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56229">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="sdo-java-subproject-menu.html" title="SDO Java Subproject Menu">SDO Java Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Get Involved">SDO Java Get Involved</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SDOJavaGetInvolved-GettingInvolved"></A>Getting Involved</H3>
+
+<H4><A name="SDOJavaGetInvolved-ApacheTuscany"></A>Apache Tuscany</H4>
+<P>A successful project requires many people to play many roles, for example write code, documentation, test, provide suggestions or feedback. If you would like to become involved, join the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</P>
+
+<P><B>Here are some suggestions for getting started and welcome to the project.</B></P>
+
+<P>Read the overview pages for each <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subproject</A> and decide where you'd like to get involved.</P>
+
+<UL>
+	<LI>Contribute new ideas for improving Tuscany <A href="tuscany-subprojects.html" title="Tuscany Subprojects">subprojects</A>.</LI>
+	<LI>Answer questions posted to the <A href="mailing-lists.html" title="Mailing Lists">mailing list</A>.</LI>
+	<LI>Contribute to the FAQ under each subproject or to the wiki website.</LI>
+	<LI>Contribute to the user or developer documentation for each subproject on the <A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Home" class="external-link" rel="nofollow">Tuscany wiki</A>.</LI>
+	<LI>Investigate <A href="issue-tracking.html" title="Issue Tracking">bugs</A> that have been reported and provide patches.</LI>
+	<LI>Help with development for the next release of Apache Tuscany subprojects. For example, the Java developer guide is <A href="sca-java-development-guide.html" title="SCA Java Development Guide">here</A></LI>
+</UL>
+
+
+<P>If in doubt about where to start, send a note to the mailing list and mention your area of interest. </P>
+
+<P>Please note that a single mailing list is used for all the subprojects.</P>
+
+<P>The Tuscany community also gets together on IRC. The IRC server is irc.freenode.net and the channel is #tuscany. <BR>
+Internet Relay Chat (IRC) Help is a good source of information on understanding IRC chats.<BR>
+The following are some IRC chat clients:</P>
+<UL>
+	<LI>mIRC 	        <A href="http://www.mirc.com/" class="external-link" rel="nofollow">http://www.mirc.com/</A></LI>
+	<LI>Trillian 	<A href="http://www.ceruleanstudios.com/" class="external-link" rel="nofollow">http://www.ceruleanstudios.com/</A></LI>
+</UL>
+
+
+<P>If  you are not familiar with Apache, you can read more about how Apache works at <A href="http://www.apache.org/foundation/how-it-works.html" class="external-link" rel="nofollow">this link</A>.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-incubating-m1.html b/site/trunk/site-publish/sdo-java-incubating-m1.html
new file mode 100644
index 0000000000..058ebccc5f
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-incubating-m1.html
@@ -0,0 +1,166 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Incubating-M1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56616">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Incubating-M1">SDO Java Incubating-M1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJavaIncubating-M1-SDOJavaIncubatingM1"></A>SDO Java Incubating-M1</H3>
+
+<P>The SDO Java Incubating-M1 was released in June 2006.</P>
+
+<H3><A name="SDOJavaIncubating-M1-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M1 SDO </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip" class="external-link" rel="nofollow">tuscany-incubating-M1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.zip.asc" class="external-link" rel="nofollow">PGP</A><BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 SDO </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip" class="external-link" rel="nofollow">tuscany-incubating-M1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.zip.asc" class="external-link" rel="nofollow">PGP</A><BR class="atl-forced-newline"> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJavaIncubating-M1-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M1 SDO </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M1 SDO </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz" class="external-link" rel="nofollow">tuscany-incubating-M1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/incubating-M1/tuscany-incubating-M1-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-incubating-m2.html b/site/trunk/site-publish/sdo-java-incubating-m2.html
new file mode 100644
index 0000000000..4a708a8a74
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-incubating-m2.html
@@ -0,0 +1,190 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Incubating-M2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56615">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Incubating-M2">SDO Java Incubating-M2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SDOJavaIncubating-M2-SDOJavaIncubatingM2"></A>SDO Java Incubating-M2</H3>
+
+<P>The SDO Java Incubating-M2 was released in Nov, 2006.</P>
+
+<H3><A name="SDOJavaIncubating-M2-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO <BR class="atl-forced-newline"> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip" class="external-link" rel="nofollow">tuscany-sdo-1.0-incubator-M2-bin.zip</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.zip.asc" class="external-link" rel="nofollow">PGP</A><BR class="atl-forced-newline"> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO API </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany-sdo-api-1.0-incubator-M2-src.zip</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO Implementation </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip" class="external-link" rel="nofollow">tuscany-sdo-impl-1.0-incubator-M2-src.zip</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO Sample </TD>
+<TD class="confluenceTd"><A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip" class="external-link" rel="nofollow">tuscany-sdo-sample-1.0-incubator-M2-src.zip</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.zip.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJavaIncubating-M2-Linux"></A>Linux</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> Description<BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> File <BR class="atl-forced-newline"> </TH>
+<TH class="confluenceTh"> Signature <BR class="atl-forced-newline"> </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-1.0-incubator-M2-bin.tar.gz</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/binary/tuscany-sdo-1.0-incubator-M2-bin.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO API </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-api-1.0-incubator-M2-src.tar.gz</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-api-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO Implementation </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz</A></TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/source/tuscany-sdo-impl-1.0-incubator-M2-src.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> Tuscany M2 SDO Sample </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz" class="external-link" rel="nofollow">tuscany-sdo-sample-1.0-incubator-M2-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.md5" class="external-link" rel="nofollow">MD5</A>&nbsp;&nbsp;&nbsp;&nbsp; <A href="http://archive.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubator-M2/sample/tuscany-sdo-sample-1.0-incubator-M2.tar.gz.asc" class="external-link" rel="nofollow">PGP</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-issue-tracking.html b/site/trunk/site-publish/sdo-java-issue-tracking.html
new file mode 100644
index 0000000000..70a29d2d7c
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-issue-tracking.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Issue Tracking</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48541">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="developing-sdo-java.html" title="Developing SDO Java">Developing SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Issue Tracking">SDO Java Issue Tracking</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>To be completed (KG 12th March 07)</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-m3.html b/site/trunk/site-publish/sdo-java-m3.html
new file mode 100644
index 0000000000..2a2b0fc97e
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-m3.html
@@ -0,0 +1,453 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java M3</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48707">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java M3">SDO Java M3</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Work for this release is being tracked under <A href="http://issues.apache.org/jira/browse/TUSCANY-1171" class="external-link" rel="nofollow">TUSCANY-1171</A><BR>
+Using my M2 <A href="http://wiki.apache.org/ws/Tuscany/TuscanyJava/SDOJavaReleaseSteps" class="external-link" rel="nofollow">post mortem notes</A> to drive the process and updating them <A href="m3-process-notes.html" title="M3 Process Notes">here</A></P>
+
+<P>Here are the issues fixed in Milestone 3 (so far)</P>
+
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd">Test</TD>
+<TD class="confluenceTd">TUSCANY-1100</TD>
+<TD class="confluenceTd">Dynamic Type tests are needed to ensure that all XSD datatypes are supported</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-1101</TD>
+<TD class="confluenceTd">Support mixed Sequence and any Sequence in Change Summary</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-1082</TD>
+<TD class="confluenceTd">Change Summary XML deserialization</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-930</TD>
+<TD class="confluenceTd">Add new SDOUtil.createHelperContext() method</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-929</TD>
+<TD class="confluenceTd">Move to SDO 2.1 spec APIs</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-713</TD>
+<TD class="confluenceTd">Discover and regiester new SDO types during the time of loading the XML instance document</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-684</TD>
+<TD class="confluenceTd">Generated SDO classes should be able to register the static types to a given TypeHelper</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1113</TD>
+<TD class="confluenceTd">Extensible namespaces and types that change</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1107</TD>
+<TD class="confluenceTd">Multiple calls to getNamespaceContext</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1091</TD>
+<TD class="confluenceTd">DataObjectXMLStreamReader doesn't have to repeat NameSpace declaration which impacts performance</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1088</TD>
+<TD class="confluenceTd">SDO should tolerate malformed XML</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1086</TD>
+<TD class="confluenceTd">Scope defined java serialiazation/deserialization of SDO</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1083</TD>
+<TD class="confluenceTd">Shorter NameSpace prefix to speed up XML processing and reduce communication bandwidth</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-928</TD>
+<TD class="confluenceTd">Define Tuscany SDO options for XMLHelper load and save operations</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-521</TD>
+<TD class="confluenceTd">Hide special Sequence-type properties from SDO Types</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-709</TD>
+<TD class="confluenceTd">Loads DataGraph in designated scope(TypeHelper)</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1093</TD>
+<TD class="confluenceTd">&quot;isSet returning false when boolean set to false, or int set to 0&quot;</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Critical</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1132</TD>
+<TD class="confluenceTd">SDO Java serialization/deserialization throws an exception when the serialized data object is not the root and its container is of AnyTypeDataObject</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1130</TD>
+<TD class="confluenceTd">Concurrent access to SDOUtil.createHelperContext() results in exception</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1099</TD>
+<TD class="confluenceTd">fix for TUSCANY-1083 used lookupPrefix method of Node not available to Java 1.4.2 users</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1097</TD>
+<TD class="confluenceTd">DataObjectXMLStreamReader shouldn't have ignored (transient Properties in) Sequence</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1085</TD>
+<TD class="confluenceTd">schemaLocation attribute in the &lt;xsd:import&gt; should be only a hint</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1062</TD>
+<TD class="confluenceTd">DataGraph.createRootObject implementation does not match 2.1 spec and also is not helpful when given bad parameters</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1044</TD>
+<TD class="confluenceTd">DataHelperImpl.toDateTime() is not compliant with spec.</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-972</TD>
+<TD class="confluenceTd">commonj.sdo/xml namespace should be supported by SDO runtime by default</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-958</TD>
+<TD class="confluenceTd">NPE generated during a property set of a static SDO</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-956</TD>
+<TD class="confluenceTd">SDOFactory instance lookup is using the wrong namespace URI</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-935</TD>
+<TD class="confluenceTd">&quot;SDO path accessors need to support names that contain &quot;&quot;.&quot;&quot;&quot;</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-932</TD>
+<TD class="confluenceTd">Invoking DataObject.isSet(String path) with invalid path would result in NPE</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-931</TD>
+<TD class="confluenceTd">&quot;Sequence.add(int index, String propertyName, Object value) is not functioning correctly&quot;</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-894</TD>
+<TD class="confluenceTd">SDO (and indirectly DAS) may not now depend on CPL if EMF has completed migration to EPL</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-887</TD>
+<TD class="confluenceTd">TypeHelper.define() should create an accompanying global property per type</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-859</TD>
+<TD class="confluenceTd">ChangeSummary#isCreated cache is not updated while changes are still going on</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-836</TD>
+<TD class="confluenceTd">doubleValue() may be inaccurate for Long</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-396</TD>
+<TD class="confluenceTd">Cardinality of wildcard element not respected</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1055</TD>
+<TD class="confluenceTd">DataFactory.create(abstract_type) should throw an IllegalArgumentException</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-885</TD>
+<TD class="confluenceTd">Property DataObject.getProperty(String propertyName) should return null if the property cannot be found</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-701</TD>
+<TD class="confluenceTd">Conversion to date types which do not include month can give incorrect results</TD>
+<TD class="confluenceTd">Java SDO Implementation</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">New Feature</TD>
+<TD class="confluenceTd">TUSCANY-1102</TD>
+<TD class="confluenceTd">Support EMF 2.2.2</TD>
+<TD class="confluenceTd">Java SDO Implementation, Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1123</TD>
+<TD class="confluenceTd">test case generated code and metadata access is anachronistic</TD>
+<TD class="confluenceTd">&quot;Java SDO Implementation, Java SDO Tools&quot;</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Improvement</TD>
+<TD class="confluenceTd">TUSCANY-1155</TD>
+<TD class="confluenceTd">Java SDO static code generation tool java doc and usage hints need updating.</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1141</TD>
+<TD class="confluenceTd">The dependency/imported package was not initialized if the codegen tool was provided with -javaPackage option for the target codegen package</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1120</TD>
+<TD class="confluenceTd">Static code generator template bugs</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-1050</TD>
+<TD class="confluenceTd">&quot;For some schemas, the code generated will not compile (notication and settable problems)&quot;</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-934</TD>
+<TD class="confluenceTd">XSD2JavaGenerator -noEMF option does not work with abstract classes.</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-933</TD>
+<TD class="confluenceTd">XSD2Java Generator still generates EMF codes with -noEMF option on</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Major</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">Bug</TD>
+<TD class="confluenceTd">TUSCANY-718</TD>
+<TD class="confluenceTd">make -noEMF code generation the default</TD>
+<TD class="confluenceTd">Java SDO Tools</TD>
+<TD class="confluenceTd">Minor</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P>Here are the <A href="http://wiki.apache.org/ws/Tuscany/TuscanyJava/SDOJavaReleaseSteps" class="external-link" rel="nofollow">release process steps</A> harvested from the M2 release</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-news.html b/site/trunk/site-publish/sdo-java-news.html
new file mode 100644
index 0000000000..cf310f1f80
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-news.html
@@ -0,0 +1,133 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java News</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64878">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java News">SDO Java News</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> This page can be updated by anyone wanting to share information on Tuscany SDO Java. Thanks&#33;</P>
+<TD class="confluenceTd" valign="top" width="50%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>SDO Java News</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><B>1.0-incubating version released in August</B>, See the <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg21379.html" class="external-link" rel="nofollow">announcement</A>.</LI>
+	<LI><B>Formulating plans for the next release</B> Now is the time to express opinions on <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg22439.html" class="external-link" rel="nofollow">what happens next with SDO Java</A>.</LI>
+	<LI><B>There are plans for reorganising the code base to add Java Generator tests</B> see discussions <A href="https://issues.apache.org/jira/browse/TUSCANY-1399" class="external-link" rel="nofollow">here</A>.</LI>
+	<LI><B>Community looking at adding multi-threaded testing</B> spurred on by discussions <A href="https://issues.apache.org/jira/browse/TUSCANY-1006" class="external-link" rel="nofollow">here</A>.</LI>
+</UL>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="50%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Users Sharing News</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><EM>Please share information that you think will benefit other users or the project. link the information to this page.</EM></LI>
+</UL>
+
+
+<UL>
+	<LI>This book is getting good reviews and contains a section on SDO : <A href="http://www.mc-store.com/5079.html" class="external-link" rel="nofollow">SOA for the Business Developer Concepts, BPEL, and SCA</A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-previous-releases.html b/site/trunk/site-publish/sdo-java-previous-releases.html
new file mode 100644
index 0000000000..10aaa09c12
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-previous-releases.html
@@ -0,0 +1,140 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Previous Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56618">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="sdo-java-releases.html" title="SDO Java Releases">SDO Java Releases</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Previous Releases">SDO Java Previous Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-11-incubating.html" title="SDO Java Incubating-1.1"><B>SDO Java 1.1 incubating</B> <EM>(April, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-10-incubating.html" title="SDO Java Incubating-1.0"><B>SDO Java 1.0 incubating</B> <EM>(Aug, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-10-incubating-beta1.html" title="SDO Java Incubating-beta1"><B>SDO Java 1.0 incubating-beta1</B> <EM>(May, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;2.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-incubating-m2.html" title="SDO Java Incubating-M2"><B>SDO Java Incubating-M2</B> <EM>(Nov, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;3.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-incubating-m1.html" title="SDO Java Incubating-M1"><B>SDO Java Incubating-M1</B> <EM>(June, 2006)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-releases.html b/site/trunk/site-publish/sdo-java-releases.html
new file mode 100644
index 0000000000..422c25f8d8
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-releases.html
@@ -0,0 +1,219 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Releases</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56240">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Releases">SDO Java Releases</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<H2><A name="SDOJavaReleases-LatestRelease"></A>Latest Release</H2>
+<H3><A name="SDOJavaReleases-What%27snewinthisRelease"></A>What's new in this Release</H3>
+
+<P>Apache Tuscany's SDO Java Release 1.1.1 represents a minor fix level above the 1.1-incubating release,  but is the first SDO release to be made since Tuscany became a top level Apache project (hence the absence of the incubating postfix). Please see <A href="http://svn.apache.org/repos/asf/tuscany/tags/java/sdo/1.1.1-RC2a/RELEASE_NOTES" class="external-link" rel="nofollow">release notes </A> for more detail.</P>
+<H3><A name="SDOJavaReleases-Windows"></A>Windows</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <FONT color="#000000">Binary</FONT> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1-src.zip</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.zip.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="SDOJavaReleases-Linux%2FMacOSX%2FUnix"></A>Linux / Mac OS X / Unix</H3>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Type </TH>
+<TH class="confluenceTh"> File </TH>
+<TH class="confluenceTh"> Signature </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Binary </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> Source </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dyn/closer.cgi/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.tar.gz" class="external-link" rel="nofollow">apache-tuscany-sdo-1.1.1-src.tar.gz</A> </TD>
+<TD class="confluenceTd"> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1.1/apache-tuscany-sdo-1.1.1-src.tar.gz.asc" class="external-link" rel="nofollow">ASC</A> <A href="http://www.apache.org/dist/tuscany/java/sdo/1.1-apache-tuscany-sdo-1.1.1-src.tar.gz.md5" class="external-link" rel="nofollow">MD5</A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<P><!-- 
+<p>&lt;!- -  Start of StatCounter Code - - &gt;<br/>
+&lt;script type="text/javascript"&gt;<br/>
+sc_project=3651091; <br/>
+sc_invisible=1; <br/>
+sc_partition=43; <br/>
+sc_security="068d05c8"; <br/>
+&lt;/script&gt;</p>
+
+<p>&lt;script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"&gt;&lt;/script&gt;&lt;noscript&gt;&lt;div class="statcounter"&gt;&lt;a href="http://www.statcounter.com/free_web_stats.html" target="_blank"&gt;&lt;img class="statcounter" src="http://c44.statcounter.com/3651091/0/068d05c8/1/" alt="web statistics" &gt;&lt;/a&gt;&lt;/div&gt;&lt;/noscript&gt;<br/>
+&lt;!- -  End of StatCounter Code - - &gt;</p> --></P>
+<H2><A name="SDOJavaReleases-PreviousReleases"></A>Previous Releases</H2>
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-11-incubating.html" title="SDO Java Incubating-1.1"><B>SDO Java 1.1 incubating</B> <EM>(April, 2008)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-10-incubating.html" title="SDO Java Incubating-1.0"><B>SDO Java 1.0 incubating</B> <EM>(Aug, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;1.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-10-incubating-beta1.html" title="SDO Java Incubating-beta1"><B>SDO Java 1.0 incubating-beta1</B> <EM>(May, 2007)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;2.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-incubating-m2.html" title="SDO Java Incubating-M2"><B>SDO Java Incubating-M2</B> <EM>(Nov, 2006)</EM></A> </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>&nbsp;3.</B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-incubating-m1.html" title="SDO Java Incubating-M1"><B>SDO Java Incubating-M1</B> <EM>(June, 2006)</EM></A> </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-source-code.html b/site/trunk/site-publish/sdo-java-source-code.html
new file mode 100644
index 0000000000..4d3fa1bf2a
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-source-code.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Source Code</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52610">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Source Code">SDO Java Source Code</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The SDO Java Source Code can be found in the Apache svn repository.</P>
+
+<P>The code for the SDO API is housed in this repository at <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/spec/sdo-api/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/java/spec/sdo-api/</A></P>
+
+<P>The code for the current implementation can be found at&nbsp; <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/</A></P>
+
+<P>Source code for previous releases can be found at <A href="http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-subproject-menu.html b/site/trunk/site-publish/sdo-java-subproject-menu.html
new file mode 100644
index 0000000000..aab9559cc6
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-subproject-menu.html
@@ -0,0 +1,125 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Subproject Menu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56221">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Subproject Menu">SDO Java Subproject Menu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-user-guide.html b/site/trunk/site-publish/sdo-java-user-guide.html
new file mode 100644
index 0000000000..2c23e921fb
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-user-guide.html
@@ -0,0 +1,171 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java User Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48492">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java User Guide">SDO Java User Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SDO Java User Guide</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+<UL>
+	<LI><A href="#SDOJavaUserGuide-GettingStarted">Getting Started</A></LI>
+	<LI><A href="#SDOJavaUserGuide-Examples">Example Walkthrough</A></LI>
+	<LI><A href="#SDOJavaUserGuide-Specification">Service Data Object Specification, Version 2.1</A></LI>
+</UL>
+
+
+<P><BR class="atl-forced-newline">
+&nbsp;</P>
+</DIV></DIV>
+
+<H3><A name="SDOJavaUserGuide-GettingStarted"></A><A name="SDOJavaUserGuide-GettingStarted"></A>Getting Started</H3>
+
+<P>As an SDO user,  you have (at least) three ways of establishing a Tuscany SDO runtime environment on your machine.  In decreasing order of likelihood, you can either</P>
+<UL>
+	<LI><A href="sdo-java-download.html" title="SDO Java Download">download</A> a binary distribution of a Tuscany Java SDO milestone release, and follow the instructions in the release archive</LI>
+	<LI>Or you can <A href="getting-source.html" title="Getting Source">download</A> a Tuscany source distribution, and follow the instruction in the release archive to recreate the corresponding binary release</LI>
+	<LI>or you can <A href="getting-source.html" title="Getting Source">build from the svn repository</A> source code, giving you the flexibility to base your runtime on the most recent code, or a particular level of your choice.</LI>
+</UL>
+
+
+<P>If you are going to take either of the latter two approaches you will need to <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">establish a development environment</A>.</P>
+
+<P>For examples of how to use SDO, you can look at the documents or at the samples.  If you have downloaded the source distribution, the sample code will be part of that distribution.  If however you have downloaded a binary distribution,  you'll need to go and <A href="http://incubator.apache.org/tuscany/sca_downloads.html" class="external-link" rel="nofollow">download</A> the sample source code as a separate archive.</P>
+
+<P>Other sources of inspiration might come from the use of SDO within the Tuscany DAS and SCA code.  When you come across issues, please look at and/or post to the Tuscany <A href="mailing-lists.html" title="Mailing Lists">mailing lists</A>.</P>
+
+<H3><A name="SDOJavaUserGuide-ExampleWalkthrough"></A><A name="SDOJavaUserGuide-Examples"></A>Example Walk-through</H3>
+
+<P>The following articles published by Tuscany committers, Kelvin Goodson and Geoffrey Winn, in Java Developer Journal  provide a quick view of SDO concepts accompanied by a sample code for a real scenario.</P>
+<UL>
+	<LI><A href="http://soa.sys-con.com/read/313547.htm" class="external-link" rel="nofollow">Part1: What is SDO?</A></LI>
+	<LI><A href="http://java.sys-con.com/read/358059.htm" class="external-link" rel="nofollow">Part2: What is SDO? </A></LI>
+</UL>
+
+
+<P>Also, the detailed documentation about the Samples is available at <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/distribution/src/main/release/bin/samples/sampleProgramContents.html" class="external-link" rel="nofollow">Sample Program Contents</A></P>
+
+<H3><A name="SDOJavaUserGuide-ServiceDataObjectSpecification2.1"></A><A name="SDOJavaUserGuide-Specification"></A>Service Data Object Specification 2.1</H3>
+
+<P>The <A href="http://www.osoa.org/display/Main/Service%20Data%20Objects%20Specifications" class="external-link" rel="nofollow">SDO Specification 2.1 for Java</A> describes the data programming interface for Java language.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-whats-new.html b/site/trunk/site-publish/sdo-java-whats-new.html
new file mode 100644
index 0000000000..5903b14403
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-whats-new.html
@@ -0,0 +1,118 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java Whats New</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53772">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java Whats New">SDO Java Whats New</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P><B>May 16th, 2007, SDO Java releases its <A href="http://www.apachenews.org/archives/000986.html" class="external-link" rel="nofollow">1.0-incubating-beta1 release</A>.</B></P>
+
+<P><B>May 9th, 2007, SDO Java <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200705.mbox/browser" class="external-link" rel="nofollow">achieves state of being a functionally complete implementation of the SDO 2.1 specification</A></B><BR>
+This was achieved at code revision level 536331.  The community is working towards a new SDO release after a period<BR>
+of enhancing the test suite and making bug fixes.</P>
+
+<P><B>May 2nd, 2007, SDO Java beta1 release <A href="http://www.mail-archive.com/general@incubator.apache.org/msg13776.html" class="external-link" rel="nofollow">requests ratification</A> from the Incubator Project Management Committee as a final stage before announcement.</B></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java-whats-to-be-done.html b/site/trunk/site-publish/sdo-java-whats-to-be-done.html
new file mode 100644
index 0000000000..fb4f34c507
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java-whats-to-be-done.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java - What's to be done</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91198">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java - What's to be done">SDO Java - What's to be done</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>DRAFT DOCUMENT</P>
+
+<P>for now just a stream of consciousness list of things that could be done,&nbsp; in no particular order</P>
+
+<P>fix copy and equality helper to handle change summaries<BR>
+take on board some of the 2.1.1 spec resolutions<BR>
+create a parallel API source tree for the 1.2.1 API (javax.sdo instead of commonj.sdo)<BR>
+create an ecmascript / javascript version of SDO<BR>
+generate from annotated java interfaces<BR>
+SDO databinding for Axis2<BR>
+ensure appropriate edits to 1.1.1 branch and tag are applied to trunk</P>
+
+<P>Current list of <A href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&type=4&type=2&type=5&pid=12310210&status=1&status=3&status=4&component=12311542&component=12310660&component=12310973&component=12310802&sorter%2Ffield=issuekey&sorter%2Forder=DESC&sorter%2Ffield=components&sorter%2Forder=ASC&sorter%2Ffield=updated&sorter%2Forder=DESC" class="external-link" rel="nofollow">features, improvements and wishes</A></P>
+
+
+
+<P>more to come ...&nbsp;</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-java.data/do_uml.png b/site/trunk/site-publish/sdo-java.data/do_uml.png
new file mode 100644
index 0000000000..4cd5e5d190
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/do_uml.png
diff --git a/site/trunk/site-publish/sdo-java.data/do_uml.png.jpeg b/site/trunk/site-publish/sdo-java.data/do_uml.png.jpeg
new file mode 100644
index 0000000000..d7f7470b0d
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/do_uml.png.jpeg
diff --git a/site/trunk/site-publish/sdo-java.data/meta.png b/site/trunk/site-publish/sdo-java.data/meta.png
new file mode 100644
index 0000000000..f99464f4ab
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/meta.png
diff --git a/site/trunk/site-publish/sdo-java.data/meta.png.jpeg b/site/trunk/site-publish/sdo-java.data/meta.png.jpeg
new file mode 100644
index 0000000000..3a2d6f1db1
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/meta.png.jpeg
diff --git a/site/trunk/site-publish/sdo-java.data/meta2.png b/site/trunk/site-publish/sdo-java.data/meta2.png
new file mode 100644
index 0000000000..9c9b25f892
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/meta2.png
diff --git a/site/trunk/site-publish/sdo-java.data/meta2.png.jpeg b/site/trunk/site-publish/sdo-java.data/meta2.png.jpeg
new file mode 100644
index 0000000000..9972fdcfa6
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.data/meta2.png.jpeg
diff --git a/site/trunk/site-publish/sdo-java.html b/site/trunk/site-publish/sdo-java.html
new file mode 100644
index 0000000000..57258ca833
--- /dev/null
+++ b/site/trunk/site-publish/sdo-java.html
@@ -0,0 +1,147 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Java</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47547">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Java">SDO Java</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SDOJava-TuscanySDOJava"></A>Tuscany SDO Java	</H3>
+
+<P>Tuscany SDO Java implements SDO 2.1 specification and is complemented with utility APIs that further extend the functionality.</P>
+
+<P>The project's code base includes the following:</P>
+
+<UL>
+	<LI>Dynamic data object support</LI>
+	<LI>Static code generation (recently updated to remove the externalised <A href="http://eclipse.org/emf" class="external-link" rel="nofollow">EMF</A> dependency aspects)</LI>
+	<LI>Scoping of Types using XMLHelper, XSDHelper, DataFactory, CopyHelper, EqualityHelper implementations.</LI>
+	<LI>ChangeSummary support for both the DataGraphs and DataObjects</LI>
+	<LI>Example programs</LI>
+</UL>
+
+
+<P>Tuscany provides a relational data access service (<A href="http://incubator.apache.org/tuscany/rdb-das-java.html" class="external-link" rel="nofollow">RDB DAS</A>) that works with SDO Java. More DAS implementations are underway.</P>
+
+<H3><A name="SDOJava-SDOCommunityTestSuite"></A>SDO Community Test Suite</H3>
+
+<P><B>The SDO community test suite stands separately from the Tuscany Implementation of SDO subproject.</B> It is a collaborative effort by SDO community to  provide a set of tests that exercise any SDO 2.1 implementation. Learn more about SDO CTS and how to get involved at this <A href="sdo-cts.html" title="SDO CTS">link</A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-overview-menu.html b/site/trunk/site-publish/sdo-overview-menu.html
new file mode 100644
index 0000000000..9d111b1ce5
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview-menu.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>SDO Overview menu : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=102271">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Overview menu">SDO Overview menu</A>
+
+            </TD>
+
+            
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <IMG src="community.data/chinese.jpg" align="absmiddle" border="0"><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo-overview-sandbox.html b/site/trunk/site-publish/sdo-overview-sandbox.html
new file mode 100644
index 0000000000..97588201d0
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview-sandbox.html
@@ -0,0 +1,122 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Overview - sandbox</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48476">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="old-sandbox.html" title="old-Sandbox">old-Sandbox</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Overview - sandbox">SDO Overview - sandbox</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>Service Data Objects simplify and unify SOA data access architecture and code in a heterogeneous environment. SDO is programming language neutral. Within Tuscany it is being implemented in Java and in C++. A PHP version of SDO is available for download from the PHP Extensions Community Library (PECL).</P>
+
+<P>SDO can be used to represent data structures from the presentation layer all the way through to the persistence layer.</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (sdocontext_sm.jpg) not found.</SPAN></P>
+
+<P>SDO is a natural format for representing data on the wire in an SOA environment.</P>
+
+<P><SPAN class="error">Unable to render embedded object: File (sdo_soa_sm.jpg) not found.</SPAN></P>
+
+<P>Data Access Services (DAS) access data sources and produce data graphs. Modifications made to graphs by the application are summarized in the graph structure, and the DAS can use this change summary to update the original data source.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg b/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg
new file mode 100644
index 0000000000..dca26660d7
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg
diff --git a/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg.jpeg b/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg.jpeg
new file mode 100644
index 0000000000..41d5906646
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview.data/sdo_soa_sm.jpg.jpeg
diff --git a/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg b/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg
new file mode 100644
index 0000000000..b7f0061f7f
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg
diff --git a/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg.jpeg b/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg.jpeg
new file mode 100644
index 0000000000..cb26c1d5d7
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview.data/sdocontext_sm.jpg.jpeg
diff --git a/site/trunk/site-publish/sdo-overview.html b/site/trunk/site-publish/sdo-overview.html
new file mode 100644
index 0000000000..d50add550c
--- /dev/null
+++ b/site/trunk/site-publish/sdo-overview.html
@@ -0,0 +1,178 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Overview</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=47544">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Overview">SDO Overview</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+
+
+<H4><A name="SDOOverview-WhatisServiceDataObject%3F"></A>What is Service Data Object?</H4>
+<P>SOA creates an environment where different types of data must work together. This makes application development complex. Service Data Object(SDO), provides a very simple programming model that addresses this issue. The key high level advantages of SDO are:</P>
+
+<UL>
+	<LI>Uniform access to data from heterogeneous sources which could be XML, RDB, POJO, SOAP, etc.</LI>
+	<LI>SDO provides both a static (or strongly typed) programming model and a dynamic (or loosely typed) programming model. This provides a simple programming model without sacrificing the dynamic model needed by tools and frameworks.</LI>
+	<LI>Provides Meta-data for easy introspection of data types</LI>
+	<LI>Supports a disconnected model, whereby data can be retrieved from a data source via <A href="http://incubator.apache.org/tuscany/das-overview.html" class="external-link" rel="nofollow">Data Access Service</A>. The data can be modified by a client with change tracking, and applied back to the data source.</LI>
+	<LI>SDO programming model is language neutral</LI>
+</UL>
+
+
+<P>Tuscany implements SDO in <A href="sdo-java.html" title="SDO Java">Java</A> and in <A href="sdo-cpp.html" title="SDO CPP">C++</A>. A <A href="http://www.osoa.org/display/PHP/SOA%20PHP%20Homepage" class="external-link" rel="nofollow">PHP version of SDO</A> is also available.</P>
+
+<P><A href="http://www.osoa.org/display/Main/Service%20Data%20Objects%20Specifications" class="external-link" rel="nofollow">SDO specification</A> can be found at the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open Service Oriented Architecture website</A>. </P>
+
+<H4><A name="SDOOverview-LearnmoreaboutSDO"></A>Learn more about SDO</H4>
+
+<UL>
+	<LI><A href="http://soa.sys-con.com/read/313547.htm" class="external-link" rel="nofollow">What is SDO? Part One: The value of many of the facets of SDO</A>,Java Developer Journal, article by Kelvin Goodson &amp; Geoffrey Winn</LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://java.sys-con.com/read/358059.htm" class="external-link" rel="nofollow">What is SDO? Part 2 - A standardized approach to data programming particularly well suited to SOA</A>,Java Developer Journal, article by Kelvin Goodson &amp; Geoffrey Winn</LI>
+</UL>
+
+
+<UL>
+	<LI>Varous white papers and presentations about SDO can be found on www.osoa.org <A href="http://osoa.org/display/Main/SDO%20Resources" class="external-link" rel="nofollow">SDO resoruces page</A>.</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-php.html b/site/trunk/site-publish/sdo-php.html
new file mode 100644
index 0000000000..ae3f5cd9f9
--- /dev/null
+++ b/site/trunk/site-publish/sdo-php.html
@@ -0,0 +1,113 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO PHP</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50763">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SDO PHP">SDO PHP</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>A PHP implementation of SDO is available outside of Apache in PECL.php. This implementation is based on the Apache Tuscany C++. This information is provided here as a reference for those interested in a PHP open source implementation of SDO.</P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png b/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png
new file mode 100644
index 0000000000..103a4bddcc
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png.jpeg b/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png.jpeg
new file mode 100644
index 0000000000..a066ee20ce
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/do_uml.png.jpeg
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/meta.png b/site/trunk/site-publish/sdo-project-code-structure.data/meta.png
new file mode 100644
index 0000000000..f99464f4ab
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/meta.png
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/meta.png.jpeg b/site/trunk/site-publish/sdo-project-code-structure.data/meta.png.jpeg
new file mode 100644
index 0000000000..3a2d6f1db1
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/meta.png.jpeg
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png b/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png
new file mode 100644
index 0000000000..9c9b25f892
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png
diff --git a/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png.jpeg b/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png.jpeg
new file mode 100644
index 0000000000..9972fdcfa6
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.data/meta2.png.jpeg
diff --git a/site/trunk/site-publish/sdo-project-code-structure.html b/site/trunk/site-publish/sdo-project-code-structure.html
new file mode 100644
index 0000000000..b77999d6d2
--- /dev/null
+++ b/site/trunk/site-publish/sdo-project-code-structure.html
@@ -0,0 +1,402 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SDO Project Code Structure</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48536">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="developing-sdo-java.html" title="Developing SDO Java">Developing SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Project Code Structure">SDO Project Code Structure</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="tuscany-sdo-java-faq.html" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="SDOProjectCodeStructure-SDOProjectCodeStructure"></A>SDO Project Code Structure</H3>
+
+<P>The code for the Tuscany Java SDO implementation may be found at <A href="http://svn.apache.org/repos/asf/incubator/tuscany/java/" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/incubator/tuscany/java/</A></P>
+
+<P>The SDO project is divided into seven parts, denoted here by the subdirectories of the above link where the code for the projects may be found:</P>
+
+<UL>
+	<LI><B>sdo/sdo-api</B> contains the SDO (commonj) interfaces defined and provided by the SDO 2.1 specification.</LI>
+	<LI><B>sdo/lib</B> contains the SDO implementation library</LI>
+	<LI><B>sdo/impl</B> provides the runtime implementation of the SDO interfaces.</LI>
+	<LI><B>sdo/tools</B> contains import and generator tools.</LI>
+	<LI><B>sdo/tools-test</B> contains the tests for the SDO Generator Tools and Tool Outputs</LI>
+	<LI><B>sdo/sample</B> contains sample sdo code.</LI>
+	<LI><B>sdo/plugin</B> contains code to configure the way in which SDO is build by maven.</LI>
+</UL>
+
+
+<P>For each of these projects the implementation source code is located in a sub-directory of the project directory named src/main/java, and if applicable, test (example) classes are located in src/test/java. The directory src/test/resources contains any data files needed by the test programs.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/sdo-api" class="external-link" rel="nofollow">sdo/sdo-api</A></P>
+
+<P>This project contains the interfaces provided with the SDO 2.1 specification. It is essentially an unzipped copy of the SDO Java API sources zip file available at <A href="http://osoa.org/download/attachments/36/SDO_2.1.0_Java_source_FINAL.zip?version=1" class="external-link" rel="nofollow">http://osoa.org/download/attachments/36/SDO_2.1.0_Java_source_FINAL.zip?version=1</A>, but with some errata corrections and a Tuscany-specific implementation of class HelperProvider.</P>
+
+<P>The abstract class, HelperProvider, is used to obtain specific default helpers and other implementation-specific objects used by the Java implementation of SDO. In the Tuscany implementation of this class, there are two ways to specify the implementation of the HelperProvider class.</P>
+
+<UL>
+	<LI>Set a System Property named &quot;commonj.sdo.impl.HelperProvider&quot; equal to the fully qualified class name of the implementation class (e.g. &quot;commonj.sdo.impl.HelperProvider=org.apache.tuscany.sdo.help.HelperProviderImpl&quot;).</LI>
+</UL>
+
+
+<UL>
+	<LI>In your own jar file, create a text file called &quot;META-INF/services/commonj.sdo.impl.HelperProvider&quot;. In this text file, specify the fully qualified custom HelperProvider implementation class (e.g. org.apache.tuscany.sdo.help.HelperProviderImpl).</LI>
+</UL>
+
+
+<P>In the event that both 1 and 2 are specified, the System Property will take precedence over the text file.</P>
+
+<P>The Tuscany default helper provider implementation class is org.apache.tuscany.sdo.helper.HelperProviderImpl (in the sdo.impl project) and is registered using the second technique (services file), as described in the following section.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/lib" class="external-link" rel="nofollow">sdo/lib</A></P>
+
+<P>This project contains the library APIs for Tuscany's SDO Implementation and some utility/helper packages. The actual implementation resides in sdo/impl. The user is supposed to use the APIs from sdo/lib instead of making direct references to sdo/impl. Unlike sdo/impl this projest does not reference EMF packages anywhere.</P>
+
+<P><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/impl" class="external-link" rel="nofollow">sdo/impl</A></P>
+
+<P>The sdo.impl subproject contains a test package under src/test/java (see the section below entitled Static Code Generator for details) and the following implementation packages under src/main/java:</P>
+
+<P><B>package org.apache.tuscany.sdo</B></P>
+
+<P>Contains a few interfaces used by some of the implementation classes in org.apache.tuscany.sdo.impl. (Note: this package is subject to further cleanup.)</P>
+
+<P><B>package org.apache.tuscany.sdo.helper</B></P>
+
+<P>This package contains implementations of the &quot;helper&quot; interfaces defined in the commonj.sdo.helper package (in the sdo.spec project). Each helper interface in commonj.sdo.helper has a corresponding implementation class in this package. The name of each helper class is the same as the corresponding interface, only with the suffix &quot;Impl&quot; appended. For example class org.apache.tuscany.sdo.helper.TypeHelperImpl implements the interface commonj.sdo.TypeHelper.</P>
+
+<P>The implementation class org.apache.tuscany.sdo.helper.HelperProviderImpl is used to bootstrap an implementation of the default INSTANCEs of the SDO helper (see class commonj.sdo.impl.HelperProvider in sdo.spec). This implementation creates instances of the other helper implementation classes in this package and is registered using the services file src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider.</P>
+
+<P><B>package org.apache.tuscany.sdo.impl</B></P>
+
+<P>This package contains the majority of the SDO runtime implementation code. This includes implementations of all of the commonj.sdo interfaces (see sdo.spec), including several implementations of the DataObject interface. The design and implementation of the most important classes in this package are described below).</P>
+
+<P><B>package org.apache.tuscany.sdo.util</B></P>
+
+<P>Contains some utility classes used by the implementation. <B>One class, SDOUtil, is particularly important</B>. It provides some useful static utility functions which are not included in the SDO specification itself. Although these are not &quot;standard&quot; APIs, use of them is recommended, as opposed to resorting to low-level implementation-specific APIs. The intent of this class is to encapsulate, in a relatively clean way, common functions that are needed, and can potentially be proposed for addition to the specification in a future version of SDO.</P>
+
+<P><B><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo/tools" class="external-link" rel="nofollow">sdo/tools</A></B></P>
+
+<P>This project contains (command line) tools, such as SDO model importers and generators (Java code, XML schema, etc.). Currently however, there is only a single tool, a Java code generator implemented in class org.apache.tuscany.sdo.generate.XSD2JavaGenerator. This generator can be used to generate static SDO data objects and is described in more detail in below.</P>
+
+<P>The sdo-tools project also contains a test program and sample generated model located in src/test/java and src/test/resources respectively (see the tests section below for more details).</P>
+
+<P><B>Dependent Jars</B></P>
+
+<P>The sdo.impl project requires the following EMF (Eclipse Modeling Framework - www.eclipse.org/emf) runtime jars to build:</P>
+
+<P>emf-common-2.2.1-SNAPSHOT.jar - some common framework utility and base classes<BR>
+emf-ecore-2.2.1-SNAPSHOT.jar - the EMF core runtime implementation classes (the Ecore metamodel)<BR>
+emf-ecore-change-2.2.1-SNAPSHOT.jar - the EMF change recorder and framework<BR>
+emf-ecore-xmi-2.2.1-SNAPSHOT.jar - EMF's default XML (and XMI) serializer and loader<BR>
+xsd-2.2.1-SNAPSHOT.jar - the XML Schema model</P>
+
+<P>The sdo.tools project also requires the EMF code generator framework jars:</P>
+
+<P>emf-codegen-2.2.1-SNAPSHOT.jar - template-based codegen framework (JET - Java Emitter Templates)<BR>
+emf-codegen-ecore-2.2.1-SNAPSHOT.jar - the EMF code generator<BR>
+emf-common-2.2.1-SNAPSHOT.jar - some common framework utility and base classes<BR>
+emf-ecore-2.2.1-SNAPSHOT.jar - the EMF core runtime implementation classes (the Ecore metamodel)<BR>
+emf-ecore-change-2.2.1-SNAPSHOT.jar - the EMF change recorder and framework<BR>
+emf-ecore-xmi-2.2.1-SNAPSHOT.jar - EMF's default XML (and XMI) serializer and loader<BR>
+xsd-2.2.1-SNAPSHOT.jar - the XML Schema model</P>
+
+<P>These are simply Maven-friendly versions of corresponding jar files/plugins obtained from Eclipse. SNAPSHOT maps to an EMF weekly integration build (for example, I200602160000). Note that if you are building SDO for a released source code distribution then the dependency jars will not be snapshot jars, but will instead themselves be released versions of the dependencies.</P>
+
+
+<P><B>Runtime Implementation</B></P>
+
+<P>The primary SDO runtime implementation classes are located in the package org.apache.tuscany.sdo.impl and consist of the following:</P>
+
+<UL>
+	<LI>DataObject implementation classes</LI>
+	<LI>Implementation of the SDO metamodel interfaces: Type and Property</LI>
+	<LI>ChangeSummary and DataGraph implementations</LI>
+</UL>
+
+
+<P>The implementation of the SDO runtime is based on and leverages the EMF runtime model (i.e., EObject and the Ecore metamodel - refer to documentation at www.eclipse.org/emf). It subclasses and specializes the Ecore metamodel, and provides its own DataObject-tuned implementation(s) of the EObject interface. The design is described in more detail in the following sections.</P>
+
+<P><B>DataObject implementation classes</B></P>
+
+<P>SDO provides several DataObject implementation classes as shown in the following diagram:</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sdo-project-code-structure.data/do_uml.png" style="border: 0px solid black"></SPAN></P>
+
+<P>Class DataObjectImpl is the most important. It provides a complete base implementation of the SDO DataObject interface. It extends from the EMF base class BasicEObjectImpl, which provides the &quot;scaffolding&quot; needed to easily implement an EObject, but without allocating any storage itself.</P>
+
+<P>DataObjectImpl provides the DataObject implementation while allocating only the minimum storage overhead needed to be a data object (e.g., container pointer and feature, change recorder). It does not, however, allocate any storage for the actual properties of the data object. It instead requires subclasses for this purpose. For example, statically generated SDOs (see the generator section below) directly or indirectly extend from this class, providing their own storage in generated instance variables.</P>
+
+<P>The subclass, DynamicDataObjectImpl serves as a concrete implementation class for dynamic data objects. It is the default implementation class used when creating dynamic data objects using the DataFactory.create() method, for example. DynamicDataObjectImpl provides efficient data storage using a dynamically allocated settings array.</P>
+
+<P>StoreDataObjectImpl and DynamicStoreDataObjectImpl provide a delegating implementations for DataObjects that implement their own storage management using a store (see EMF's EStore interface) implementation class. StoreDataObjectImpl is used in conjuction with the &quot;-storePattern&quot; generator option (see section 4), while DynamicStoreDataObjectImpl, as its name implies, is used for dynamic store-based instances.</P>
+
+<P><B>Type and Property implementation classes</B></P>
+
+<P>The SDO implementation provides three implementations of the interface Type, one for each of the following three kinds of types: classes, simple data types, and enumerations.</P>
+
+<UL>
+	<LI>class ClassImpl extends EClassImpl implements Type</LI>
+	<LI>class DataTypeImpl extends EDataTypeImpl implements Type</LI>
+	<LI>class EnumImpl extends EEnumImpl implements Type</LI>
+</UL>
+
+
+<P>For example, class org.apache.tuscany.sdo.impl.ClassImpl extends form the corresponding Ecore class, EClassImpl, and mixes in the SDO interface commonj.sdo.Type. All the Type methods are implemented by calls to super.</P>
+
+<P>With this approach, a data object's Type, returned from DataObjectImpl.getType(), and its EClass, returned by DataObjectImpl.eClass(), are the same underlying meta object. This allows the SDO implementation to leverage any appropriate base functionality without any performance overhead. The arrangement is shown in the following diagram:</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sdo-project-code-structure.data/meta.png" style="border: 0px solid black"></SPAN></P>
+
+<P>The implementation of the SDO Property interface follows a similar pattern. Two implementation classes, subclasses of corresponding Ecore classes, mix in the Property interface:</P>
+
+<UL>
+	<LI>class AttributeImpl extends EAttributeImpl implements Property</LI>
+	<LI>class ReferenceImpl extends EReferenceImpl implements Property</LI>
+</UL>
+
+
+<P>As with the Type implementation classes, these classes call methods on super to implement the mixed-in Property methods.</P>
+
+<P>The following diagram illustrates the design:</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="sdo-project-code-structure.data/meta2.png" style="border: 0px solid black"></SPAN></P>
+
+<P>As shown, the getProperties() method in ClassImpl (i.e., of the SDO Type interface) returns a set of properties whose implementation classes also implement EAttribute or EReference, and since ClassImpl, extends EClassImpl (as shown in the previous diagram), these are in fact the same objects as those returned by the EClass.getEAllStructuralFeatures() method. The two metamodels are one and the same, making the implementation of many of the SDO APIs trivial calls to the base class.</P>
+
+<P>ChangeSummary and DataGraph implementation classes</P>
+
+<P>TBD.</P>
+
+
+<P><B>Static Code Generator</B></P>
+
+<P>The SDO static code generator is a command line tool for generating Java source code (static SDOs) for DataObjects defined in an XML Schema. It is implemented by the class org.apache.tuscany.sdo.generate.XSD2JavaGenerator in the sdo.tools project. The generator is used as follows:<BR>
+<FONT color="gray"><BR>
+Usage arguments:<BR>
+<BR>
+ [ -targetDirectory &lt;target-root-directory&gt; ]<BR>
+ [ -javaPackage &lt;base-package-name&gt; ]<BR>
+ [ -prefix &lt;prefix-string&gt; ]<BR>
+ [ -sparsePattern | -storePattern ]<BR>
+ [ -noInterfaces ] [ -noContainment ] [ -noNotification ] [ -arrayAccessors ] [ -noUnsettable ] [ -noEMF ]<BR>
+ &lt;xsd-file&gt; | &lt;wsdl-file&gt;</FONT><BR>
+For example:<BR>
+<FONT color="gray"><BR>
+java XSD2JavaGenerator somedir/somefile.xsd</FONT></P>
+
+<P>Options:</P>
+
+<P>-targetDirectory Generates the Java source code in the specified directory. By default, the code is generated in the same directory as the input xsd or wsdl file.</P>
+
+<P>-javaPackage Overrides the Java package for the generated classes. If not specified, a default package or one specified with an sdoJava:package annotation on the &lt;schema&gt; element in the xsd file (see SDO specification for details) is used for the java package.</P>
+
+<P>-prefix Specifies the prefix string to use for naming the generated factory. For example &quot;-prefix Foo&quot; will result in a factory interface with the name &quot;FooFactory&quot;.</P>
+
+<P>-sparsePattern For SDO metamodels that have classes with many properties of which only a few are typically set at runtime, this option can be used to produce a space-optimized implementation (at the expense of speed).</P>
+
+<P>-storePattern This option can be used to generate static classes that work with a Store-based DataObject implementation. It changes the generator pattern to generate accessors which delegate to the reflective methods (as opposed to the other way around) and changes the DataObject base class to org.apache.tuscany.sdo.impl.StoreDataObjectImpl. Note that this option generates classes that require a Store implementation to be provided before they can be run.</P>
+
+<P>-noInterfaces By default, each DataObject generates both a Java interface and a corresponding implementation class. If an SDO metamodel does not use multiple inheritance (which is always the case for XML Schema derived models), then this option can be used to eliminate the interface and to generate only an implementation class.</P>
+
+<P>-noNotification This option eliminates all change notification overhead in the generated classes. Changes to DataObjects generated using this option cannot be recorded, and consequently the classes cannot be used with an SDO ChangeSummary or DataGraph.</P>
+
+<P>-noContainment Turns off container management for containment properties. DataObject.getContainer() will always return null for data objects generated with this option, even if a containment reference is set. Setting a containment reference will also not automatically remove the target object from its previous container, if it had one, so it will need to be explicitly removed by the client. Use of this option is only recommended for scenarios where this kind of container movement/management is not necessary.</P>
+
+<P>-arrayAccessors <B>Note: this is prototype code and is not fully implemented.</B> Generates Java array getters/setters for multiplicity-many properties. With this option, the set of &quot;standard&quot; JavaBean array accessor methods (e.g., Foo[] getFoo(), Foo getFoo(int), int getFooLength(), setFoo(Foo[]), and void setFoo(int, Foo)) are generated. The normal List-returning accessor is renamed with the suffix &quot;List&quot; (e.g., List getFooList()). The array returned by the generated method is not a copy, but instead a pointer to the underlying storage array, so directly modifying it can have undesirable consequences and should be avoided.</P>
+
+<P>-noUnsettable By default, some XML constructs result in SDO property implementations that maintain additional state information to record when the property has been set to the &quot;default value&quot;, as opposed to being truly unset (see DataObject.isSet() and DataObject.unset()). The SDO specification allows an implementation to choose to provide this behavior or not. With this option, all generated properties will not record their unset state. The generated isSet() methods simply returns whether the current value is equal to the property's &quot;default value&quot;.</P>
+
+<P>-noEMF By default, the generated java implementation source files directly import the Eclipse EMF classes which they depend upon. This can lead to a discrepancy in EMF library level dependencies between the generated classes and the environment into which they are deployed. The -noEmf option provides an early level of function to avoid this situation. Classes generated using this option access EMF function indirectly via inherited behaviour, thereby allowing packaging of these generated classes into jar files which do not directly depend on EMF.</P>
+
+<P>This early implementation of this option is limited in the subset of XML Schema it is known to handle, and is subject to change. The generator is known to be able to deal with Complex content (including content models which map to SDO Sequence), and Mixed content for example .</P>
+
+<P>      &lt;xsd:complexType mixed=&quot;true&quot; name=&quot;Sequence&quot;&gt;<BR>
+         &lt;xsd:sequence&gt;<BR>
+            &lt;xsd:choice maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;&gt;<BR>
+               &lt;xsd:element name=&quot;a&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+               &lt;xsd:element name=&quot;b&quot; type=&quot;xsd:int&quot; /&gt;<BR>
+            &lt;/xsd:choice&gt;<BR>
+            &lt;xsd:element name=&quot;split&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+            &lt;xsd:choice maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;&gt;<BR>
+               &lt;xsd:element name=&quot;y&quot; type=&quot;xsd:string&quot; /&gt;<BR>
+               &lt;xsd:element name=&quot;z&quot; type=&quot;xsd:int&quot; /&gt;<BR>
+            &lt;/xsd:choice&gt;<BR>
+        &lt;/xsd:sequence&gt;<BR>
+     &lt;/xsd:complexType&gt;<BR>
+Generator Patterns</P>
+
+<P>The DataObject interface generation pattern is as described in the SDO specification (see Java Interface Specification section). The SDO specification does not define a factory pattern for efficient construction of static SDOs, which is however provided by the Tuscany implementation. The generated SDO Factory interface conforms to the following pattern:<BR>
+<FONT color="gray">
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>public interface &lt;prefix&gt;Factory {
+  &lt;Type1&gt; create&lt;Type1&gt;();
+  &lt;Type2&gt; create&lt;Type2&gt;();
+  ...
+  &lt;prefix&gt;Factory INSTANCE = &lt;default_factory_impl&gt;;
+}
+</PRE>
+</DIV></DIV></FONT></P>
+
+
+<P>A generated factory corresponds to an SDO Type namespace uri (see commonj.sdo.Type.getURI) with one create() method for each SDO Type in the namespace. The &lt;prefix&gt; of the factory name is derived from the uri. An instance of the factory is available using the INSTANCE field in the interface.</P>
+
+<P>Using the static factory, a DataObject might be created as follows:</P>
+
+<P>Quote aQuote = StockFactory.INSTANCE.createQuote();<BR>
+... // do something with aQuote<BR>
+The generated implementation of each create() method simply constructs an instance of the corresponding type like this:</P>
+
+<P><FONT color="gray">
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>  public Quote createQuote() {
+    QuoteImpl quote = new QuoteImpl();
+    return quote;
+  }
+</PRE>
+</DIV></DIV></FONT><BR>
+In addition to these generated type-specific create&lt;Type&gt;() methods, the generated factory implementation class also includes a generated reflective create() method that, given an SDO Type, efficiently dispatches to the correct type-specific create() method. The reflective create() method is called by the implementation of the SDO commonj.sdo.helper.DataFactory interface.</P>
+
+
+<P><B>Test/Example Programs</B></P>
+
+<P>The SDO project does not include any proper sample programs at this time (any volunteers?) but it does include a number of JUnit test cases, some of which serve as good examples of how to use SDO APIs to perform various tasks.</P>
+
+<P>The following tests are particularly good SDO examples included in the sdo.impl project:</P>
+
+<P>SimpleDynamicTestCase This program uses the SDO XSDHelper.define() method to register a simple XML Schema based model (simple.xsd). It then instantiates a DataObject instance (type Quote), initializes several of its properties, and then serializes the instance to an XML stream.</P>
+
+<P>MixedTypeTestCase This program shows how to uses the Sequence API to create an XML instance which mixes arbitrary text within the DataObject's XML structure. It uses the XML schema complexType (MixedQuote) in mixed.xsd to define the SDO model.</P>
+
+<P>OpenTypeTestCase Uses an XML Schema complexType with a wildcard (xsd:any) to illustrate how to work with and manipulate an SDO open type. The type OpenQuote in open.xsd is used for this example.</P>
+
+<P>SimpleCopyTestCase Uses the SDO CopyHelper to create shallow and deep copies of the simple Quote model from SimpleDynamicTest.</P>
+
+<P>SimpleEqualityTestCase Uses the SDO EqualityHelper to perform deep and shallow equality checks.</P>
+
+<P>ChangeSummaryTestCase Creates a data graph with an instance of type Quote (in simple.xsd) as the root object. It then turns on change logging and makes a number of changes to the graph. Finally, it turns off change logging and serializes the data graph.</P>
+
+<P>XSDHelperTestCase This program shows how the XSDHelper.define() method can be called multiple times with the same schema. The second (and subsequent) call simply returns an empty list since no new types are defined.</P>
+
+<P>The following is in the sdo.tools project:</P>
+
+<P>SimpleStaticTestCase - This test performs the same function as SimpleDynamicTestCase, above, only using a generated version of the simple.xsd model. The generated model has been pre-generated (with default options) in the directory src/test, but it can be regenerated using the XSD2JavaGenerator, possibly with different generator options (e.g., -noInterfaces or -sparsePattern), if desired.</P>
+
+<P>StaticSequenceNoEmfTest This test exercises the -noEMF generator option with a set of complex types, focussing on Sequenced behaviour in the generated classes. The generated model has been pre-generated (with options -noEMF -javaPackage com.example.noemf.sequences) in the directory src/test, but it can be regenerated using the XSD2JavaGenerator, possibly with different generator options (e.g., -noInterfaces or -sparsePattern), if desired.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/sdo-releases.html b/site/trunk/site-publish/sdo-releases.html
new file mode 100644
index 0000000000..feeaec8c7e
--- /dev/null
+++ b/site/trunk/site-publish/sdo-releases.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SDO Releases : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55500">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="" title="SDO Releases">SDO Releases</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/sdo.html b/site/trunk/site-publish/sdo.html
new file mode 100644
index 0000000000..ef60260c62
--- /dev/null
+++ b/site/trunk/site-publish/sdo.html
@@ -0,0 +1,83 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>SDO : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=54959">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SDO">SDO</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg
new file mode 100644
index 0000000000..a599e54f0a
--- /dev/null
+++ b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg
diff --git a/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg.jpeg b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg.jpeg
new file mode 100644
index 0000000000..bdfc0ccabc
--- /dev/null
+++ b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/VideoIcon.jpg.jpeg
diff --git a/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif
new file mode 100644
index 0000000000..5bfc2fc5ee
--- /dev/null
+++ b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif
diff --git a/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif.jpeg b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif.jpeg
new file mode 100644
index 0000000000..fe4e2455c9
--- /dev/null
+++ b/site/trunk/site-publish/security-aware-programming-in-tuscany.data/apache-feather.gif.jpeg
diff --git a/site/trunk/site-publish/security-aware-programming-in-tuscany.html b/site/trunk/site-publish/security-aware-programming-in-tuscany.html
new file mode 100644
index 0000000000..14d9dfd2cd
--- /dev/null
+++ b/site/trunk/site-publish/security-aware-programming-in-tuscany.html
@@ -0,0 +1,247 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Security Aware Programming in Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=80637">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Security Aware Programming in Tuscany">Security Aware Programming in Tuscany</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="SecurityAwareProgramminginTuscany-SecurityAwareProgramminginTuscany."></A>Security Aware Programming in Tuscany.</H1>
+<P><FONT color="green"> <BR>
+<A href="http://vcasmo.com/video/beckerdo/2750" class="external-link" rel="nofollow"><B>Java Security</B></A> is available in Video, use tuscany passcode</FONT> </P>
+
+<H2><A name="SecurityAwareProgramminginTuscany-IntroductiontoJavaSecurity"></A>Introduction to Java Security</H2>
+
+<P>As you develop software for the <B>Apache Tuscany</B> project, it is important to be aware and maintain the security features of the Java platform. Java's success is promoted by its security architecture and relative absence from security problems. Similarly, Tuscany will benefit as a platform if the developers take care to keep it secure and free from ill-intentioned users.</P>
+
+<P>This article focuses on the <B>security manager</B> and <B>access control</B> mechanisms in the Java platform and the Tuscany code base. The focus here is not on SCA applications and samples, but rather contributions that affect the Tuscany runtime including any contributions or additions such as new bindings, implementations, or data bindings. Taking advantage of the security manager and limiting access to secure areas of the code base are the primary defense against unsafe operation of Tuscany's SCA platform. And since Tuscany code is available for anyone to read, it is important to prevent any unprivileged access to the system on which Tuscany is running. This requires that developers understand application runtime and server policies and how to guard the system resources. Here is a good overview of <A href="http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html" class="external-link" rel="nofollow">Java Security</A>.</P>
+
+<P>By default, Java application code and the Tuscany code base run in an unsecure environment with no security manager. This gives the Java application access to all system resources. The application may read and write all system properties, open and read any system files, and do all sorts of unprotected actions. All Tuscany code will run unhindered in this environment. And all malicious Tuscany users will also run unhindered in this environment.</P>
+
+<P>You may turn security on by running your Tuscany application with the <TT>-Djava.security.manager</TT> option on the command line. The default security manager delegates access control decisions to <TT>java.security.AccessController</TT>. The <TT>AccessController</TT> determines access authority for your Java code by consulting the permissions in a <TT>java.security.Policy</TT> class usually specified in the default <TT>security.policy</TT> file.</P>
+
+<P>There is only one <TT>Policy object</TT> installed into a Java runtime at any given time. The default behavior for Java is to  load the authorization data from one or more security policy files, but Tuscany users may add to or replace the policy by running with additional policy information on the command line. For instance <TT>&quot;-Djava.security.manager -Djava.security.policy=tuscany.policy -Dpolicy.allowSystemProperty=true&quot;</TT> will add the permissions in the tuscany.policy file to the default Java permissions. If you specify <TT>&quot;-Djava.security.policy==tuscany.policy&quot;</TT> you replace the default policy with those specified in the Tuscany policy file. When Tuscany is run by an application server (whether it be WebSphere, Geronimo, or other), the policy of the server will form the starting point for Tuscany's security policy.</P>
+
+<P>Each policy file will contain a list of grant statements. A grant tells the runtime where the code came from (a URL specifying the code base), who signed the code (a list of signer certificates), and what permissions are given. The permissions can be read write permissions to the file system, access to system properties, or class loading privileges.<BR>
+An example of a granting all permission to an unsigned Tuscany code base is given here:</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>security.policy example</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grant codeBase <SPAN class="code-quote">&quot;file:$/{{user.home}}/tuscany/java/sca/-&quot;</SPAN> {
+  permission java.security.AllPermission;
+};
+</PRE>
+</DIV></DIV>
+
+<P>This example grant statement is quite a broad bludgeon. Namely it says that all Tuscany code has been granted all permissions. This is not much different that running without a security manager. In practice, a user policy will want much finer-grained permissions towards the Tuscany code and allow only specific pieces of the code to have privileged access. The remainder of this article shows how to locate those permissions and how to enable secure checks for them.</P>
+
+<P>In summary, with security on, Tuscany class XYZ can access a secured resource only if the security manager's <TT>AccessController</TT> has determined the proper permissions are available in the security policy. Tuscany code that calls a protected Java API will only work with an <TT>AccessController doPrivileged</TT> block and the proper permissions in place. Otherwise, the Tuscany code will not run properly with security on, and it will throw <TT>SecurityExceptions</TT> left and right. Many times these <TT>SecurityExceptions</TT> will be passed back to the Tuscany runtime and then be wrappered in a <TT>ServiceRuntimeException</TT> and presented to the user. Not good.</P>
+
+<H2><A name="SecurityAwareProgramminginTuscany-CommonJavaAPIsThatRequireSecurityEnablement"></A>Common Java APIs That Require Security Enablement</H2>
+
+<P>What are some of the Java APIs that might cause your Tuscany code to produce a <TT>SecurityException</TT>? In the <A href="http://java.sun.com/javase/reference/api.jsp" class="external-link" rel="nofollow">Java API Reference</A>, any Java API that throws a <TT>SecurityException</TT> is a candidate.<BR>
+For instance, notice that <A href="http://java.sun.com/javase/6/docs/api/java/lang/System.html#getProperty(java.lang.String)" class="external-link" rel="nofollow"><TT>java.lang.System.getProperty(String)</TT></A> may throw a security exception. With security on, you are allowed to read some <TT>System</TT> properties (such as <TT>java.version</TT> or <TT>os.name</TT>) but by default you will get a <TT>SecurityException</TT> on other properties (such as <TT>user.home</TT> or <TT>java.home</TT>). In general, this makes sense because we do not want any intruders to have a map of the file system. A concise list of APIs with security checks is located at <A href="http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html#PermsAndMethods" class="external-link" rel="nofollow">Methods and the Permissions They Require</A>.</P>
+
+<P>Whenever you use one of these security enabled Java APIs (any API with a &quot;<TT>throws SecurityException</TT>&quot; suffix), you must do two things to ensure your code will run with security on:</P>
+<OL>
+	<LI>Add the required permission to your Tuscany or application sever security policy.</LI>
+	<LI>Add an <TT>AccessController.doPrivileged</TT> call block around your code.<BR>
+This section discusses identifying any necessary security permissions, and the next session shows how to write <TT>AccessController</TT> call blocks.</LI>
+</OL>
+
+
+<P>To be a little more concrete to Tuscany developers, let's go through some common API groups that they are likely to use.</P>
+<OL>
+	<LI><TT>System.getProperty(String)</TT>. This is quite a common item to check to make operating system or Java version specific code. If you use this API you need to add <TT>java.util.PropertyPermission</TT> to the security policy. For example, this permission allows the Tuscany code base to read two system properties:
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>security.policy property read example</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+grant codeBase <SPAN class="code-quote">&quot;file:$/{{user.home}}/tuscany/java/sca/-&quot;</SPAN> {
+  permission java.util.PropertyPermission <SPAN class="code-quote">&quot;user.home&quot;</SPAN>, <SPAN class="code-quote">&quot;read&quot;</SPAN>;
+  permission java.util.PropertyPermission <SPAN class="code-quote">&quot;java.home&quot;</SPAN>, <SPAN class="code-quote">&quot;read&quot;</SPAN>;
+};
+</PRE>
+</DIV></DIV></LI>
+	<LI>File IO. If you create a file stream, or attempt to check if a <TT>File</TT> exists or is a directory, or can read or write, you will have to add <TT>java.io.FilePermissions</TT>.</LI>
+	<LI>ClassLoader. Anytime you access the ClassLoader via <TT>getClassLoader()</TT> (which is common if you want to load a resource), you will have to add a <TT>java.lang.RuntimePermission</TT>.</LI>
+	<LI>Introspection. Whenever you do any sort of dynamic class loading and execution, say you want to check for methods in a business interface, or you want to instantiate a data object, you are going to add a <TT>java.lang.RuntimePermission</TT>.</LI>
+	<LI>URLS and sockets. Any sort of network access via <TT>URL</TT> streams or sockets will have to be checked by the security manager. You will have to add <TT>java.lang.RuntimePermission</TT> or <TT>java.net.SocketPermission</TT>.</LI>
+	<LI>Threads. Any starting or stopping or checking for threads is going to be guarded and you will have to have the proper <TT>java.lang.RuntimePermission</TT>.</LI>
+	<LI>The Security stack. Need it be said, but if you attempt to access the <TT>SecurityManager</TT>, <TT>AccessController</TT>, <TT>Policies</TT>, or other parts of the security architecture you are going to need <TT>java.security.SecurityPermission</TT>. In other words, hands off the security system.</LI>
+</OL>
+
+
+<P>This list is just a general overview. Once again, any API that throws a <TT>SecurityException</TT> is something that your Tuscany code should be privileged and permitted to use.</P>
+
+<H2><A name="SecurityAwareProgramminginTuscany-HowtoWriteAccessControlBlocks."></A>How to Write Access Control Blocks.</H2>
+
+<P>The final step of making your code security enabled is to add <TT>AccessController</TT> privileged blocks around your enabled code. You must be careful here. You cannot put a privileged block with a wide scope. That is similar to running with security turned off. You also must be careful not to grant privilege code that a malicious user could use. Be very careful of granting privilege to any public API that a user can use with malicious parameters. Here is a <A href="http://java.sun.com/javase/6/docs/technotes/guides/security/doprivileged.html" class="external-link" rel="nofollow">more in-depth article</A>.</P>
+
+<P>The type of coding pattern you use is based primarily on three considerations:</P>
+<UL>
+	<LI>the return type of the checked call</LI>
+	<LI>the input parameters to the checked call</LI>
+	<LI>the exceptions thrown by the checked call.</LI>
+</UL>
+
+
+<P>In the simplest case, let's say you use a checked Java API that throws no exceptions other than <TT>SecurityException</TT>. (Recall that <TT>SecurityException</TT> is thrown by all of these APIs.) For instance, your brand new Tuscany &quot;Blatz&quot; extension needs to load the &quot;blatz&quot; library before it runs.<BR>
+This is how you security enable the loading of the library.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>AccessController doPrivileged block - No parameters</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-comment">// ... unchecked code here...
+</SPAN>   AccessController.doPrivileged(<SPAN class="code-keyword">new</SPAN> PrivilegedAction&lt;<SPAN class="code-object">Object</SPAN>&gt;() {
+       <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">Object</SPAN> run() {
+           <SPAN class="code-object">System</SPAN>.loadLibrary(<SPAN class="code-quote">&quot;blatz&quot;</SPAN>);
+           <SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">null</SPAN>;
+         }
+   });      
+   <SPAN class="code-comment">// ... more unchecked code here                         </SPAN>
+</PRE>
+</DIV></DIV>
+<P>Notice that the code is using the Java type safe syntax to ensure the proper casting of the method run return type. The class in the &lt;class specification&gt; should always match the return type class type.</P>
+
+<P>In the next example, let us examine how a Java API with a boolean return type is handled. Notice that we are using the autoboxing feature of Java to convert from <TT>boolean</TT> to <TT>Boolean</TT>.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>AccessController doPrivileged block - With Return Type</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   <SPAN class="code-object">boolean</SPAN> isDirectory = AccessController.doPrivileged(<SPAN class="code-keyword">new</SPAN> PrivilegedAction&lt;<SPAN class="code-object">Boolean</SPAN>&gt;() {
+   	<SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">Boolean</SPAN> run() {
+   		<SPAN class="code-keyword">return</SPAN> rootFolder.isDirectory();
+   	}
+   });           
+</PRE>
+</DIV></DIV>
+<P>Using this succinct anonymous class, you must make sure any input parameters are final instances. This is a requirement of the Java syntax. If you have a parameter that has undergone multiple assignments, you can easily create a final version of that input parameter and pass it into the block.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>AccessController doPrivileged block - Input Parameters</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   URL constructedURL = protocol;
+   constructedURL += pathName;
+   constructedURL += parameters;
+
+   <SPAN class="code-keyword">final</SPAN> URL xsdURL = constructedURL;        
+   URL definitionsFileUrl = AccessController.doPrivileged(<SPAN class="code-keyword">new</SPAN> PrivilegedAction&lt;URL&gt;() {
+       <SPAN class="code-keyword">public</SPAN> URL run() {
+           <SPAN class="code-keyword">return</SPAN> getClass().getClassLoader().getResource(definitionsFile);
+        }
+   });           
+</PRE>
+</DIV></DIV>
+<P>Finally, if your checked Java API throws an exception, such as the <TT>IOException</TT> shown here, you need to catch it and cast it to match any checked exceptions on your method, or you need to add the PrivilegedActionException to the throws signature of your method.</P>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>AccessController doPrivileged block - With Exceptions</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   InputStream is;
+   <SPAN class="code-keyword">try</SPAN> {       	
+   is = AccessController.doPrivileged(<SPAN class="code-keyword">new</SPAN> PrivilegedExceptionAction&lt;InputStream&gt;() {
+       <SPAN class="code-keyword">public</SPAN> InputStream run() <SPAN class="code-keyword">throws</SPAN> IOException {
+          <SPAN class="code-keyword">return</SPAN> url.openStream();
+      }
+   });
+   } <SPAN class="code-keyword">catch</SPAN> ( PrivilegedActionException e ) {
+      <SPAN class="code-keyword">throw</SPAN> (IOException) e.getException();
+   }
+</PRE>
+</DIV></DIV>
+
+<P>This article shows just a few techniques that cover many of the security issues that arise in the Tuscany code base. If you are aware of the Java security architecture and how to control access to guarded resources, you can guard against malicious users who might use the Tuscany code base for no good.</P>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/set-up-sdo-development-environment.html b/site/trunk/site-publish/set-up-sdo-development-environment.html
new file mode 100644
index 0000000000..10a407b3c5
--- /dev/null
+++ b/site/trunk/site-publish/set-up-sdo-development-environment.html
@@ -0,0 +1,194 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Set up SDO Development Environment</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48510">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="delete-this-page-using-sdo-java.html" title="Delete This Page - Using SDO Java">Delete This Page - Using SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Set up SDO Development Environment">Set up SDO Development Environment</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="SetupSDODevelopmentEnvironment-EstablishingaDevelopmentEnvironment"></A>Establishing a Development Environment</H3>
+
+<P>There are two well established development environments that the SDO community use, <A href="http://maven.apache.org/" class="external-link" rel="nofollow">Maven</A> and <A href="http://eclipse.org/" class="external-link" rel="nofollow">Eclipse</A>.  To use the Eclipse IDE you must first establish a maven environment.  </P>
+
+<H4><A name="SetupSDODevelopmentEnvironment-GettingSetupforDevelopment%28prerequisites%29"></A>Getting Setup for Development (prerequisites)</H4>
+<P>Download the following:</P>
+
+<UL>
+	<LI><A href="http://java.sun.com/j2se/1.5.0" class="external-link" rel="nofollow">JDK 5.0+ (J2SE 1.5.0+)</A></LI>
+	<LI><A href="http://maven.apache.org/" class="external-link" rel="nofollow">Apache Maven (2.0.4+)</A></LI>
+	<LI><A href="http://subversion.tigris.org/" class="external-link" rel="nofollow">Subversion (1.2+)</A></LI>
+</UL>
+
+
+
+<H4><A name="SetupSDODevelopmentEnvironment-SettingupforMavenDevelopment"></A>Setting up for Maven Development</H4>
+
+<UL>
+	<LI>Get your <A href="getting-source.html" title="Getting Source">source tree set up</A> locally</LI>
+	<LI>Ensure that maven (mvn) is on your execution path</LI>
+	<LI>Ensure that you have network connectivity (Maven has the capacity to retrieve dependencies from the internet while executing a build instruction)</LI>
+	<LI>In a shell or command prompt ensure that you are in the &lt;sdo-source-root&gt; directory</LI>
+	<LI>Issue the command &quot;mvn&quot;, this will build the SDO API interface, implementation, tools, samples, plugin source code ,  run any tests, package the class files in appropriate jars and install the jars in a repository on your computer.</LI>
+	<LI>You can now use the tools of your choice to explore, use and modify the SDO source code.  If you have extracted your source tree using SVN you will be able to submit patches arising from your modifications to the SDO project by attaching patch files to JIRAs.</LI>
+</UL>
+
+
+<H4><A name="SetupSDODevelopmentEnvironment-SettingupforEclipseDevelopment"></A>Setting up for Eclipse Development</H4>
+<P>Follow the instructions above for setting up a maven development environment<BR>
+Having ensured you have network access to the internet, in &lt;sdo-source-root&gt; directory</P>
+
+<P>execute the command mvn -Peclipse eclipse:eclipse</P>
+
+<P>Then</P>
+<UL>
+	<LI>Start up eclipse</LI>
+	<LI>Switch to the Java perspective</LI>
+	<LI>Right click in the Package Explorer frame on the root of the newly created project and select Properties =&gt; Java Build Path</LI>
+	<LI>Click on the &quot;Libraries&quot; tab and select &quot;Add Variable...&quot;, &quot;Configure Variables ...&quot;, &quot;New ...&quot;</LI>
+	<LI>Set Name to M2_REPO and Click on &quot;Folder...&quot;</LI>
+	<LI>Navigate to the &quot;repository&quot; folder/directory (on Windows this is \Documents and Settings\&lt;user&gt;\.m2\repository, on Linux it is ~/.m2/repository) and click OK</LI>
+	<LI>Now execute &quot;File =&gt; Import ... =&gt; General =&gt; Existing project into workspace</LI>
+	<LI>Click &quot;Browse ...&quot; Navigate to the &lt;sdo-source-root&gt; directory and click OK</LI>
+	<LI>Select all projects and click OK</LI>
+	<LI>When building is complete the projects should now have no errors</LI>
+</UL>
+
+
+<P>At this point you have seven separate projects each dependent on binary artifacts in your maven repository.  Don't be tricked into thinking that <BR>
+if you modify the sdo-impl project, that those changes will be picked up by the sdo-tools project.  If you want this behavior then follow these steps</P>
+
+<UL>
+	<LI>In the package explorer pane of the Java perspective, Right Click on Properties and select the libraries tab</LI>
+	<LI>Select the M2_REPO/org/apache/tuscany/sdo/sdo-api* library entry and click &quot;remove&quot;</LI>
+	<LI>Select the Projects tab and click &quot;Add...&quot;</LI>
+	<LI>Select the SDO API project and click OK</LI>
+	<LI>If you plan to work in the tools project
+	<UL>
+		<LI>Select the &quot;Order and Export&quot; tab and select the sdo-api project and click OK (this means that the sdo-impl project will expose the interfaces of the sdo-api project, so that you don't have to import them into projects which depend on the sdo-impl project)</LI>
+		<LI>Repeat the above instructions, removing the sdo-api and sdo-impl library dependencies from the tools project,  and adding a project dependency for the sdo-tools project on the sdo-impl project</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H4><A name="SetupSDODevelopmentEnvironment-DiggingintoEMF"></A>Digging into EMF</H4>
+<P>With EMF being such an integral part of SDO development,  its often necessary to debug into the EMF code to understand what's going on.  To do this you need to <A href="http://www.eclipse.org/modeling/emf/downloads/" class="external-link" rel="nofollow">download an EMF SDK</A> (runtime, source, docs) for EMF, SDO and XSD (Don't be confused by the presence of SDO; the version 1 API used to be developed at Eclipse,  and it is this that is being downloaded,  you can safely ignore it). You'll need the corresponding EMF version to the Tuscany SDO source code (Currently EMF 2.2.3 as at January 2008).  Take a look for the &lt;emfVersion&gt; tag in the sdo/pom.xml file to discover the current version dependency.  Extract the downloaded archive to somewhere on your computer.</P>
+
+<UL>
+	<LI>When eclipse opens up a .class file and presents you with an &quot;Attach Source...&quot; button, click it and the click &quot;Variable ...&quot;, &quot;New...&quot;</LI>
+	<LI>Create a variable, e.g. EMF_SRC and set the value to a folder within your extracted EMF archive, e.g. C:/Development/downloads/emf-sdo-xsd-SDK-2.2.3/eclipse/plugins</LI>
+	<LI>Click OK to close the &quot;Variable Selection&quot; dialog</LI>
+	<LI>In the &quot;Source Attachment Configuration&quot; Dialog, click &quot;Extension ...&quot;</LI>
+	<LI>Navigate to the src.zip file corresponding to the class you are interested in.  This will take a little bit of thought.  Look at the package name for the class you are interested in and navigate to a zip file that would seem to correspond to that class, e.g. org.eclipse.emf.source_2.2.3.v200702131851/src/org.eclipse.emf.ecore_2.2.3.v200702131851/src.zip</LI>
+	<LI>You should now be able to set breakpoints and observe execution behavior of the EMF code in the eclipse debugger</LI>
+</UL>
+
+
+
+
+
+
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/setting-up-an-sca-developer-environment.html b/site/trunk/site-publish/setting-up-an-sca-developer-environment.html
new file mode 100644
index 0000000000..8f5722629a
--- /dev/null
+++ b/site/trunk/site-publish/setting-up-an-sca-developer-environment.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Setting up an "SCA Developer" environment</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44878">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Setting up an &quot;SCA Developer&quot; environment">Setting up an &quot;SCA Developer&quot; environment</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/setting-up-ssh.html b/site/trunk/site-publish/setting-up-ssh.html
new file mode 100644
index 0000000000..56cfc62297
--- /dev/null
+++ b/site/trunk/site-publish/setting-up-ssh.html
@@ -0,0 +1,204 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Setting up ssh</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60578">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="making-releases.html" title="Making releases">Making releases</A>&nbsp;&gt;&nbsp;<A href="" title="Setting up ssh">Setting up ssh</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="Settingupssh-Setupmvntoworkwithyourapacheaccount"></A>Setup mvn to work with your apache account</H3>
+
+<P>Generate a authorised dsa key:</P>
+
+<P>logon to minotaur.apache.org using your apache id and run:</P>
+
+<P>ssh-keygen &#45;t dsa</P>
+
+<P>give it some file name eg mysshkey and a pass phrase. This should create two files, a private key and a public key (mysshkey, mysshkey.pub). Copy mysshkey.pub to &#126;/.ssh/authorised_keys. (you may need to create the .ssh directory), and ftp the private key to you local machine. (i use WINSCP).</P>
+
+<P>(Note that if you are already using ssh to authenticate with apache servers, and have followed the instructions to create a key using putty on windows, then your key is OK but your file format may not be OK for maven. &nbsp;Maven does not recognise the putty ppk file format private keys. Use puttygen to load your ppk file and convert it to an open ssh file.)</P>
+
+<P>In your maven settings.xml file (located in the .m2 folder in your home dir, eg C:\Documents and Settings\ant\.m2) add servers for the servers you use and specify you apachi id, the location of the sshkay you just ftp'd and the pass phrase you used when creating that key, eg:</P>
+
+<P>&lt;servers&gt;<BR>
+&lt;server&gt;<BR>
+&lt;id&gt;apache.incubator&lt;/id&gt;<BR>
+&lt;username&gt;antelder&lt;/username&gt;<BR>
+&lt;privateKey&gt;\ant\mysshkey&lt;/privateKey&gt;<BR>
+&lt;passphrase&gt;xxx&lt;/passphrase&gt;<BR>
+&lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;<BR>
+&lt;filePermissions&gt;664&lt;/filePermissions&gt;<BR>
+&lt;/server&gt;<BR>
+&lt;server&gt;<BR>
+&lt;id&gt;me.people&lt;/id&gt;<BR>
+&lt;username&gt;antelder&lt;/username&gt;<BR>
+&lt;privateKey&gt;\ant\mysshkey&lt;/privateKey&gt;<BR>
+&lt;passphrase&gt;xxx&lt;/passphrase&gt;<BR>
+&lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;<BR>
+&lt;filePermissions&gt;664&lt;/filePermissions&gt;<BR>
+&lt;/server&gt;<BR>
+&lt;server&gt;<BR>
+&lt;id&gt;apache.snapshots&lt;/id&gt;<BR>
+&lt;username&gt;antelder&lt;/username&gt;<BR>
+&lt;privateKey&gt;\ant\mysshkey&lt;/privateKey&gt;<BR>
+&lt;passphrase&gt;xxx&lt;/passphrase&gt;<BR>
+&lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;<BR>
+&lt;filePermissions&gt;664&lt;/filePermissions&gt;<BR>
+&lt;/server&gt;<BR>
+&lt;server&gt;<BR>
+&lt;id&gt;apache.rsync&lt;/id&gt;<BR>
+&lt;username&gt;antelder&lt;/username&gt;<BR>
+&lt;privateKey&gt;\ant\mysshkey&lt;/privateKey&gt;<BR>
+&lt;passphrase&gt;xxx&lt;/passphrase&gt;<BR>
+&lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;<BR>
+&lt;filePermissions&gt;664&lt;/filePermissions&gt;<BR>
+&lt;/server&gt;<BR>
+&lt;/servers&gt;</P>
+
+<P>Keep the ssh key and pass phrase safe and secure. Its a good idea to only add the key and passphrase to the settings.xml file while you're actually using it and delete form the file at other times. Also you MUST delete the private ssh key from your Apache directory once you've ftp'd it to your local machine.</P>
+
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/simplemenu.html b/site/trunk/site-publish/simplemenu.html
new file mode 100644
index 0000000000..7e5629db4f
--- /dev/null
+++ b/site/trunk/site-publish/simplemenu.html
@@ -0,0 +1,141 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SimpleMenu</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=101634">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="SimpleMenu">SimpleMenu</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Tools" class="external-link" rel="nofollow">Tools</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/spring.html b/site/trunk/site-publish/spring.html
new file mode 100644
index 0000000000..ad20770391
--- /dev/null
+++ b/site/trunk/site-publish/spring.html
@@ -0,0 +1,86 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Spring : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=47689">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Spring">Spring</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H3><A name="Spring-SpringExtension"></A>Spring Extension</H3>
+
+<P>The Spring extension allows users to create services using the Spring programming model according to the SCA 1.0 Spring Specification found <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=www.osoa.org&linkCreation=true&fromPageId=47689" title="Create Page: www.osoa.org" class="createlink">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>. </P>
+
+<H3><A name="Spring-Status"></A>Status</H3>
+
+<P>The extension is under development against the current version of kernel in trunk. </P>
+
+<H3><A name="Spring-Installing"></A>Installing</H3>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png b/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png
new file mode 100644
index 0000000000..9e8cb2c248
--- /dev/null
+++ b/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png
diff --git a/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png.jpeg b/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png.jpeg
new file mode 100644
index 0000000000..08e2b9531c
--- /dev/null
+++ b/site/trunk/site-publish/standalone-sca-domain.data/calculator-standalone.png.jpeg
diff --git a/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png b/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png
new file mode 100644
index 0000000000..ca259702b4
--- /dev/null
+++ b/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png
diff --git a/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png.jpeg b/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png.jpeg
new file mode 100644
index 0000000000..e1f89dd97e
--- /dev/null
+++ b/site/trunk/site-publish/standalone-sca-domain.data/single-node-abstract.png.jpeg
diff --git a/site/trunk/site-publish/standalone-sca-domain.html b/site/trunk/site-publish/standalone-sca-domain.html
new file mode 100644
index 0000000000..501ae5c096
--- /dev/null
+++ b/site/trunk/site-publish/standalone-sca-domain.html
@@ -0,0 +1,303 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Standalone SCA Domain</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66883">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="sca-java-user-guide.html" title="SCA Java User Guide">SCA Java User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Standalone SCA Domain">Standalone SCA Domain</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Documentation</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension Developer Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Resources</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><DIV class="" align="center">This page is under construction&#45; You are welcome to help and complete it</DIV>
+</TD></TR></TABLE></DIV>
+
+<H1><A name="StandaloneSCADomain-StandaloneSCADomain"></A>Standalone SCA Domain</H1>
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="standalone-sca-domain.data/single-node-abstract.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="StandaloneSCADomain-CreatingAStandaloneDomain"></A>Creating A Standalone Domain</H2>
+<P>Using a domain in a single JVM is very easy. You simply create an instance of</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.host.embedded.SCADomain.
+</PRE>
+</DIV></DIV>
+
+<P>Using one of the provided newInstance() methods. Note the package name. You will see a different package name when we look at the multiple JVM case. For now this indicates that the SCA Domain is going to be completely embedded in the Java application that you write. </P>
+
+<P>This is what the different newInstance() operations mean. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> SCADomain newInstance() 
+</PRE>
+</DIV></DIV>
+
+<P>Starts a standalone domain with a default domain URI and will treat the classpath as the contribution to this domain.  All .composite files on the classpath will be read and any deployable components will be made available in the domain. </P>
+
+<P>Deployable components are defined by either</P>
+
+<P>1 placing the .composite file in the  META-INF/sca-deployables/directory<BR>
+2 By specifying the composite as deployable in the META-INF/sca-contribution.xml file</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> SCADomain newInstance(<SPAN class="code-object">String</SPAN> composite)
+</PRE>
+</DIV></DIV>
+
+<P>Starts a standalone domain with a default domain URI and will try and find the named composite file in the classpath and use it's location as the contribution location. It will deploy the named composite. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> SCADomain newInstance(<SPAN class="code-object">String</SPAN> domainURI, <SPAN class="code-object">String</SPAN> contributionLocation, <SPAN class="code-object">String</SPAN>... composites) 
+</PRE>
+</DIV></DIV>
+
+<P>Will start a standalone domain with the specified domain URI and will load the contribution at the contributionLocation. Any named composites will be deployed. As there are both contributionLocation and composite name parameters there are some rules about what happens when you specifier one the other, both or neither as follows.</P>
+
+
+<P><B>contributionLocation</B> - an absolute path to a contribution in URL form, e.g </P>
+
+<P>  <A href="file://C/mydirA" class="external-link" rel="nofollow">file://C:/mydirA</A> <BR>
+  jar:<A href="file://C/myjar.jar" class="external-link" rel="nofollow">file://C:/myjar.jar</A> </P>
+
+<P><B>composite(s)</B> - the name of a composite file(s) e.g. </P>
+
+<P>  mycomposite.composite <BR>
+  somedir/mycomposite.composite </P>
+
+<P>So the various combinations give rise to </P>
+
+<P><B>contributionLocation set / composite null</B><BR>
+   loads all contributions under the contribution location identified </P>
+
+<P><B>contributionLocation null / composite set</B><BR>
+   finds the location of your compsite on the classpath and uses that as the contribution location. It loads the named composite from there </P>
+
+<P><B>contributionLocation set / composite set</B><BR>
+  loads the named composite from the specified contribution path </P>
+
+<P><B>contributionLocation null / composite null</B><BR>
+  This option is also used if the above rules don't identify a contribution URL for whatever reason. </P>
+
+<P>  No contribution has been specified so look for the following in order and use the location of the first one found as the contribution location </P>
+
+<P>  META-INF/sca-contribution.xml <BR>
+  META-INF/sca-contribution-generated.xml <BR>
+  META-INF/sca-deployables directory</P>
+
+<P>For example, in our calculator sample we could do </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scaDomain = SCADomain.newInstance(<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>Once created the SCA Domain will have loaded a contribution based on the rules set out above. </P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="standalone-sca-domain.data/calculator-standalone.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="StandaloneSCADomain-LocatingServicesInTheDomain"></A>Locating Services In The Domain</H2>
+
+<P>You can now use services in the domain either directly from your Java application or remotely over the service instance that the SCA application exposes. </P>
+
+<P>To use services directly you can use the following SCA Domain interfaces to create a service proxy</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">abstract</SPAN> &lt;B&gt; B getService(<SPAN class="code-object">Class</SPAN>&lt;B&gt; businessInterface, <SPAN class="code-object">String</SPAN> serviceName);
+</PRE>
+</DIV></DIV>
+
+<P>Returns a type safe reference to the named service</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">abstract</SPAN> &lt;B&gt; ServiceReference&lt;B&gt; getServiceReference(<SPAN class="code-object">Class</SPAN>&lt;B&gt; businessInterface, <SPAN class="code-object">String</SPAN> referenceName);
+</PRE>
+</DIV></DIV>
+
+<P>returns an SCA service reference to the named service. You can use the SCA service reference to manipulate various aspects of the referece. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">abstract</SPAN> &lt;B, R <SPAN class="code-keyword">extends</SPAN> CallableReference&lt;B&gt;&gt; R <SPAN class="code-keyword">cast</SPAN>(B target) <SPAN class="code-keyword">throws</SPAN> IllegalArgumentException;
+</PRE>
+</DIV></DIV>
+
+<P>Casts a service (callable) reference to a typesafe reference . </P>
+
+<P>For example, in our calculator sample we could do</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+calculatorService = scaDomain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>Once you have a service proxy you can call methods on it like any other Java object. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-object">Double</SPAN> result = calculatorService.add(3, 2)
+</PRE>
+</DIV></DIV>
+
+<H2><A name="StandaloneSCADomain-ClosingTheDomain"></A>Closing The Domain</H2>
+
+<P>When you a finished with the domain you need to close it down.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scaDomain.close();
+</PRE>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/starting-with-das.html b/site/trunk/site-publish/starting-with-das.html
new file mode 100644
index 0000000000..2a19d69aea
--- /dev/null
+++ b/site/trunk/site-publish/starting-with-das.html
@@ -0,0 +1,219 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Starting with DAS</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54705">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="Starting with DAS">Starting with DAS</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="das-java-get-involved.html" title="DAS Java Get Involved">Get Involved</A><BR>
+<A href="das-java-found-a-bug.html" title="DAS Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>DAS Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-java.html" title="DAS Java">DAS Java Home</A><BR>
+<A href="das-java-faq.html" title="DAS Java - FAQ">FAQ</A><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">Downloads</A><BR>
+<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/das/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<H1><A name="StartingwithDAS-StartingwithDAS"></A>Starting with DAS</H1>
+
+<P>This page provides links to DAS samples and explains a simple &quot;how to&quot; and gives step-by-step instructions to check one of the DAS features - ColumnConverter. Other DAS features can be tried on similar lines.</P>
+
+<P>Many sample examples demonstrating different DAS features are available on 
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples</A> e.g.</P>
+
+<OL>
+	<LI>companyweb-webapp - tomcat based web sample</LI>
+	<LI>customer - J2SE based standalone application</LI>
+</OL>
+
+
+<P>Check readme files e.g. For companyweb
+<A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples/company-webapp/readme.htm" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/samples/company-webapp/readme.htm</A><BR>
+for basic steps on how to get the sample running. </P>
+
+<P>Once the sample is running, parts of sample can be modified based on the requirement or new code can be added from-scratch. Many features supported by DAS are listed in User Guide -
+<A href="http://incubator.apache.org/tuscany/rdb-das-user-guide.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/rdb-das-user-guide.html</A> </P>
+
+<P>This document details the changes needed to different part of the web sample (companyweb) to experiment with more features of DAS than just basic CRUD.Let us take example of checking how to use ColumnConverters. For details on feature testing, check Tests under <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/</A></P>
+
+<P>1&gt; As a first step you need to implement <B>Converter</B> interface in a class to achieve the required<BR>
+column conversion. Check org.apache.tuscany.das.rdb.test.mappings.StringObfuscationConverter from the svn repository for example of converter. Make your converter class available in (Tomcat root)webapps/companyweb-webapp/WEB-INF/classes. </P>
+
+<P>2&gt; DAS functions based on external Configuration, e.g. CompanyConfig.xml file in companyweb sample. The purpose of this Config file to supply information for DataSource connection, Commands (SQL) (that DAS can execute against Database) and Database schema like - Table/Columns, Relationship and so forth. Please check Architecture Guide for complete details about Config.xsd ()<BR>
+at <A href="http://incubator.apache.org/tuscany/rdb-das-architecture-guide.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/rdb-das-architecture-guide.html</A>. Modify Config to get converter working. The &lt;ConnectionInfo&gt; element should match the resource name from server.xml for DataSource.Add a &lt;Table&gt; which has a column with converter class name of the class you just created. Add a &lt;Command&gt; with kind=&quot;Select&quot; for this table/column e.g.</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Command name=&quot;getFirstCustomer&quot; SQL=&quot;Select * from CUSTOMER where ID = 1&quot; kind=&quot;Select&quot;/&gt;
+
+&lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+&lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+&lt;Column columnName=&quot;LASTNAME&quot; converterClassName=&quot;org.apache.tuscany.das.rdb.test.mappings.StringObfuscationConverter&quot;/&gt;
+&lt;/Table&gt;
+</PRE>
+</DIV></DIV>
+<P>3&gt; Now the code and config setup is complete. What remains is calling the new command from .jsp and<BR>
+servlet. Follow the technique similar to CompanyClient.java and Company.jsp to call the new command. The returned results will verify that the converter is called and the column value from database is converted based on converter logic. <BR>
+4&gt; For more details check the test cases from ConverterTests in <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/das/rdb/src/test/</A>.</P>
+
+<P><B>Assumption:</B> Tomcat version 5.5.* or 6.0.10 , Derby version 10.1.2.1.</P>
+
+<P><B>Troubleshooting Checkpoints:</B> Check the following and if still having issues , report at
+<A href="http://incubator.apache.org/tuscany/issue-tracking.html" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/issue-tracking.html</A></P>
+<OL>
+	<LI>All libraries are present in (Tomcat root)/webapps/companyweb/WEB-INF/lib (these libs can<BR>
+be taken from companyweb sample or can be downloaded from web)<BR>
+i) common-(latest version).jar <BR>
+ii) ecore-(latest version).jar <BR>
+iii) ecore-change-(latest version).jar<BR>
+iv) ecore-xmi-(latest version).jar<BR>
+v) log4j-(latest version).jar <BR>
+vi) sdo-api-xxx.jar <BR>
+vii) tuscany-das-rdb-xxx.jar <BR>
+viii) tuscany-sdo-xxx.jar<BR>
+ix) xsd-(latest version).jar <BR>
+x) derby driver jar - or whichever database you are planning to use</LI>
+	<LI>The Database exists with required tables and data.</LI>
+	<LI>WEB-INF/web.xml has entry under welcome-file-list for required .jsp like -
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;web-app&gt;
+    &lt;display-name&gt;Tuscany DAS sample Company  WEB&lt;/display-name&gt;
+
+    &lt;welcome-file-list id=&quot;WelcomeFileList&quot;&gt;
+        &lt;welcome-file&gt;Company.jsp&lt;/welcome-file&gt;
+    &lt;/welcome-file-list&gt;
+&lt;/web-app&gt;
+</PRE>
+</DIV></DIV></LI>
+	<LI>META-INF/context.xml has entry for the datasource the sample is using like -
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;Context path=&quot;/DAS Stand alone app&quot; debug=&quot;5&quot; reloadable=&quot;true&quot; crossContext=&quot;true&quot;&gt;
+   &lt;Manager pathname=&quot;&quot;/&gt;
+   &lt;ResourceLink name=&quot;jdbc/dastest&quot; global=&quot;jdbc/dastest&quot; type=&quot;javax.sql.DataSource&quot; /&gt;                     
+&lt;/Context&gt;
+</PRE>
+</DIV></DIV></LI>
+	<LI>(Tomcat root)/conf server.xml has entry similar to below for the datasource -
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Resource name=&quot;jdbc/dastest&quot;
+      type=&quot;javax.sql.DataSource&quot;  auth=&quot;Container&quot;
+      description=&quot;Derby database for DAS Company sample&quot;
+      maxActive=&quot;100&quot; maxIdle=&quot;30&quot; maxWait=&quot;10000&quot;
+      username=&quot;&quot; password=&quot;&quot;
+      driverClassName=&quot;org.apache.derby.jdbc.EmbeddedDriver&quot;
+      url=&quot;jdbc:derby:c:\apache-tomcat-5.5.20\Databases/dastest;create=true&quot;/&gt;
+</PRE>
+</DIV></DIV></LI>
+</OL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/subproject-menus.html b/site/trunk/site-publish/subproject-menus.html
new file mode 100644
index 0000000000..02c451db81
--- /dev/null
+++ b/site/trunk/site-publish/subproject-menus.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Subproject Menus</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56592">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="" title="Subproject Menus">Subproject Menus</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/subprojects.html b/site/trunk/site-publish/subprojects.html
new file mode 100644
index 0000000000..bd584aa879
--- /dev/null
+++ b/site/trunk/site-publish/subprojects.html
@@ -0,0 +1,115 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : subprojects</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=101627">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="subprojects">subprojects</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Subprojects</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS</A></P>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/survey.html b/site/trunk/site-publish/survey.html
new file mode 100644
index 0000000000..ccf7067dc7
--- /dev/null
+++ b/site/trunk/site-publish/survey.html
@@ -0,0 +1,156 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Survey</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100996">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Survey">Survey</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="Survey-ApacheTuscanyUserFeedbackSurvey"></A>Apache Tuscany User Feedback Survey  </H3>
+
+<P>During November 5th - 19th 2008 Tuscany conducted a user survey to better learn how Tuscany is helping you with SOA solutions or how it can further be enhanced.  </P>
+
+<P>The survey has now closed, the results will be presented shortly.</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/surveythanks.html b/site/trunk/site-publish/surveythanks.html
new file mode 100644
index 0000000000..70f1a178d9
--- /dev/null
+++ b/site/trunk/site-publish/surveythanks.html
@@ -0,0 +1,154 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : SurveyThanks</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=91369">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="SurveyThanks">SurveyThanks</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="SurveyThanks-Thanksfortakingthesurvey"></A>Thanks for taking the survey  </H3>
+
+<P>Your input is appreciated and will help us make Apache Tuscany better!</P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/technology-release.html b/site/trunk/site-publish/technology-release.html
new file mode 100644
index 0000000000..85d7b4ae07
--- /dev/null
+++ b/site/trunk/site-publish/technology-release.html
@@ -0,0 +1,151 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Technology & Release</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55815">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Technology & Release">Technology &amp; Release</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<P>Tuscany is based on specifications defined by the <A href="http://oasis-opencsa.org/" class="external-link" rel="nofollow">OASIS Open CSA</A>Member Section and the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open SOA</A>Collaboration:</P>
+
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> - An essential characteristic of SOA is the ability to assemble new and existing services to create brand new applications that may consist of different technologies. Service Component Architecture defines a simple, service-based model for construction, assembly and deployment of a network of services (existing and new ones) that are defined in a language-neutral way. Tuscany implements the <A href="http://osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">SCA Version 1.0</A>specifications. <A href="sca-overview.html" title="SCA Overview">Learn more about SCA</A></LI>
+</UL>
+
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.4</B> <EM>(January, 2009)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<UL>
+	<LI><B>Service Data Objects (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Tuscany implements the <A href="http://osoa.org/display/Main/Service%20Data%20Objects%20Specifications" class="external-link" rel="nofollow">SDO Version 2.1</A>specifications. <A href="sdo-overview.html" title="SDO Overview">Learn more about SDO</A></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. <A href="das-overview.html" title="DAS Overview">Learn more about DAS</A></LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/temp-technology-release.html b/site/trunk/site-publish/temp-technology-release.html
new file mode 100644
index 0000000000..b31155ae75
--- /dev/null
+++ b/site/trunk/site-publish/temp-technology-release.html
@@ -0,0 +1,134 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Temp Technology & Release</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55949">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Temp Technology & Release">Temp Technology &amp; Release</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="65%">
+<P>Tuscany is based on specifications defined by the Open SOA Collaboration:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> defines technologies for creating services and assembling them into higher-order service networks. SCA provides a language-independent way to compose and deploy service networks. SCA also defines language-specific programming models for service authoring including Java, Spring, C+&#43; , and PHP. There are currently Tuscany SCA runtimes written in Java and C++. Learn more about SCA.</LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="35%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #006600;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #006600;background-color: #ECF4D1;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 0.90-incubating</B> <EM>(June, 2007)</EM></A></LI>
+	<LI><B><A href="sdo-java-10-incubating-beta1.html" title="SDO Java 1.0-incubating-beta1"><B>SDO Java 1.0-incubating-beta1</B></A></B> <EM><A href="sdo-java-10-incubating-beta1.html" title="SDO Java 1.0-incubating-beta1"><EM>(May 16, 2007)</EM></A></EM></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+<UL>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C+&#43; implementations for SDO. Learn more about SDO.</LI>
+</UL>
+
+
+<UL>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS. Learn more about DAS.</LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/test-home-2.html b/site/trunk/site-publish/test-home-2.html
new file mode 100644
index 0000000000..9825894b70
--- /dev/null
+++ b/site/trunk/site-publish/test-home-2.html
@@ -0,0 +1,191 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Test Home 2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55515">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Test Home 2">Test Home 2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TestHome2-Overview"></A>Overview</H1>
+
+<P>Welcome to the Apache Tuscany project&#33; The Tuscany community is working to create a robust and easy to use infrastructure that simplifies the development of service-based application networks and addresses real business problems posed in SOA.</P>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="85%">
+<P>Tuscany is based on specifications defined by the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open SOA Collaboration</A>:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> defines technologies for creating services and assembling them into higher-order service networks. SCA provides a language-independent way to compose and deploy service networks. SCA also defines language-specific programming models for service authoring including Java, Spring, C+&#43; , and PHP. There are currently Tuscany SCA runtimes written in Java and C&#43;<INS>.</INS> <INS><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Overview" class="external-link" rel="nofollow"><INS>Learn more about SCA.</INS></A></INS></LI>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C&#43; implementations for SDO. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/SDO%20Overview" class="external-link" rel="nofollow">Learn more about SDO.</A></LI>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Overview" class="external-link" rel="nofollow">Learn more about DAS.</A></LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="15%">
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><B><A href="sdo-java-10-incubating-beta1.html" title="SDO Java 1.0-incubating-beta1"><B>SDO-Java-1.0-incubating-beta1</B></A></B></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<P>The above mentioned technologies provide a full infrastructure for developing and running SOA based applications. They are not dependent on one another and can be used independently.<BR>
+Please join us to create a simple, practical, extensible SOA infrastructure to address the problems that large-scale applications and service networks are faced with. We look forward to your participation.</P>
+
+<H2><A name="TestHome2-News"></A>News</H2>
+
+<UL>
+	<LI>May 16th, 2007, <B>SDO Java releases</B> its <A href="http://www.apachenews.org/archives/000986.html" class="external-link" rel="nofollow">1.0-incubating-beta1 release</A>.&#42;</LI>
+	<LI>May 9th, 2007, <B>SDO Java</B> <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200705.mbox/browser" class="external-link" rel="nofollow">achieves state of being a functionally complete implementation of the SDO 2.1 specification</A>&#42;<BR>
+This was achieved at code revision level 536331.  The community is working towards a new SDO release after a period<BR>
+of enhancing the test suite and making bug fixes.</LI>
+	<LI>May 2nd, 2007, <B>SCA Native</B> Milestone 3 release is announced.</LI>
+	<LI>May 2nd, 2007, <B>SDO C+&#43;</B> Milestone 3 release is announced.</LI>
+	<LI>April 11th, 2007, <A href="http://www.oasis-open.org/news/oasis-news-2007-04-11.php" class="external-link" rel="nofollow">SCA and SDO specifications are with OASIS</A>&#42;<BR>
+Open CSA will promote the further development and adoption of the Service Component Architecture (SCA) and Service Data Objects (SDO) families of specifications, which will be provided to the community on a Royalty Free basis.</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+<P>Copyright &copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The <A href="http://www.apache.org/" class="external-link" rel="nofollow">Apache Software Foundation (ASF)</A>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/test-home.html b/site/trunk/site-publish/test-home.html
new file mode 100644
index 0000000000..0dbfbe58f1
--- /dev/null
+++ b/site/trunk/site-publish/test-home.html
@@ -0,0 +1,216 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Test Home</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55506">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="" title="Test Home">Test Home</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H3><A name="TestHome-Overview"></A>Overview</H3>
+
+<P>Welcome to the Apache Tuscany project&#33; The Tuscany community is working to create a robust and easy to use infrastructure that simplifies the development of service-based application networks and addresses real business problems posed in SOA.</P>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<P>Tuscany is based on specifications defined by the <A href="http://oasis-opencsa.org/" class="external-link" rel="nofollow">OASIS Open CSA</A>Member Section and the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open SOA</A>Collaboration:</P>
+
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> - An essential characteristic of SOA is the ability to assemble new and existing services to create brand new applications that may consist of different technologies. Service Component Architecture defines a simple, service-based model for construction, assembly and deployment of a network of services (existing and new ones) that are defined in a language-neutral way. Tuscany implements the <A href="http://osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">SCA Version 1.0</A>specifications. <A href="sca-overview.html" title="SCA Overview">Learn more about SCA</A></LI>
+</UL>
+
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Latest Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="sca-java-releases.html" title="SCA Java Releases"><B>SCA Java 1.4</B> <EM>(January, 2009)</EM></A></LI>
+	<LI><A href="sdo-java-111.html" title="SDO Java 1.1.1"><B>SDO Java 1.1.1</B></A> <EM><A href="sdo-java-111.html" title="SDO Java 1.1.1"><EM>(July 2008)</EM></A></EM></LI>
+	<LI><A href="das-java-releases.html" title="DAS Java Releases"><B>DAS Java 1.0-incubating-beta2</B><EM>(Oct, 2007)</EM></A></LI>
+	<LI><A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3"><B>SCA Native Incubator-M3</B> <EM>(May, 2007)</EM></A></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="60%">
+<UL>
+	<LI><B>Service Data Objects (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Tuscany implements the <A href="http://osoa.org/display/Main/Service%20Data%20Objects%20Specifications" class="external-link" rel="nofollow">SDO Version 2.1</A>specifications. <A href="sdo-overview.html" title="SDO Overview">Learn more about SDO</A></LI>
+</UL>
+
+
+<UL>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. <A href="das-overview.html" title="DAS Overview">Learn more about DAS</A></LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="40%">
+
+<DIV class="panel" style="background-color: #D8D8E8;border-color: #BEBFD6;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #BEBFD6;background-color: #BEBFD6;"><B>Project Ideas</B></DIV><DIV class="panelContent" style="background-color: #D8D8E8;">
+<UL>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-IntegrateTuscanyandApacheShindigtomashupGooglegadgetsandbackendSCAservicecomponents%2528WebServices%252CexistingJEEservicesetc%2529" class="external-link" rel="nofollow"><B>Integrate Tuscany &amp; Google gadgets</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects#GettingInvolved-Projects-DataFeeds%2526DataServices" class="external-link" rel="nofollow"><B>Implement Data Services</B> </A></LI>
+	<LI><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Getting%20Involved%20-%20Projects" class="external-link" rel="nofollow"><B>And much more</B> </A></LI>
+</UL>
+</DIV></DIV>
+</TD></TR></TBODY></TABLE>
+
+<P>The above mentioned technologies provide a full infrastructure for developing and running SOA based applications. They are not dependent on one another and can be used independently.</P>
+
+<P>Please join us to create a simple, practical, extensible SOA infrastructure to address the problems that large-scale applications and service networks are faced with. We look forward to your participation.</P>
+
+<H3><A name="TestHome-News"></A>News</H3>
+
+<UL>
+	<LI>May 16th, 2007, <B>SDO Java releases</B> its <A href="http://www.apachenews.org/archives/000986.html" class="external-link" rel="nofollow">1.0-incubating-beta1 release</A>.&#42;</LI>
+	<LI>May 9th, 2007, <B>SDO Java</B> <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200705.mbox/browser" class="external-link" rel="nofollow">achieves state of being a functionally complete implementation of the SDO 2.1 specification</A>&#42;<BR>
+This was achieved at code revision level 536331.  The community is working towards a new SDO release after a period<BR>
+of enhancing the test suite and making bug fixes.</LI>
+	<LI>May 2nd, 2007, <B>SCA Native</B> Milestone 3 release is announced.</LI>
+	<LI>May 2nd, 2007, <B>SDO C+&#43;</B> Milestone 3 release is announced.</LI>
+	<LI>April 11th, 2007, <A href="http://www.oasis-open.org/news/oasis-news-2007-04-11.php" class="external-link" rel="nofollow">SCA and SDO specifications are with OASIS</A>&#42;<BR>
+Open CSA will promote the further development and adoption of the Service Component Architecture (SCA) and Service Data Objects (SDO) families of specifications, which will be provided to the community on a Royalty Free basis.</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+<P>Copyright &copy; 2006, The Apache Software Foundation Apache Tuscany is undergoing incubation at The <A href="http://www.apache.org/" class="external-link" rel="nofollow">Apache Software Foundation (ASF)</A>, sponsored by the Web Services PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/testhome2table.html b/site/trunk/site-publish/testhome2table.html
new file mode 100644
index 0000000000..b58ed0abd2
--- /dev/null
+++ b/site/trunk/site-publish/testhome2table.html
@@ -0,0 +1,127 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : TestHome2Table</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55516">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="to-be-deleted.html" title="To Be Deleted">To Be Deleted</A>&nbsp;&gt;&nbsp;<A href="test-home-2.html" title="Test Home 2">Test Home 2</A>&nbsp;&gt;&nbsp;<A href="" title="TestHome2Table">TestHome2Table</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="85%">
+<P>Tuscany is based on specifications defined by the <A href="http://osoa.org/" class="external-link" rel="nofollow">Open SOA Collaboration</A>:</P>
+<UL>
+	<LI><B>Service Component Architecture (SCA)</B> defines technologies for creating services and assembling them into higher-order service networks. SCA provides a language-independent way to compose and deploy service networks. SCA also defines language-specific programming models for service authoring including Java, Spring, C+&#43; , and PHP. There are currently Tuscany SCA runtimes written in Java and C&#43;<INS>.</INS> <INS><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Overview" class="external-link" rel="nofollow"><INS>Learn more about SCA.</INS></A></INS></LI>
+	<LI><B>Service Data Object (SDO)</B> provides a uniform interface for handling different forms of data, including XML documents, that can exist in a network of services and provides the mechanism for tracking changes. Apache Tuscany provides Java and C&#43; implementations for SDO. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/SDO%20Overview" class="external-link" rel="nofollow">Learn more about SDO.</A></LI>
+	<LI><B>Data Access Service (DAS)</B> provides a simple SDO interface to relational databases. Apache Tuscany provides a Java implementation for DAS. <A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Overview" class="external-link" rel="nofollow">Learn more about DAS.</A></LI>
+</UL>
+</TD>
+<TD class="confluenceTd" valign="top" width="15%">
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany Releases</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><B><A href="sdo-java-10-incubating-beta1.html" title="SDO Java 1.0-incubating-beta1"><B>SDO-Java-1.0-incubating-beta1</B></A></B></LI>
+</UL>
+</DIV></DIV></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/to-be-deleted.html b/site/trunk/site-publish/to-be-deleted.html
new file mode 100644
index 0000000000..74b4a39c7a
--- /dev/null
+++ b/site/trunk/site-publish/to-be-deleted.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : To Be Deleted</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55023">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="trash.html" title="Trash">Trash</A>&nbsp;&gt;&nbsp;<A href="" title="To Be Deleted">To Be Deleted</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tools-install-the-latest-tuscany-eclipse-plugin.html b/site/trunk/site-publish/tools-install-the-latest-tuscany-eclipse-plugin.html
new file mode 100644
index 0000000000..fba2006464
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-the-latest-tuscany-eclipse-plugin.html
@@ -0,0 +1,129 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tools - Install the Latest Tuscany Eclipse Plugin</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=98085">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Tools - Install the Latest Tuscany Eclipse Plugin">Tools - Install the Latest Tuscany Eclipse Plugin</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="Tools-InstalltheLatestTuscanyEclipsePlugin-InstalltheLatestTuscanyEclipsePlugin"></A>Install the Latest Tuscany Eclipse Plugin</H2>
+
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Installing%20the%20Apache%20Tuscany%20Eclipse%20Plugins" class="external-link" rel="nofollow"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> &quot;Installing the Apache Tuscany Eclipse Plugins video&quot;</A></P>
+
+<P>A quick Step by Step walk through of downloading, installing, and verifying the Tuscany Eclipse Plugins.</P>
+
+<P>This section shows you how to install the lastest Tuscany Eclipse plugin. The plugin gives you the ability to run an SCA composite file from the Package Explorer. You will see a &quot;Run As Tuscany&quot; menu item when you bring up the context menu on composite files.</P>
+
+<P>Start Eclipse and go to Help -&gt; Software Updates -&gt; Find and Install. Select &quot;Search for new features to install&quot; and then click next</P>
+
+<P>Create a new Remote Site. On the next dialog, click on &quot;New Remote Site...&quot; to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL from the latest <B><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases">Tuscany release</A></B> (e.g  <B><A href="http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/" class="external-link" rel="nofollow">http://www.apache.org/dist/tuscany/java/sca/1.5.1/tuscany-sca-1.5.1-updatesite/</A></B>.</P>
+
+<P>Select the &quot;Remote Site&quot; you just created, and click &quot;Finish&quot;</P>
+
+<P>Select the &quot;Apache Tuscany SCA Tools&quot; and click &quot;Next&quot;, and then, on the next dialog, click &quot;Finish&quot;. Accept the &quot;Plugin License&quot; and next click on &quot;Install All&quot;.</P>
+
+<P>When asked to &quot;restart eclipse&quot;, click the &quot;yes&quot; button. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg
new file mode 100644
index 0000000000..0357e5a253
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg.jpeg
new file mode 100644
index 0000000000..d71bfe84b1
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg
new file mode 100644
index 0000000000..457b4e7983
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg.jpeg
new file mode 100644
index 0000000000..e488e74fd2
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg
new file mode 100644
index 0000000000..23ded64414
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg.jpeg
new file mode 100644
index 0000000000..8e88737cea
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg
new file mode 100644
index 0000000000..190036e382
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg.jpeg
new file mode 100644
index 0000000000..bbb6a5ef56
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg
new file mode 100644
index 0000000000..ef1bd53888
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg.jpeg
new file mode 100644
index 0000000000..2fd587e991
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_installation.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg
new file mode 100644
index 0000000000..ced23f111a
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg.jpeg
new file mode 100644
index 0000000000..83c882dbd7
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg
new file mode 100644
index 0000000000..995daba70d
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg.jpeg
new file mode 100644
index 0000000000..369f562ef2
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg
new file mode 100644
index 0000000000..dcb2ce7afd
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg.jpeg
new file mode 100644
index 0000000000..77ae3d0f92
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg
new file mode 100644
index 0000000000..c32031adcf
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg.jpeg b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg.jpeg
new file mode 100644
index 0000000000..b929427c48
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.data/install_update_sites.jpg.jpeg
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.html b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.html
new file mode 100644
index 0000000000..482edfa64a
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-11.html
@@ -0,0 +1,143 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tools - Install Tuscany Eclipse Plugins 1.1</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82994">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Tools - Install Tuscany Eclipse Plugins 1.1">Tools - Install Tuscany Eclipse Plugins 1.1</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+<H2><A name="Tools-InstallTuscanyEclipsePlugins1.1-InstalltheTuscanyEclipsePlugin%26nbsp%3B"></A>Install the Tuscany Eclipse Plugin&nbsp;</H2>
+
+<P>The first thing you do is to start Eclipse and go to <B>Help &#45;&gt; Software Updates &#45;&gt; Find and Install</B>,<BR>
+select &quot;Search for new features to install&quot; and then click next</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>On the next dialog, click on <B>&quot;New Remote Site...&quot;</B> to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL as *<A href="http://people.apache.org/~jsdelfino/tuscany/tools/updatesite/*" class="external-link" rel="nofollow">http://people.apache.org/~jsdelfino/tuscany/tools/updatesite/*</A></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_new_site.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Make sure the <B>&quot;Remote&nbsp; Site&quot;</B> that was just created is selected, and click <B>&quot;Finish&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_finish.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Select the <B>&quot;Apache Tuscany SCA Tools&quot;</B> and click <B>&quot;Next&quot;</B>, and then, on the next dialog, click <B>&quot;Finish&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_search_results.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>Accept the <B>&quot;Plugin License&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_license.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>and next click on <B>&quot;Install All&quot;</B></P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_feature_verification.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>When asked to <B>&quot;restart eclipse&quot;</B>, click the&nbsp; <B>&quot;yes&quot;</B> button.&nbsp;</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tools-install-tuscany-eclipse-plugins-11.data/install_update_restart_eclipse.jpg" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-12.html b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-12.html
new file mode 100644
index 0000000000..eac22b3777
--- /dev/null
+++ b/site/trunk/site-publish/tools-install-tuscany-eclipse-plugins-12.html
@@ -0,0 +1,128 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tools - Install Tuscany Eclipse Plugins 1.2</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=85986">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Tools - Install Tuscany Eclipse Plugins 1.2">Tools - Install Tuscany Eclipse Plugins 1.2</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="Tools-InstallTuscanyEclipsePlugins1.2-InstalltheTuscanyEclipsePlugin%26nbsp%3B"></A>Install the Tuscany Eclipse Plugin&nbsp;</H2>
+
+<P>The first thing you do is to start Eclipse and go to Help -&gt; Software Updates -&gt; Find and Install,<BR>
+select &quot;Search for new features to install&quot; and then click next</P>
+
+<P>On the next dialog, click on &quot;New Remote Site...&quot; to create a new site entry. Give it a name such as<BR>
+&quot;Tuscany&quot; and add the site URL as <B><A href="http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/updatesite/" class="external-link" rel="nofollow">http://archive.apache.org/dist/incubator/tuscany/java/sca/1.2-incubating/updatesite/</A></B></P>
+
+<P>Make sure the &quot;Remote  Site&quot; that was just created is selected, and click &quot;Finish&quot;</P>
+
+<P>Select the &quot;Apache Tuscany SCA Tools&quot; and click &quot;Next&quot;, and then, on the next dialog, click &quot;Finish&quot;</P>
+
+<P>Accept the &quot;Plugin License&quot;</P>
+
+<P>and next click on &quot;Install All&quot;</P>
+
+<P>When asked to &quot;restart eclipse&quot;, click the  &quot;yes&quot; button. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/transaction-intents-and-transaction-manager-support.html b/site/trunk/site-publish/transaction-intents-and-transaction-manager-support.html
new file mode 100644
index 0000000000..36ffddcc69
--- /dev/null
+++ b/site/trunk/site-publish/transaction-intents-and-transaction-manager-support.html
@@ -0,0 +1,264 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Transaction Intents and Transaction Manager support : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=67710">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="subproject-menus.html" title="Subproject Menus">Subproject Menus</A>&nbsp;&gt;&nbsp;<A href="das-java-subproject-menu.html" title="DAS Java Subproject Menu">DAS Java Subproject Menu</A>&nbsp;&gt;&nbsp;<A href="design-discussions.html" title="Design Discussions">Design Discussions</A>&nbsp;&gt;&nbsp;<A href="" title="Transaction Intents and Transaction Manager support">Transaction Intents and Transaction Manager support</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>As this topic involves a lot of discussion thought the better place will be wiki.</P>
+
+<P>I was just thinking randomly to see how to integrate the work in JIRA-1816 with the work<BR>
+in JIRA-1700(implementation.das support for tx inents/policies). Below are some suggestions I could gather,<BR>
+but need lot of feedback and ideas.</P>
+
+<H3><A name="TransactionIntentsandTransactionManagersupport-TransactionManagersupportinSCA%28JIRA1816%29"></A>TransactionManager support in  SCA (JIRA-1816)</H3>
+<P>---------------------------------------------------------------------------------------------------------------------------------<BR>
+TransactionInfo - can have 2 subclasses - GlobalTransactionInfo (XADataSource...), LocalTransactionInfo (Connection...)<BR>
+we can rename TransactionInfo to TransactionContext if it suits.</P>
+
+<P>TransactionManager - also can have 2 similar flavours - LocalTransactionManager (what is there in the transaction.zip today)<BR>
+and GlobalTransactionManager. GlobalTransactionManager can support say a class level annotation - @TransactionManagerFactory(Geronimo)<BR>
+to have a way to inject an externally available TransactionManager like Geronimo, JOTM etc.<BR>
+---------------------------------------------------------------------------------------------------------------------------------</P>
+
+<H3><A name="TransactionIntentsandTransactionManagersupport-TxPolicySupportinimplementation.das%28JIRA1700%29"></A>Tx Policy Support in implementation.das (JIRA-1700)</H3>
+
+<P>----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+I went through the Tx Policy Draft and trying to understand it in detail. Below trying to give examples of different scenarions<BR>
+for implementation.das and attempting to analyze just some part from that. Getting lost in different places <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0">. Need all possible comments.<BR>
+I am just gathering all points below, with some discussions can prepare a design doc if that helps.</P>
+
+<P>(RM=Resource Manager) (xads = XADataSource) (xares=XAResource)(conn=connection)(2PC - 2 Phase Commit)<BR>
+----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+Note: <BR>
+a&gt; It is possible that the caller (say junit test case) passes XADataSource(which has Connection and XAResource) OR same can be obtained from <BR>
+within SCA runtime.<BR>
+b&gt; At das.implementation level intents can be - managedTransaction.global, managedTransaction.local, noManagedTransaction, (still not clear why to support unqualified managedTransaction)<BR>
+c&gt; At present, implementation.das does not support oneWayInvocation - so need not consider transactedOneWay and immediateOneWay - is this right assumption?<BR>
+d&gt; At service level intents can be - propagatesTransaction, suspendsTransaction<BR>
+----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+Scenarios:- </P>
+
+<P><B>CASE1) 1 component - 1 impl - 1 connection info - multiple services - multiple operations/service</B></P>
+
+<P>so at the time of createInvoker() for a service, the SCArutime can know both the intents (impl and interaction) and decide how to act on it.<BR>
+i.e. during DASImplementationProvider.createInvoker().</P>
+
+<P>1 impl == 1 RM (multiple Connections/XAConnections). <BR>
+so multiple services in the same .composite will use the same RM</P>
+
+<P>In DASImplementationProvider(component, impl) we have DASImplementationProvider.createInvoker(service, operation)<BR>
+One DASImplementationProvider has 1 DataAccessEngineManager. Bue each createInvoker() has a new DASInvoker() with new das<BR>
+and new DataAccessEngine. So each new invoker() will have a diff das instance.</P>
+
+<P><B>example</B></P>
+
+<P>scaDomain = SCADomain.newInstance(&quot;company.composite&quot;);<BR>
+dasCompanyService = scaDomain.getService(CompanyService.class, &quot;CompanyComponent/CompanyServiceComponent&quot;);</P>
+
+<P>dasCustomerService = scaDomain.getService(CustomerService.class, &quot;CompanyComponent/CustomerServiceComponent&quot;);</P>
+
+<P>dasCompanyService.updateCompanies();//RM0 - das0<BR>
+dasCustomerService.updateCustomers();//RM0 - das1<BR>
+----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>CASE2) also there can be - multiple RMs (multiple XAConnections for Tx support for atomic tx, if atomic is not needed can use java.sql.Connections)</B></P>
+
+<P>scaDomain1 = SCADomain.newInstance(&quot;company.composite&quot;);<BR>
+dasCompanyService = scaDomain.getService(CompanyService.class, &quot;CompanyComponent/CompanyServiceComponent&quot;);</P>
+
+<P>scaDomain2 = SCADomain.newInstance(&quot;customer.composite&quot;);<BR>
+dasCustomerService = scaDomain.getService(CustomerService.class, &quot;CustomerComponent/CustomerServiceComponent&quot;);</P>
+
+<P>dasCompanyService.updateCompanies(); //RM1 - das1<BR>
+dasCustomerService.updateCustomers(); //RM2 - das2<BR>
+----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>CASE3) case when at least one das (say das1) instance has a config with managedtx=true (i.e. das manages tx)</B><BR>
+In this case the configs and intents of all other das instances are immeterial, because to support managedtx=true (for das1), all others will need <BR>
+to follow the same mode.<BR>
+----------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>CASE4) case when non-DBMS RMs are involved</B></P>
+
+<P>scaDomain1 = SCADomain.newInstance(&quot;company.composite&quot;);<BR>
+dasCompanyService = scaDomain.getService(CompanyService.class, &quot;CompanyComponent/CompanyServiceComponent&quot;);</P>
+
+<P>scaDomain2 = SCADomain.newInstance(&quot;jmscustomer.composite&quot;);<BR>
+jmsCustomerService = scaDomain.getService(jmsCustomerService.class, &quot;jmsCustomerComponent/jmsCustomerServiceComponent&quot;);</P>
+
+<P>dasCompanyService.updateCompanies(); //RM1 DBMS<BR>
+jmsCustomerService.updateCustomers(); //RM2 JMS<BR>
+--------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+The Table2 from Tx Policy Draft needs to be considered.</P>
+
+<P>As the knowledge about das.implemnetation intent is at the construction of DASImplementationProvider(), but the knowledge of service level intent<BR>
+is at DASImplementationProvider.createInvoke() level, createInvoker() is the place which can take decision about tx control.</P>
+
+<P>The ConnectionInfo - finally present inside das (may it be from config.xml or .composite) should be in accordance with what is expected in the <BR>
+effective intents.</P>
+
+<P>DataAccessImplementationProvider.createInvoker() when calls getDAS() should pass as IN params the effective intents.</P>
+
+<P>When caller wants to pass xads (in case of global tx)/connection (in case of local tx), it needs a way to inject it (i.e. inject tx context) in <BR>
+the service. Some possible ways -<BR>
+**All DAS based services - can say mandatorily have a method setTransactionContext(Object ctx) (ctx can be Connection/XADS based on local<BR>
+or global). This should be invoked by the caller before calling any business method for the service.  <BR>
+**Another way, from JIRA-1816 work - say the caller does<BR>
+GlobalTransactionContext.setContext(XADS) OR LocalTransactionContext.setContext(Connection).<BR>
+with this the thread context will have info to be used inside SCA component/services.<BR>
+DataAccessImplementationProvider will do getContext() and if it is available (i.e. caller did setContext), will pass it to the getDAS(),<BR>
+so das instance will get Connection during construction. </P>
+
+
+<P>---------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>I] propagatesTransaction + managedTransaction.global</B></P>
+
+<P>MEANING: caller will ideally start tx and pass the tx context to sca runtime. the tx is distributed xa tx.</P>
+
+<P>FLOW: <BR>
+i) during DataAccessImplementationProvider.createInvoker() <DIV class="error"><SPAN class="error">Unknown macro: {das=getDAS()}</SPAN> </DIV>, inents will be passed in as well as necessary info from<BR>
+txn context will be passed in by DataAccessImplementationProvider.<BR>
+ii) das will get constructed with passing &quot;new&quot; connection to FACTORY.createDAS(). Also set managedtx=false to enalble non-das tx management.</P>
+
+<P>the caller will be responsible to handle the txn (i.e. managed shared global txn pattern)</P>
+
+<P><B>example</B></P>
+
+<P>XADS= GlobalTransactionManager.getXADataSource(pass in properties);<BR>
+GlobalTransactionContext.setContext(XADS tied to XID); //due to threadlocal, this context is referenceable by DataAccessImplementationProvider now.<BR>
+GlobalTransactionManager.begin(GlobalTransactionContext.getContext());</P>
+
+<P>scaDomain = SCADomain.newInstance(&quot;company.composite&quot;);<BR>
+dasCompanyService = scaDomain.getService(CompanyService.class, &quot;CompanyComponent/CompanyServiceComponent&quot;);//needs XADS1 tied with same XID</P>
+
+<P>dasCustomerService = scaDomain.getService(CustomerService.class, &quot;CompanyComponent/CustomerServiceComponent&quot;);//needs XADS2 tied with same XID</P>
+
+<P>dasCompanyService.updateCompanies();//RM0 - das0 <BR>
+dasCustomerService.updateCustomers();//RM0 - das1</P>
+
+<P>GlobalTransactionManager.commit(context);//see that XID has 2 XADS tied to it and does necessaty actions for 2PC<BR>
+--------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+Now for the case that, the caller is not having a ongoing tx and so does not inject tx context in sca runtime.</P>
+
+<P>When DASImplementationProvider detects there is no tx context set , inside createInvoker(), it can first instantiate das without a connection<BR>
+(some changes needed in tuscany-das-rdb for this), and then use das.getConfig() to get necessary config props and construct a tx context <BR>
+to be used by the current DASInvoker. Say we create a new DASTransactionCoordinator() for this work.</P>
+
+<P>DASTransactionCoordinator {</P>
+
+<P>  GlobalTransactionContext setTxContext(dasConfig)<DIV class="error"><SPAN class="error">Unknown macro: {
+    XADS= GlobalTransactionManager.getXADataSource(pass in properties);
+    GlobalTransactionContext.setContext(XADS); //due to threadlocal, this context is referenceable by DataAccessImplementationProvider now.
+    GlobalTransactionManager.begin(GlobalTransactionContext.getContext());//starts tx, this tx will be shared by all invokers.
+  }</SPAN> </DIV></P>
+
+<P>  //multiple XADS will need to be tied to single xid to make them part of 1 xa tx.<BR>
+  //more methods here for getContext, enqueXAResourceInXID, dqueue XAResource from XID, XID based 2PhaseCommit...  <BR>
+}</P>
+
+<P>and will also pass &quot;new&quot; conection from the tx context to each new das instance.</P>
+
+<P>Also DASImplementationProvider() in this case will need to terminate tx. This can be done in stop() of DASImplementationProvider();<BR>
+start() can not be used to start a tx as at that time, there is no existing tx context.</P>
+
+<P>Questions:<BR>
+Now are my confusions. In DASImplementationProvider.stop() what is the way to know whether to commit/rollback? i.e. how stop() method will know  about the invoke() having exceptions? Or otherwise each DASinvoker will need access to xid which is shared by all XAResources in the global tx<BR>
+and the DASInvoker is supposed to call DASTransactionCoordinator.rollback() for case of exception?</P>
+
+<P>Also, this whole story relates to only one RuntimeComponent (i.e. multiple services and multiple operations in each services but all in same <BR>
+component. Thus the tx can be encompassed by DASImplementationProvider.) What to do for the case when the global tx needs to span multiple <BR>
+components?<BR>
+------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>II] suspendsTransaction + managedTransaction.global</B><BR>
+Here even if caller has a tx, it will be ignored and DASImplementationProvider+DASTransactionCoordinator will create a new Tx context and <BR>
+will manage tx. Same questions as I]<BR>
+-------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>III] suspendsTransaction + managedTransaction.local</B></P>
+
+<P>DASImplementationProvider() will pass DASConfig.connectionInfo() to LocalTransactionManager.getDataSource() and setContext() to get <BR>
+java.sql.Connection (can be DriverManager or DataSource - in case of DataSource, the external env. is responsible for the JNDI initialization.)<BR>
+(As local tx, no question of XADS). Same question - how to communicate exception occuring in DASInvoker.invoke() to stop()?<BR>
+to decide whether to commit/rollback? Also as these are mere Connections and not XID/XADS etc. is it better for the DASInvoker() to control<BR>
+the commit/rollback of tx? i.e. each DASInvoker() thread will be a Local Tx.<BR>
+--------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+<B>IV] suspendsTransaction + noManagedTransaction</B><BR>
+this is equivalent to a das config with managedtx=true.</P>
+
+<P>Now say in case, there are das1 and das2 involved from 2 different .composites in a caller's business method<BR>
+and das1 has  IV] / managedtx=true and das2 has I], how will we be able to dectate that , because das1 is das managed tx, das2 should behave in <BR>
+same way?<BR>
+-------------------------------------------------------------------------------------------------------------------------------------------------<BR>
+Also, need to specify behavior for cases when only impl intent is present or only interaction intent is present.</P>
+
+<P>CASE2) and CASE4)  in case of I] need the caller to manage tx. If this is not happening, how implementation.das will be able to manage tx <BR>
+(if there are multiple components involved)</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/trash.html b/site/trunk/site-publish/trash.html
new file mode 100644
index 0000000000..a4e32c4e6c
--- /dev/null
+++ b/site/trunk/site-publish/trash.html
@@ -0,0 +1,112 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Trash</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100170">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Trash">Trash</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-anniversary.html b/site/trunk/site-publish/tuscany-anniversary.html
new file mode 100644
index 0000000000..5fe350b3f2
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-anniversary.html
@@ -0,0 +1,177 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Anniversary</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=104498">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Anniversary">Tuscany Anniversary</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyAnniversary-TuscanyCelebrates3rdAnniversary"></A>Tuscany Celebrates 3rd Anniversary</H1>
+
+<P><SPAN class="image-wrap" style="float: left"><IMG src="http://cwiki.apache.org/confluence/download/attachments/54321/Cake150.jpg" style="border: 0px solid black"></SPAN> On 2008-12-07 the Apache Tuscany project celebrates its 3rd anniversary as an Apache project. We are excited about our past accomplishments and enthusiastic about the future for Tuscany and SOA, and we would like you to join in our celebration. All week Apache Tuscany will be changing its logo and using special graphics for our virutal party, and you are invited to join.</P>
+
+<P><SPAN class="image-wrap" style="float: right"><IMG src="http://cwiki.apache.org/confluence/download/attachments/54321/Present150.jpg" style="border: 0px solid black"></SPAN> We've had many important achievements, and the improvements for Apace Tuscany keep coming. In the past we saw the following important milestones:</P>
+<UL>
+	<LI>November 2005 - SCA 0.9 specifications released by BEA, IBM, Oracle, SAP, IONA, and Sybase.</LI>
+	<LI>December 2005 - Apache Tuscany added as an Apache incubator project.</LI>
+	<LI>January 2006+ - Apache Tuscany release various milestones on the way to 1.0.</LI>
+	<LI>May 2006+ - Apache Tuscany presents at JavaOne, ApacheCon, SOA World, and others.</LI>
+	<LI>July 2006 - SCA 0.95 specifications released. OpenSOA formed. New companies join.</LI>
+	<LI>September 2007 - Apache Tuscany 1.0 release. First implementation of SCA version 1.0 specification.</LI>
+	<LI>February 2008 - Apache Tuscany 1.1 release with SCA policy support, many Web 2.0 bindings, platform integration.</LI>
+	<LI>April 2008 - Apache Tuscany 1.2 release with distributed SCA Domain management,<BR>
+JAX-WS annotations, and new Atom binding.</LI>
+	<LI>June 2008 - Tuscany goes worldwide with opening of <A href="http://tuscany.apache.org/chinese-portal.html" class="external-link" rel="nofollow">Chinese portal</A> and discussion groups.</LI>
+	<LI>May 2008 - Apache Tuscany becomes and official top level Apache project.</LI>
+	<LI>September 2008 - Apache Tuscany release exciting <A href="http://tuscany.apache.org/sca-videos.html" class="external-link" rel="nofollow">video series</A>. Hollywood takes note.</LI>
+	<LI>August 2008 - Apache <A href="http://tuscany.apache.org/sca-java-releases.html" class="external-link" rel="nofollow">Tuscany 1.3 release</A> with improved Java2WSDL, performance and full security enablement.</LI>
+	<LI>December 2008 - Apache Tuscany 1.4 being readied for public consumption.</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="float: left"><IMG src="http://cwiki.apache.org/confluence/download/attachments/54321/Balloons150.jpg" style="border: 0px solid black"></SPAN> The people on the Apache Tuscany team are happy on this anniversary, and look forward to the future. We invite you to try our release and celebrate with us.</P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg
new file mode 100644
index 0000000000..af8e30deae
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg.jpeg
new file mode 100644
index 0000000000..7a1c2140b9
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg
new file mode 100644
index 0000000000..f222230cf4
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg.jpeg
new file mode 100644
index 0000000000..c5b7fb2288
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/bootstrap_seq.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg
new file mode 100644
index 0000000000..ed8ac08425
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg.jpeg
new file mode 100644
index 0000000000..29195ebba1
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/component.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg
new file mode 100644
index 0000000000..ecbf04798f
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg.jpeg
new file mode 100644
index 0000000000..b7f4e64b84
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/model.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg
new file mode 100644
index 0000000000..fd1f8d4318
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
new file mode 100644
index 0000000000..a4e3e2b1e3
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg
new file mode 100644
index 0000000000..0c47a208b1
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg.jpeg b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg.jpeg
new file mode 100644
index 0000000000..96806ed1e7
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.data/tuscany_layers.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-architecture-guide.html b/site/trunk/site-publish/tuscany-architecture-guide.html
new file mode 100644
index 0000000000..bdd1571770
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-architecture-guide.html
@@ -0,0 +1,478 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany Architecture Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Architecture Guide">Tuscany Architecture Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany Architecture Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=45023">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=45023">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45023">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=45023">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/display/~rfeng/Index">Raymond Feng</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 13, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=45023&originalId=51509">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <DIV class="panel" style="border-style: solid; border-color: #6699ff; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #6699ff; background-color: #D5EFFF; "><B>Apache Tuscany SCA Java Kernel Architecture Guide</B></DIV><DIV class="panelContent" style="background-color: #ffffff; ">
+<P><B>This page is work in progress. Thanks for your contribution</B> <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+<UL>
+	<LI><A href="#TuscanyArchitectureGuide-Overview" title="Overview on Tuscany Architecture Guide">Kernel overview</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-Modules" title="Modules on Tuscany Architecture Guide">Modules</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-Artifacts" title="Artifacts on Tuscany Architecture Guide">Runtime Artifacts</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-Recursions" title="Recursions on Tuscany Architecture Guide">Recursive Composite</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-KernelWiring" title="Kernel Wiring on Tuscany Architecture Guide">Wiring</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-KernelBootstrap" title="Kernel Bootstrap on Tuscany Architecture Guide">Bootstrap</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-KernelCompositeHierarchy" title="Kernel Composite Hierarchy on Tuscany Architecture Guide">Composite Hierarchy</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-JavaSCADeployment" title="Java SCA Deployment on Tuscany Architecture Guide">Deployment</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-JavaSCALoaders" title="Java SCA Loaders on Tuscany Architecture Guide">Loader</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-JavaSCABuilder" title="Java SCA Builder on Tuscany Architecture Guide">Builder</A></LI>
+	<LI><A href="#TuscanyArchitectureGuide-JavaSCAmodel" title="Java SCA model on Tuscany Architecture Guide">Model</A></LI>
+</UL>
+
+
+
+<P><BR clear="all">
+&nbsp;</P>
+</DIV></DIV><TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR></TR></TBODY></TABLE>
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-Overview"></A><FONT color="#0099cc">Kernel Overview </FONT></H3>
+
+<P>This is a high level architecture document for Tuscany Java implementation of Service Component Architecture (SCA) which is defined in the specifications located at (<SPAN class="nobr"><A href="http://wwww.osoa.org/" title="Visit page outside Confluence" rel="nofollow">http://wwww.osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>). </P>
+
+<P>This is a live document and is more focused on what is implemented rather than the end vision.<BR>
+Goal of this document is to help users/developers better understand what Tuscany SCA offers and enable them to help with the development if interested. </P>
+
+<P>Tuscany provides the infrastructure for creating, assembling and deploying services in a distributed environment.<BR>
+At a high level it aims to provide for the following:</P>
+
+<UL>
+	<LI>Infrastructure for creating, wiring, deploying and managing service assemblies in single runtime or across runtimes (federated)</LI>
+	<LI>Infrastructure for leveraging qualities of service provided by host environments (transactions, security)</LI>
+	<LI>Support for different host environments: Standalone, Tomcat, J2EE, OSGI (in progress, more can be added)</LI>
+	<LI>plug-points for supporting variety of bindings such as Axis2, RMI, more can be added</LI>
+	<LI>plug-points for adding component implementations such as Java Script, Spring, JRuby, Python (started), more can be added</LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-Modules"></A><FONT color="#0099cc">Module Structure</FONT></H3>
+<P>[Note: Do we want to link to <SPAN class="nobr"><A href="kernel-modulization-design-discussions.html" title="Visit page outside Confluence" rel="nofollow">Kernel-Structure<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>]?</P>
+
+<P>As illustrated below, the Tuscany runtime consists of the following key modules/packages:</P>
+
+<OL>
+	<LI>SCA Spec API: The APIs defined by the SCA Java Client and Implementation Spec</LI>
+	<LI>API: Tuscany APIs which extend the SCA spec APIs</LI>
+	<LI>Core: The runtime implementation</LI>
+	<LI>SPI: SPI and base classes to extend the Tuscany runtime. It defines all the contract that Core interacts with Container/Binding/Databinding extensions.</LI>
+	<LI>Extensions:
+	<OL>
+		<LI>Container</LI>
+		<LI>Binding</LI>
+		<LI>Databinding</LI>
+	</OL>
+	</LI>
+	<LI>Host API: The interface between hosting environments and the Tuscany runtime</LI>
+	<LI>Host Platforms: The environments that host the Tuscany runtime</LI>
+</OL>
+
+
+<P><IMG src="tuscany-architecture-guide.data/tuscany_layers.jpg" align="absmiddle" border="0"></P>
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-Artifacts"></A><FONT color="#0099cc">Runtime Artifacts</FONT></H3>
+<UL>
+	<LI>Component
+	<UL>
+		<LI>Basic unit of executable code</LI>
+		<LI>Offer services and have references</LI>
+	</UL>
+	</LI>
+	<LI>Service
+	<UL>
+		<LI>A contract for component clients consisting of 0..n operations</LI>
+		<LI>Services may be local or remote</LI>
+	</UL>
+	</LI>
+	<LI>Reference
+	<UL>
+		<LI>A dependency on a service</LI>
+		<LI>Component references are wired to services by the runtime</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-Recursions"></A><FONT color="#0099cc">Recursive Composite</FONT></H3>
+<P>Components may be Atomic or Composite</P>
+<UL>
+	<LI>Composite components contain 0..n components<BR>
+Composite services are exposed over 1..n bindings (e.g. SOAP/HTTP, JMS, RMI) <BR>
+Composite references have 1..n bindings and may target</LI>
+	<LI>A service exposed by another composite</LI>
+	<LI>A service outside the SCA system, e.g. &quot;Google search&quot;<BR>
+A composite may contain just a service wired to a references (mediation)  <SPAN class="error">&#91;Haleh: Clarify&#93;</SPAN></LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-KernelWiring"></A><FONT color="#0099cc">Wiring</FONT></H3>
+<P>To understand how wiring works, we need to detail how Components function in the system. Let's start with Atomic Components and then discuss Composite Components.</P>
+
+
+<H4><A name="TuscanyArchitectureGuide-AtomicComponent"></A>Atomic Component </H4>
+<P>AtomicComponent is the most basic component form. It corresponds to the spec concept which offers services, has references and properties </P>
+<UL>
+	<LI>Implementation types e.g. Java, XSLT, etc.</LI>
+	<LI>Are wired</LI>
+	<LI>Have properties</LI>
+</UL>
+
+
+<P>Atomic Components have implementation instances. Instances are associated with a scope: e.g. request, conversation, composite. A SCDL entry is used to define a Component. <SPAN class="error">&#91;Haleh: Define scope&#93;</SPAN></P>
+
+<P>Atomic components use a ScopeContainer to manage implementation instances:</P>
+<UL>
+	<LI>Composite, HTTP Session, Request, Stateless</LI>
+	<LI>ScopeContainers track implementation instances by scope id and the AtomicComponent instance identity</LI>
+	<LI>Instances are stored in an InstanceWrapper which is specific to the component implementation type (e.g. PojoInstanceWrapper.java)</LI>
+</UL>
+
+
+<H4><A name="TuscanyArchitectureGuide-ComponentWiring"></A>Component Wiring </H4>
+<P>Component references are connected to services through wires</P>
+<UL>
+	<LI>Two sides
+	<UL>
+		<LI>InboundWire - handles the source side of a wire, including policy</LI>
+		<LI>OutboundWire - handles the target side of a wire, including policy</LI>
+	</UL>
+	</LI>
+	<LI>The runtime connects inbound and outbound wires, performing optimizations if possible
+	<UL>
+		<LI>Inbound and outbound wires may be associated with different service contracts</LI>
+		<LI>Different implementation types</LI>
+		<LI>&quot;Standard&quot; wires contain invocation chains that have Interceptors that perform some form of mediation (e.g. policy)</LI>
+		<LI>Other wire types exist that, for example, do not perform mediations</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H4><A name="TuscanyArchitectureGuide-InvocationChains"></A>Invocation Chains </H4>
+<P>A wire has an InvocationChain per service operation. An InvocationChain may have interceptors - &quot;around-style&quot; mediation. Component implementation instances access a wire through a WireInvocationHandler associated with a reference.</P>
+<UL>
+	<LI>WireInvocationHandlers may (or may not depending on the component type) be fronted by a proxy</LI>
+	<LI>WireInvocationHandlers dispatch an invocation to the correct chain<BR>
+A wire has a TargetInvoker that is created from the target side AtomicComponent or Reference and is stored on the source wire invocation handler. The TargetInvoker is resposnible for dispatching the request to the target instance when the message hits the end of the target invocation chain. </LI>
+</UL>
+
+
+<H4><A name="TuscanyArchitectureGuide-InvocationOverview"></A>Invocation Overview </H4>
+<UL>
+	<LI>An invocation is dispatched to the WireInvocationHandler</LI>
+	<LI>The WireInvocationHandler looks up the correct InvocationChain</LI>
+	<LI>It then creates a message, sets the payload, sets the TargetInvoker, and passes the message down the chain</LI>
+	<LI>When the message reaches the end of the chain, the TargetInvoker is called, which in turn is responsible for dispatching to the target</LI>
+	<LI>Having the TargetInvoker stored on the outbound side allows it to cache the target instance when the wire source has a scope of equal or lesser value than the target (e.g. request--&gt;composite</LI>
+</UL>
+
+
+<P>The runtime provides components with InboundWires and OutboundWires. InvocationChains are held in component wires and are therefore stateless which allows for dynamic behavior such as introduction of new interceptors or re-wiring.</P>
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-KernelBootstrap"></A><FONT color="#0099cc">Bootsrap </FONT></H3>
+
+<P>Bootstrap process is controlled by Host environment. The default process is implemented in DefaultBootstrapper.</P>
+
+<P><IMG src="tuscany-architecture-guide.data/bootstrap.jpg" align="absmiddle" border="0"></P>
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-KernelCompositeHierarchy"></A><FONT color="#0099cc">Composite Hierarchy</FONT></H3>
+<P><A href="tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg" target="tuscany_composite_hierarchy.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/tuscany_composite_hierarchy.jpg&quot;, &quot;tuscany_composite_hierarchy.jpg&quot;, &quot;height=610,width=1057,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="tuscany-architecture-guide.data/tuscany_composite_hierarchy.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="TuscanyArchitectureGuide-Thesequencediagramforthebootstrapping"></A>The sequence diagram for the bootstrapping </H3>
+
+<P><A href="tuscany-architecture-guide.data/bootstrap_seq.jpg" target="bootstrap_seq.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/bootstrap_seq.jpg&quot;, &quot;bootstrap_seq.jpg&quot;, &quot;height=993,width=1809,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="tuscany-architecture-guide.data/bootstrap_seq.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-JavaSCADeployment"></A><FONT color="#0099cc">Deployment</FONT></H3>
+
+<P>The runtime processes service assemblies serialized using SCA XML vocabulary, SCDL, but can take other forms.  </P>
+<UL>
+	<LI>The load phase processes SCDL and creates an in-memory model</LI>
+	<LI>The build phase evaluates the model and produces corresponding runtime artifacts (e.g. components, services, references)</LI>
+	<LI>The connect phase wires references to services</LI>
+</UL>
+
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-JavaSCALoaders"></A><FONT color="#0099cc">Loader</FONT></H3>
+<P>SCA service assemblies are deployed to the SCA domain in the format of SCDL files. Tuscany runtime uses loader to load the SCDLs into model objects which are a set of java beans to hold the metadata.</P>
+
+<P>There are two types of loaders:</P>
+
+<UL>
+	<LI>StAXElementLoader: Load the XML element from the StAX events</LI>
+	<LI>ComponentTypeLoader: Load the Component Type for an implementation either by introspection or paring a side file</LI>
+</UL>
+
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-JavaSCAmodel"></A><FONT color="#0099cc">Model</FONT></H3>
+
+<P><A href="tuscany-architecture-guide.data/model.jpg" target="model.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/model.jpg&quot;, &quot;model.jpg&quot;, &quot;height=649,width=852,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="tuscany-architecture-guide.data/model.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+<H3><A name="TuscanyArchitectureGuide-LoadingComponentType"></A>Loading Component Type </H3>
+<P>Loads the component type definition for a specific implementation</P>
+<UL>
+	<LI>How it does this is implementation-specific</LI>
+	<LI>May load XML sidefile (location set by implementation)</LI>
+	<LI>May introspect an implementation artifact (e.g. Java annotations)</LI>
+	<LI>... or anything else</LI>
+</UL>
+
+
+<P>Composite ComponentType Loader</P>
+<UL>
+	<LI>Load SCDL from supplied URL</LI>
+	<LI>Extract and load SCDL from composite package</LI>
+</UL>
+
+
+<P>POJO ComponentType Loader</P>
+<UL>
+	<LI>Introspect Java annotations</LI>
+	<LI>Uses a pluggable &quot;annotation processing&quot; framework to introspect Java classes</LI>
+</UL>
+
+
+
+<H3><A name="TuscanyArchitectureGuide-"></A><A name="TuscanyArchitectureGuide-JavaSCABuilder"></A><FONT color="#0099cc">Builder</FONT></H3>
+<P>Java SCA builder creates a runtime component from the configuration model</P>
+<UL>
+	<LI>Builder for each implementation type</LI>
+	<LI>Builder for each binding type (service or reference component)</LI>
+</UL>
+
+
+<P>Runtime component manages:</P>
+<UL>
+	<LI>Implementation instances</LI>
+	<LI>Inbound and Outbound wires</LI>
+</UL>
+
+
+<P>Every implementation is likely to be different</P>
+<UL>
+	<LI>Different artifacts, programming model, ...</LI>
+</UL>
+
+
+<P>Composite implementation recurses for contained components</P>
+<UL>
+	<LI>Re-invokes the Builder for every child</LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-Classdiagramfortheruntimeartifacts"></A>Class diagram for the runtime artifacts </H3>
+
+<P><A href="tuscany-architecture-guide.data/component.jpg" target="component.jpg" onclick="window.open(&quot;http://cwiki.apache.org/confluence/download/attachments/45023/component.jpg&quot;, &quot;component.jpg&quot;, &quot;height=754,width=1047,menubar=no,status=no,toolbar=no&quot;); return false;"><IMG src="tuscany-architecture-guide.data/component.jpg.jpeg" title="Added by UWC, the Universal Wiki Converter" align="absmiddle" border="0"></A></P>
+
+
+<H3><A name="TuscanyArchitectureGuide-Connecting"></A>Connecting </H3>
+
+<P>The connector is reponsible to connect the wires for the components, services and references.</P>
+
+<H2><A name="TuscanyArchitectureGuide-FederatedAssembly"></A>Federated Assembly</H2>
+<P>&lt;notes from Meeraj's email on 2/1/07 - Haleh included here&gt;<BR>
+I have been working on the stuff around federated assembly and enabling<BR>
+distributed SCA domains. Here is a quick summary of what has been done<BR>
+so far,</P>
+
+<P>Work in progress</P>
+
+<H3><A name="TuscanyArchitectureGuide-DiscoveryService"></A>Discovery Service</H3>
+
+<UL>
+	<LI>Provides the low-level communication abstraction for<BR>
+enabling runtimes participating in the domain to exchange information</LI>
+	<LI>The abstraction supports directed message delivery to a<BR>
+given runtime, asynchronous message reception and broadcast to all<BR>
+runtimes participating in the domain</LI>
+	<LI>To start with we are following a model, where one<BR>
+runtime in the domain assumes the master role and is responsible for<BR>
+managing the logical assembly</LI>
+	<LI>This runtime creates the physical artifacts and<BR>
+trensport them to the target slave runtimes</LI>
+	<LI>The discovery abstraction is defined in SPI</LI>
+	<LI>There are two implementations in runtime/services - JXTA<BR>
+and Bonjour</LI>
+	<LI>JXTA implementaion is getting pretty much there, it<BR>
+mainly uses the JXTA Peer Discovery protocol (PDP) and Peer Resolver<BR>
+Protocol (PRP)</LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-MarshallingFramework"></A>Marshalling Framework</H3>
+
+<UL>
+	<LI>This is similar to our loader framework, however<BR>
+supports bi-directional marshalling and unmarshalling of physical model<BR>
+objects</LI>
+	<LI>This framework is used by the assembly service to<BR>
+serialize and transport physical model information to slave runtimes<BR>
+using the discovery services</LI>
+	<LI>On the receiving end the serialized information is<BR>
+unmarshalled by the federated deployer for being applied to the slave<BR>
+runtime</LI>
+	<LI>The abstraction is defined in SPI</LI>
+	<LI>I am working on an implementation in core</LI>
+	<LI>The framework supports versioning of physicla model<BR>
+objects if the participating runtimes are at different versions</LI>
+</UL>
+
+
+<H3><A name="TuscanyArchitectureGuide-FederatedDeployer"></A>Federated Deployer</H3>
+
+<UL>
+	<LI>This is similar to the local deployer, however registers<BR>
+itself with the discovery service for receiving physical model updates</LI>
+	<LI>The federated deployer doesn't use the loader framework</LI>
+	<LI>The federated deployer accepts serialized physical model<BR>
+information in XML, rather than raw SCDL as with local deployer</LI>
+	<LI>It uses the current builder framework to build, prepare<BR>
+and start the components</LI>
+</UL>
+
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">A note from Jeremy on federated deployment Feb. 9, 2007.</B><BR>
+<P>The design is that there is a &quot;master&quot; node that is working out which&quot;physical&quot; nodes components are going to run on. It then <BR>
+passes PhysicalComponentDefinition's to the worker nodes to get them tocreate the component and any transport bindings it needs <BR>
+to talk toother nodes. The PCDs are portable, independent of the type ofruntime, instead tied to the type of component.Picking on <BR>
+Ruby as an example as we know we can run that on Java andNative runtimes, there could be one common PCD for a Ruby componentthat <BR>
+was supported by all container implementations. The master couldsend that to any node to have it run a Ruby component. A runtimecould <BR>
+also offer &quot;enhanced&quot; Ruby support with additional featuresthat required additional configuration. If would offer support for adifferent <BR>
+PCD with that additional metadata. Which one is selected bythe master would be part of its component allocation algorithm.So basically, <BR>
+any runtime that can connect to the federated fabricand handle a PCD can join the SCA domain. We picked JXTA and XML forthe fabric and <BR>
+PCD encoding as there is support for those in bothJava and C++. Adding support for that to the Native runtime wouldalso be good if you <BR>
+were skeptical of all the Java stuff.</P></TD></TR></TABLE>
+
+<H3><A name="TuscanyArchitectureGuide-Workoutstanding"></A>Work outstanding</H3>
+
+<UL>
+	<LI>Define the physical model in Java</LI>
+	<LI>Define the corresponding XML infoset</LI>
+</UL>
+
+
+
+
+<H3><A name="TuscanyArchitectureGuide-SupportedExtensions"></A>Supported Extensions </H3>
+<H4><A name="TuscanyArchitectureGuide-Spring"></A>Spring</H4>
+<P>1) it allows a Spring application context to act as the<BR>
+implementation of an SCA component - this allows users to bring<BR>
+existing Spring applications into an SCA assembly<BR>
+2) it allows SCA components to act as Spring beans so that users can<BR>
+use services over SCA from their applications.</P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-books-and-articles.data/S313731-DataBinding.pdf b/site/trunk/site-publish/tuscany-books-and-articles.data/S313731-DataBinding.pdf
new file mode 100644
index 0000000000..6b7b256d4c
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-books-and-articles.data/S313731-DataBinding.pdf
diff --git a/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg b/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg
new file mode 100644
index 0000000000..589d4f4226
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg
diff --git a/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg.jpeg b/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg.jpeg
new file mode 100644
index 0000000000..0fa7f9ac69
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-books-and-articles.data/tuscany-in-action.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-books-and-articles.html b/site/trunk/site-publish/tuscany-books-and-articles.html
new file mode 100644
index 0000000000..64268d0e22
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-books-and-articles.html
@@ -0,0 +1,199 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Books and Articles</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=115913">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Books and Articles">Tuscany Books and Articles</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="TuscanyBooksandArticles-BooksaboutTuscanyandSCA"></A>Books about Tuscany and SCA</H2>
+
+<UL>
+	<LI><A href="http://www.manning.com/laws/" class="external-link" rel="nofollow">Tuscany SCA In Action</A><BR>
+by Simon Laws, Mark Combellack, Raymond Feng, Haleh Mahbod, Simon Nash</LI>
+</UL>
+
+
+<P>Tuscany SCA in Action is a comprehensive, hands-on guide for developing technology-agnostic, extensible applications. By following a travel-booking example throughout the book, you'll learn how to model, compose, deploy, and manage applications using SCA. The book emphasizes practical concerns, like effectively using Tuscany&rsquo;s supported bindings and protocols and integrating with standard technologies like Spring and JMS to save development time and cost.</P>
+
+<P><A href="http://www.manning.com/laws/" class="external-link" rel="nofollow"><SPAN class="image-wrap" style=""><IMG src="tuscany-books-and-articles.data/tuscany-in-action.jpg" style="border: 0px solid black"></SPAN></A></P>
+
+<UL>
+	<LI><A href="http://www.mc-store.com/5079.html" class="external-link" rel="nofollow">SOA for the Business Developer - Concepts, BPEL, and SCA</A><BR>
+<A href="http://www.mc-store.com/5079.html" class="external-link" rel="nofollow"><SPAN class="image-wrap" style=""><IMG src="http://ep.yimg.com/ip/I/mcpressonline_2053_17696877.gif" width="10%|height=10%%|height=10%%|height=10%%|height=10%" style="border: 0px solid black"></SPAN></A></LI>
+</UL>
+
+
+<UL>
+	<LI><A href="http://www.manning.com/davis/" class="external-link" rel="nofollow">Open Source SOA</A><BR>
+<A href="http://www.manning.com/davis/" class="external-link" rel="nofollow"><SPAN class="image-wrap" style=""><IMG src="http://www.manning.com/davis/davis_cover150.jpg" style="border: 0px solid black"></SPAN></A></LI>
+</UL>
+
+
+<H2><A name="TuscanyBooksandArticles-Articles"></A>Articles</H2>
+
+<UL>
+	<LI><A href="http://webservices.sys-con.com/read/325183.htm" class="external-link" rel="nofollow">What is SCA? A quick view of concepts through and an example walkthrough </A>, Java Developer Journal, Article by Simon Laws, Raymond Feng, Haleh Mahbod</LI>
+	<LI><A href="http://java.sys-con.com/read/458183.htm" class="external-link" rel="nofollow">Building SOA with Tuscany SCA, A simple service-oriented infrastructure</A>, Java Developer Journal, Article by Simon Laws, Raymond Feng, Haleh Mahbod</LI>
+	<LI><A href="http://www.ddj.com/architect/201202701" class="external-link" rel="nofollow">Service-Component Architectures-A programming model for SOA</A>, Dr Dobb's Portal, August 2007</LI>
+	<LI><A href="http://www.ibm.com/developerworks/webservices/library/ws-soa-scafutureproof/" class="external-link" rel="nofollow">Futureproofing With SCASee how using SCA makes your services more adaptable for the future</A>, IBM DeveloperWorks, by Bert Lamb</LI>
+	<LI><A href="http://www.ibm.com/developerworks/webservices/library/ws-sca-tuscany/index.html" class="external-link" rel="nofollow">Deploy an SCA application using the Tuscany domain manager</A>, IBM DevloperWorks, by Alla Segal, Michael Beisiegel, Jean-Sebastien Delfino</LI>
+	<LI><A href="http://www.ibm.com/developerworks/library/ar-gis2/?S_TACT=105AGX54&S_CMP=C0423&ca=dnw-1016&ca=dth-grn&open&cm_mmc=5220-_-n-_-vrm_newsletter-_-10731_112121&cmibm_em=dm:0:16626011" class="external-link" rel="nofollow">Building a Geospatial Information System, Part 2: A real world application using Web 2.0, SOA, and SCA principles</A>, IBM DeveloperWorks, by Angel Tomala-Reyes and Murali Vridhachalam</LI>
+	<LI><A href="http://www.ibm.com/developerworks/webservices/library/os-springsca1/index.html" class="external-link" rel="nofollow">Design and develop SCA components using the Spring Framework, Part 1: The trifecta: Spring, SCA, and Apache Tuscany</A>, IBM DeveloperWorks,Ramkumar Ramalingam</LI>
+</UL>
+
+
+<H2><A name="TuscanyBooksandArticles-Presentations"></A>Presentations</H2>
+
+<UL>
+	<LI><A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" class="external-link" rel="nofollow">Introducing SCA</A>, David Chappell and Associates  &#42;&#42; Excellent introduction</LI>
+	<LI><A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part1.pdf?version=1" class="external-link" rel="nofollow">OASIS SCA Tutorial Part 1</A>, Given at the 2007 OASIS Symposium held in San Diego in April 2007</LI>
+	<LI><A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part2.pdf?version=1" class="external-link" rel="nofollow">OASIS SCA Tutorial Part 2 - focus on policies</A>,Given at the 2007 OASIS Symposium held in San Diego in April 2007</LI>
+	<LI><A href="tuscany-books-and-articles.data/S313731-DataBinding.pdf">Data Binding Unleashed for Composite Applications</A> , Given at JavaOne 2010, San Francisco</LI>
+</UL>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG b/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG
new file mode 100644
index 0000000000..ad5806d0be
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG
diff --git a/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG.jpeg b/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG.jpeg
new file mode 100644
index 0000000000..9d3e7bb4c2
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG.jpeg
diff --git a/site/trunk/site-publish/tuscany-cwiki-development-guideline.html b/site/trunk/site-publish/tuscany-cwiki-development-guideline.html
new file mode 100644
index 0000000000..577276db0f
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-development-guideline.html
@@ -0,0 +1,187 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany cwiki Development Guideline : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56590">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany cwiki Development Guideline">Tuscany cwiki Development Guideline</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>The Apache Tuscany Project Website (<SPAN class="nobr"><A href="http://incubator.apache.org/tuscany" title="Visit page outside Confluence" rel="nofollow">http://incubator.apache.org/tuscany<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>) content is authored collaboratively by the Tuscany community.&nbsp; The content authoring and publish takes place in the following steps:&#45;</P>
+<UL>
+	<LI>This authoring of content happens on the <B>Tuscany Space</B> of the Confluence based Apache Wiki - <SPAN class="nobr"><A href="home.html" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+	<LI>Content thus created is exported as html, at regular intervals to the Confluence based export site - <SPAN class="nobr"><A href="http://cwiki.apache.org/TUSCANY" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/TUSCANY<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+	<LI>Finally the confluence based html content is further exported at regular intervals over to the project's public site <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany" title="Visit page outside Confluence" rel="nofollow">http://incubator.apache.org/tuscany<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</LI>
+</UL>
+
+
+<P>There is more information at the end of this page on how content is synchronized from the Wiki to the public site.</P>
+
+<P>Since the Wiki content forms the backbone for the public website content, it is important that the community adheres to some community accepted common guidelines when authoring content on the Wiki, to help in consistency and maintainability of the content.&nbsp; The objective of this page is to record these guidelines.</P>
+
+<H2><A name="TuscanycwikiDevelopmentGuideline-WikiContentAuthoringandOrganizationGuidelines%26nbsp%3B"></A>Wiki Content Authoring and Organization Guidelines&nbsp;</H2>
+
+<P>The Apache Tuscany project consists of three subprojects - SCA, SDO and DAS each of which is implemented in C+&#43; and Java.&nbsp; These subprojects and their implementations have different documentation and download pages. There is a lot of information that gets shared on the website related to all these projects and it is essential to have a clear structure to help ease the administration, modification and maintenance of the website.  Here is a proposal for how the information on cwiki can be organized with this goal in mind.</P>
+
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Need%20to%20make%20sure%20community%20is%20in%20agreement%20before%20we%20make%20this%20the%20guideline%20-%20so,%20here%20is%20the%20proposal&linkCreation=true&fromPageId=56590" title="Create Page: Need to make sure community is in agreement before we make this the guideline - so, here is the proposal" class="createlink">Need to make sure community is in agreement before we make this the guideline &#45; so, here is the proposal<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>.</P>
+
+<H3><A name="TuscanycwikiDevelopmentGuideline-ContentStructure"></A>Content Structure</H3>
+
+<P>Tuscany cwiki is divided into two <B>logical</B> spaces.</P>
+<OL>
+	<LI><B>Tuscany General space:</B> this is where you will find general Tuscany information, for example community, blogs, documentation and downloads for Tuscany.&nbsp; The root of the pages under this category is 'General Info'.&nbsp; The pages under 'General Info' contains information like : Home, SCA Overview, SDO Overview, DAS Overview. All pages categorized under 'Genral Info' the use the same navigation menu.</LI>
+	<LI><B>Tuscany Subproject space:</B> There is a 'logical' space for each subproject under Tuscany. For example, SCA Java, SDO Java, SCA Native, etc. When under a subproject, you'll only find information about the subproject. Each subproject uses its own menu (which is similar for all subprojects) to navigate through pages for that subproject.  This means navigation remains constant when traversing through pages of a subproject.</LI>
+	<LI><B>Tuscany Menus :</B> Another category of pages are the various 'Menus' that are used.&nbsp; These have been isolated as another sub-tree of content to help in independent organization of Menu options.&nbsp; Under this subtree titled 'Menus' is organized all the sets of Menu options that appear on the Navigation pane on the left.</LI>
+</OL>
+
+
+<H4><A name="TuscanycwikiDevelopmentGuideline-Wikitreestructure"></A>Wiki tree structure</H4>
+
+<P>Tuscany</P>
+<UL>
+	<LI>Home
+	<UL>
+		<LI>SCA Overview (general)
+		<UL>
+			<LI>SCA Java (subproject)<BR>
+<IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> You will find a similar structure as SCA Java under all other subprojects (SCA Native, SDO Java, DAS Java, ...)
+			<UL>
+				<LI><B>SCA Java Subproject Documentation Menu</B> &#45; All publishable documentations are under this</LI>
+				<LI><B>SCA Java Releases</B> &#45; All release download pages for the subproject are under this</LI>
+				<LI><B>SCA Java Work-in-progress</B> &#45; This is place holder for work in progress. For example, discussion about new release, documentation in progress, etc. would all go under this category</LI>
+			</UL>
+			</LI>
+			<LI>SCA Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>SDO Overview (general)
+		<UL>
+			<LI>SDO Java (subproject)</LI>
+			<LI>SDO Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>DAS Overview (general)
+		<UL>
+			<LI>DAS Java (subproject)</LI>
+			<LI>DAS Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>General Info (general) - holds information applicable to all projects. For example, Events, documentat/download, community, etc.</LI>
+		<LI>Menus - You will find all menus under here
+		<UL>
+			<LI>General - You will find general menu here</LI>
+			<LI>Subproject Menus - You will find subproject specific menus here</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<H3><A name="TuscanycwikiDevelopmentGuideline-Guidelines"></A>Guidelines</H3>
+
+<OL>
+	<LI>Before adding any content to the wiki take a look at the content tree structure at <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/listpages-dirview.action?key=TUSCANY" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/pages/listpages-dirview.action?key=TUSCANY<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> and identify a node in the tree where the content could best fit.&nbsp; To start with you could identify if the content falls under general or under a specific subproject or under a specific implementation of a subproject.&nbsp; Then under this you could further categorize if the content is to do with 'Technical Documentation' or 'Release' and so on.</LI>
+	<LI>Having decided on a position for the content page in the content tree strucuture ensure that the 'Parent Page' is properly set to the identified position (page).</LI>
+	<LI>If any part of a content is likely to be reused under different contexts and hence in different pages, then abstract such reusable content into a separate page and include it in the various contexts (using the include macro) instead of duplicating the content across contexts.</LI>
+	<LI>Since all pages should have a relevant Navigation Menu when composing a page divide the page into two columns (under a section) with the Menus going into the first column and the page content going into the second column.&nbsp; Use the following as a template for all pages.
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>{section:border=false}
+{column:width=15%}
+{include: &lt;enter the name an existing Menu page from the 'Menus' category of pages&gt;}
+{column}
+{column:width=85%}
+&lt;&lt;enter page content here&gt;&gt;
+{column}
+{section}
+</PRE>
+</DIV></DIV></LI>
+	<LI>If there are going to be a set of pages that are likely to be created with the same specific set of menus then a easy way of creating them as per the above template is to go and first create a template page at <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> using the above snippet with approprieate Menu pages substituted.&nbsp; Subsequently when create a page go to <SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>and exercise the &quot;Create page from template&quot; option against the template just created.&nbsp; This will result in a new page with the appropriate sections and menus and the content can be right away filled in.</LI>
+	<LI>If a new set of Menu options are to be created, then create a menu page for this under the 'Menus' category.&nbsp; You can also choose to create a set of menu options reusing the existing Menu pages and 'including' them as required.</LI>
+</OL>
+
+
+<H2><A name="TuscanycwikiDevelopmentGuideline-Namingconvention"></A>Naming convention</H2>
+
+
+<H1><A name="TuscanycwikiDevelopmentGuideline-HowtodeploytoconvertCofluenceNativetoApacheTuscanywebsite"></A>How to deploy to convert Cofluence Native to Apache Tuscany website</H1>
+
+<P>We use an autoexport plugin that automatically converts Confluence's native, and dynamically generated content into a static HTML version that gets exported to the Tuscany website which is located at incubator.apache.org/Tuscany.</P>
+
+<P><IMG src="tuscany-cwiki-development-guideline.data/WebsiteStructure.JPG" align="absmiddle" border="0"></P>
+
+<P><B>Resources</B></P>
+<UL>
+	<LI>Website SVN : <SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/site/site-publish/" title="Visit page outside Confluence" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/site/site-publish/<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI>Exported website : Apache minutaur machine at &#45;&gt; /www/confluence-exports</LI>
+	<LI>Tuscany website : Apache minotaur machine at &#45;&gt; /www/incubator.apache.org/tuscany</LI>
+</UL>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG b/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG
new file mode 100644
index 0000000000..ad5806d0be
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG
diff --git a/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG.jpeg b/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG.jpeg
new file mode 100644
index 0000000000..9d3e7bb4c2
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-website-structure.data/WebsiteStructure.JPG.jpeg
diff --git a/site/trunk/site-publish/tuscany-cwiki-website-structure.html b/site/trunk/site-publish/tuscany-cwiki-website-structure.html
new file mode 100644
index 0000000000..bcaf161a17
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-cwiki-website-structure.html
@@ -0,0 +1,227 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany cwiki & Website Structure</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56590">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany cwiki & Website Structure">Tuscany cwiki &amp; Website Structure</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>The Apache Tuscany Project Website (<A href="http://apache.tuscany.org/" class="external-link" rel="nofollow">http://apache.tuscany.org</A>) content is authored collaboratively by the Tuscany community.&nbsp; The content authoring and publish takes place in the following steps:&#45;</P>
+<UL>
+	<LI>This authoring of content happens on the <B>Tuscany Space</B> of the Confluence based Apache Wiki - <A href="http://cwiki.apache.org/confluence/display/TUSCANY" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/display/TUSCANY</A>.</LI>
+	<LI>Content thus created is exported as html, based on change activity, to the Confluence based export site - <A href="http://cwiki.apache.org/TUSCANY" class="external-link" rel="nofollow">http://cwiki.apache.org/TUSCANY</A>.</LI>
+	<LI>Finally the confluence based html content is synced at regular intervals over to the project's public site <A href="http://incubator.apache.org/tuscany" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany</A>.</LI>
+</UL>
+
+
+<P>There is more information at the end of this page on how content is synchronized from the Wiki to the public site.</P>
+
+<P>The wiki content forms the backbone for the public website content, its structure is documented here to help keep it maintainable.</P>
+
+
+<H2><A name="Tuscanycwiki%26WebsiteStructure-WikiContentAuthoring"></A>Wiki Content Authoring </H2>
+
+<P>The Apache Tuscany project consists of three subprojects - SCA, SDO and DAS each of which is implemented in C+&#43; and Java.&nbsp; These subprojects and their implementations have different documentation and download pages. There is a lot of information that gets shared on the website related to all these projects and it is essential to have a clear structure to help ease the administration, modification and maintenance of the website.  Here is a proposal for how the information on cwiki can be organized with this goal in mind.</P>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Need%20to%20make%20sure%20community%20is%20in%20agreement%20before%20we%20make%20this%20the%20guideline%20-%20so,%20here%20is%20the%20proposal&linkCreation=true&fromPageId=56590" class="createlink">Need to make sure community is in agreement before we make this the guideline &#45; so, here is the proposal</A>.</P>
+
+<H3><A name="Tuscanycwiki%26WebsiteStructure-ContentStructure"></A>Content Structure</H3>
+
+<P>Tuscany cwiki is divided into two <B>logical</B> spaces.</P>
+<OL>
+	<LI><B>Tuscany General space:</B> this is where you will find general Tuscany information, for example community, blogs, documentation and downloads for Tuscany.&nbsp; The root of the pages under this category is 'General Info'.&nbsp; The pages under 'General Info' contains information like : Home, SCA Overview, SDO Overview, DAS Overview. All pages categorized under 'Genral Info' the use the same navigation menu.</LI>
+	<LI><B>Tuscany Subproject space:</B> There is a 'logical' space for each subproject under Tuscany. For example, SCA Java, SDO Java, SCA Native, etc. When under a subproject, you'll only find information about the subproject. Each subproject uses its own menu (which is similar for all subprojects) to navigate through pages for that subproject.  This means navigation remains constant when traversing through pages of a subproject.</LI>
+	<LI><B>Tuscany Menus :</B> Another category of pages are the various 'Menus' that are used.&nbsp; These have been isolated as another sub-tree of content to help in independent organization of Menu options.&nbsp; Under this subtree titled 'Menus' is organized all the sets of Menu options that appear on the Navigation pane on the left.</LI>
+</OL>
+
+
+<H4><A name="Tuscanycwiki%26WebsiteStructure-Wikitreestructure"></A>Wiki tree structure</H4>
+
+<P>Tuscany</P>
+<UL>
+	<LI>Home
+	<UL>
+		<LI>SCA Overview (general)
+		<UL>
+			<LI>SCA Java (subproject)<BR>
+<IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> You will find a similar structure as SCA Java under all other subprojects (SCA Native, SDO Java, DAS Java, ...)
+			<UL>
+				<LI><B>SCA Java Subproject Documentation Menu</B> &#45; All publishable documentations are under this</LI>
+				<LI><B>SCA Java Releases</B> &#45; All release download pages for the subproject are under this</LI>
+				<LI><B>SCA Java Work-in-progress</B> &#45; This is place holder for work in progress. It is recommended that all in progress discussions such as  new release discussion, documentation in progress, etc. be put under here. When a document is ready, it can be moved to the appropriate location in the tree.</LI>
+			</UL>
+			</LI>
+			<LI>SCA Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>SDO Overview (general)
+		<UL>
+			<LI>SDO Java (subproject)</LI>
+			<LI>SDO Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>DAS Overview (general)
+		<UL>
+			<LI>DAS Java (subproject)</LI>
+			<LI>DAS Native (subproject)</LI>
+		</UL>
+		</LI>
+		<LI>General Info (general) - holds information applicable to all projects. For example, Events, documentat/download, community, etc.</LI>
+		<LI>Menus - You will find all menus under here
+		<UL>
+			<LI>General - You will find general menu here</LI>
+			<LI>Subproject Menus - You will find subproject specific menus here</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Therefore, content on the wiki page can logically go into<BR>
+1) General <BR>
+2) Subproject<BR>
+3) Work in progress subtree of the subprjoect</P>
+
+<P><SPAN class="error">&#91;Comment: Can we remove the following section\? It is covered with the above 3 lines&#93;</SPAN></P>
+<H3><A name="Tuscanycwiki%26WebsiteStructure-Wanttoaddcontenttothewebsite%3F"></A>Want to add content to the website?</H3>
+
+<OL>
+	<LI>Before adding any content to the wiki take a look at the content tree structure at <A href="http://cwiki.apache.org/confluence/pages/listpages-dirview.action?key=TUSCANY" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/pages/listpages-dirview.action?key=TUSCANY</A> and identify a node in the tree where the content could best fit.&nbsp; To start with you could identify if the content falls under general or under a specific subproject or under a specific implementation of a subproject.&nbsp; Then under this you could further categorize if the content is to do with 'Technical Documentation' or 'Release' and so on.</LI>
+	<LI>Having decided on a position for the content page in the content tree strucuture ensure that the 'Parent Page' is properly set to the identified position (page).</LI>
+	<LI>If any part of a content is likely to be reused under different contexts and hence in different pages, then abstract such reusable content into a separate page and include it in the various contexts (using the include macro) instead of duplicating the content across contexts.</LI>
+	<LI>Since all pages should have a relevant Navigation Menu when composing a page divide the page into two columns (under a section) with the Menus going into the first column and the page content going into the second column.&nbsp; Use the following as a template for all pages.
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>{section:border=false}
+{column:width=15%}
+{include: &lt;enter the name an existing Menu page from the 'Menus' category of pages&gt;}
+{column}
+{column:width=85%}
+&lt;&lt;enter page content here&gt;&gt;
+{column}
+{section}
+</PRE>
+</DIV></DIV></LI>
+	<LI>If there are going to be a set of pages that are likely to be created with the same specific set of menus then a easy way of creating them as per the above template is to go and first create a template page at <A href="http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY</A> using the above snippet with approprieate Menu pages substituted.&nbsp; Subsequently when create a page go to <A href="http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY" class="external-link" rel="nofollow">http://cwiki.apache.org/confluence/pages/templates/listpagetemplates.action?key=TUSCANY</A>and exercise the &quot;Create page from template&quot; option against the template just created.&nbsp; This will result in a new page with the appropriate sections and menus and the content can be right away filled in.</LI>
+	<LI>If a new set of Menu options are to be created, then create a menu page for this under the 'Menus' category.&nbsp; You can also choose to create a set of menu options reusing the existing Menu pages and 'including' them as required.</LI>
+</OL>
+
+
+<H1><A name="Tuscanycwiki%26WebsiteStructure-HowtodeploytoconvertCofluenceNativetoApacheTuscanywebsite"></A>How to deploy to convert Cofluence Native to Apache Tuscany website</H1>
+
+<P>We use an autoexport plugin that automatically converts Confluence's native, and dynamically generated content into a static HTML version that gets exported to the Tuscany website which is located at apache.tuscany.org.</P>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tuscany-cwiki-website-structure.data/WebsiteStructure.JPG" style="border: 0px solid black"></SPAN></P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Issues with the Wiki auto export to the Tuscany website</B><BR>Problems with the auto export plugin mean not all changes to Wiki pages will get automatically synced to the public website, to resolve this it may be necessary to force a manual refresh. One common situation where this occurs is where a page that is nested within another page with an include is updated but the page using the the include is not updated. Only Confluence administrators can force a manual refresh, how to do this is documented <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg18717.html" class="external-link" rel="nofollow">here</A> and some more about the issue in this <A href="http://apache.markmail.org/message/uxfw5bw6w6l7iskw" class="external-link" rel="nofollow">thread</A>. Note that even with a forced refresh it still takes a short while for the live website server to pick up the changes. If you need a refresh done some current Tuscany Confluence administrators to ask are: Mike Edwards, Ant Elder, Venkata Krishnan, Luciano Resende, or Simon Nash.</TD></TR></TABLE></DIV> 
+
+<P><B>Resources</B></P>
+<UL>
+	<LI>Website SVN : <A href="https://svn.apache.org/repos/asf/incubator/tuscany/site/site-publish/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/site/site-publish/</A></LI>
+	<LI>Exported website : Apache minutaur machine at &#45;&gt; /www/confluence-exports</LI>
+	<LI>Tuscany website : Apache minotaur machine at &#45;&gt; /www/apache.tuscany.org</LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-das-faq.html b/site/trunk/site-publish/tuscany-das-faq.html
new file mode 100644
index 0000000000..0cc78bd8cb
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-das-faq.html
@@ -0,0 +1,127 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany DAS - FAQ</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany DAS - FAQ">Tuscany DAS - FAQ</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany DAS - FAQ</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35051">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35051">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35051">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35051">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35051">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35051">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=svkrish">S Venkatakrishnan</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=lresende@apache.org">Luciano Resende</A> on Feb 07, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=35051&originalId=44002">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="TuscanyDAS-FAQ-TuscanyDASFrequentlyAskedQuestions"></A>Tuscany DAS - Frequently Asked Questions</H3>
+
+<P><B>Is DAS Thread safe ?</B><BR>
+DAS design should support thread safety, but we have done no explicit testing on this area.<BR>
+Initializing a DAS and using across multiple DAS calls should be OK and safe as long as you are using the same config file. I'd recommend initializing the DAS in a sync method tough.</P>
+
+
+<P><B>I'm getting &quot;Feature 'Config' not found.&quot; after migrating my application for after M2 codebase.</B><BR>
+There was a change (see <SPAN class="nobr"><A href="http://issues.apache.org/jira/browse/TUSCANY-899" title="Visit page outside Confluence" rel="nofollow">http://issues.apache.org/jira/browse/TUSCANY-899<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN>). To fix this, changed the attribute &quot;xmlns&quot;'s value of the &quot;config&quot; tag to &quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot;. </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-dashboard.html b/site/trunk/site-publish/tuscany-dashboard.html
new file mode 100644
index 0000000000..11f7b45d93
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-dashboard.html
@@ -0,0 +1,176 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Dashboard</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84484">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Dashboard">Tuscany Dashboard</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<P>This page provides you with links to resources about SCA and Tuscany.</P>
+<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Tuscany Bookmarks</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://issues.apache.org/jira/browse/Tuscany" class="external-link" rel="nofollow">Problem reporting </A><BR>
+<A href="http://cwiki.apache.org/TUSCANYWIKI/home.html" class="external-link" rel="nofollow">Tuscany Public Wiki</A><BR>
+<A href="http://cwiki.apache.org/confluence/display/TUSCANY/" class="external-link" rel="nofollow">Tuscany Website Wiki</A><BR>
+<A href="http://www.mail-archive.com/user@tuscany.apache.org/" class="external-link" rel="nofollow">User Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/" class="external-link" rel="nofollow">User Discussion Archives (incubator)</A><BR>
+<A href="http://www.mail-archive.com/dev@tuscany.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives (incubator)</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>SCA Specifications</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.oasis-opencsa.org/sca" class="external-link" rel="nofollow">OASIS Open CSA </A><BR>
+<A href="http://www.osoa.org/" class="external-link" rel="nofollow">Osoa.org </A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Assembly Model V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Policy Framework V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_TransactionPolicy_V1.0.pdf?version=1" class="external-link" rel="nofollow">SCA Transaction Policy V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JavaAnnotationsAndAPIs_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Java Common Annotations and APIs V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JavaComponentImplementation_V100.pdf?version=1" class="external-link" rel="nofollow">SCA Java Component Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_SpringComponentImplementationSpecification-V100.pdf?version=1" class="external-link" rel="nofollow">SCA Spring Component Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforBPEL_V100.pdf?version=1" class="external-link" rel="nofollow">SCA BPEL Client and Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModel_Cpp-V100.pdf?version=2" class="external-link" rel="nofollow">SCA C+&#43; Client and Implementation V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_WebServiceBinding_V100.pdf?version=2" class="external-link" rel="nofollow">SCA Web Services Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" class="external-link" rel="nofollow">SCA JMS Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_EJBSessionBeanBinding_V100.pdf?version=1" class="external-link" rel="nofollow">SCA EJB Session Bean Binding V1.00</A><BR>
+<A href="http://www.osoa.org/download/attachments/35/SCA_JCABindings_V1_00.pdf?version=2" class="external-link" rel="nofollow">SCA JCA Binding V1.00</A><BR>
+<A href="sca.html" title="SCA规范中文版"><B>Chinese Translation</B></A></P>
+</DIV></DIV></TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://www.devx.com/IBMSCA/Article/39358" class="external-link" rel="nofollow"><B>Your First SCA application</B> </A><BR>
+<A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" class="external-link" rel="nofollow">Introduction to SCA by David Chappel</A><BR>
+<A href="http://www.osoa.org/download/attachments/250/SCA_OASIS_Tutorial_part1.pdf" class="external-link" rel="nofollow">Open CSA SCA Tutorial</A><BR>
+<A href="http://www.infoq.com/articles/setting-out-for-sca" class="external-link" rel="nofollow">Henning Blohm - Setting Out for SCA</A><BR>
+<A href="http://jdj.sys-con.com/read/325183.htm" class="external-link" rel="nofollow">What is SCA</A><BR>
+<A href="http://soa.sys-con.com/read/458183.htm" class="external-link" rel="nofollow">Building SOA with Apache Tuscany</A><BR>
+<A href="http://osoa.org/download/attachments/250/Power_Combination_SCA_Spring_OSGi.pdf?version=3%2F" class="external-link" rel="nofollow">SCA and OSGI and Spring</A><BR>
+<A href="http://events.oasis-open.org/home/sites/events.oasis-open.org.home/files/SCA-ESB-v4.ppt" class="external-link" rel="nofollow">SCA and ESBs</A><BR>
+<A href="http://osoa.org/display/Main/Relationship%20between%20SCA%20and%20BPEL" class="external-link" rel="nofollow">SCA &amp; BPEL </A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SCA%20Videos" class="external-link" rel="nofollow"><FONT color="green"><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"> SCA Video Series </FONT></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu"><B>Your first SCA application with Tuscany</B></A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">User Documentations </A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Developer Documentations </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java" class="external-link" rel="nofollow">Latest Source Code</A><BR>
+<A href="http://tuscany.apache.org/tuscany-downloads-documentations.html" class="external-link" rel="nofollow">Latest Release</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Learning to work with Open Source</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="http://cwiki.apache.org/confluence/display/TUSCANY/Working%20In%20Open%20Source" class="external-link" rel="nofollow">How to Work In Open Source Series </A><BR>
+<A href="http://www.catb.org/~esr/faqs/smart-questions.html" class="external-link" rel="nofollow">How to ask questions </A><BR>
+<A href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html" class="external-link" rel="nofollow">How to report bugs effectively </A></P>
+</DIV></DIV></TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>PlanetApache.org blog</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<DIV class="error"><SPAN class="error">Unknown macro: {rss}</SPAN> </DIV>
+</DIV></DIV> </TD>
+</TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg
new file mode 100644
index 0000000000..019549ebbc
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg.jpeg
new file mode 100644
index 0000000000..2cbe8d7823
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_components.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg
new file mode 100644
index 0000000000..2311e95814
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg.jpeg
new file mode 100644
index 0000000000..6626d3e7f2
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_graph.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg
new file mode 100644
index 0000000000..d498e9f2e4
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg.jpeg
new file mode 100644
index 0000000000..fa6f4033f3
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_operation.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg
new file mode 100644
index 0000000000..8deb33d6e8
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg.jpeg
new file mode 100644
index 0000000000..d40919bb1f
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_property.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg
new file mode 100644
index 0000000000..5d8a2f8b37
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg.jpeg
new file mode 100644
index 0000000000..9638da705e
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_reference.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg
new file mode 100644
index 0000000000..22d1b61810
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg.jpeg
new file mode 100644
index 0000000000..82893e8ac1
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_scenario.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg
new file mode 100644
index 0000000000..af6cbe778d
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg.jpeg
new file mode 100644
index 0000000000..208355fccb
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/databinding_service.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg b/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg
new file mode 100644
index 0000000000..fee37cc216
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg.jpeg b/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg.jpeg
new file mode 100644
index 0000000000..0e93227b87
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.data/wrapper_transformation.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscany-databinding-guide.html b/site/trunk/site-publish/tuscany-databinding-guide.html
new file mode 100644
index 0000000000..7aefffeb45
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-databinding-guide.html
@@ -0,0 +1,754 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Databinding Guide</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52118">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Databinding Guide">Tuscany Databinding Guide</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="TuscanyDatabindingGuide-TuscanyDatabindingFramework"></A>Tuscany Databinding Framework</H1>
+
+
+<H2><A name="TuscanyDatabindingGuide-Overview"></A>Overview</H2>
+
+<P>In an SOA environment, business functions can be implemented in various technologies such as Java, C++, Scripting, BPEL, Spring, OSGi and XQuery. The business data can also be represented in different formats such as DOM, JAXB, SDO, AXIOM or POJO. Business services often communicate with each other on the network using various protocols such as RMI, RMI/IIOP, SOAP/HTTP, JMS, JCA, FEED and JSON-RPC. The service collaborations are achieved by data exchanges between service components. The SCA programming model defines an extension model for interface, implementation and binding types. The extensibility is essential to SOA as we need to be able to leverage and integrate all kinds of technologies. On the data side, we also need the extensibility for different formats so that we can flow any data type that is supported by both the client and the provider. </P>
+
+<P>Business data are represented in different ways even they are for the same infoset. For example, we can model a Customer business object as:</P>
+<UL>
+	<LI>JavaBeans</LI>
+	<LI>SDO</LI>
+	<LI>JAXB</LI>
+	<LI>XMLBeans</LI>
+	<LI>DOM</LI>
+</UL>
+
+
+<P>And different protocol implementation stacks support different data representations. For example, in the Web Service domain, we have:</P>
+<UL>
+	<LI>Axis1 uses DOM</LI>
+	<LI>Axis2 uses AXIOM</LI>
+	<LI>JAX-WS uses JAXB</LI>
+</UL>
+
+
+<P>Implementation technologies may impose requirements on the data too. For example, </P>
+<UL>
+	<LI>Apache ODE BPEL engine only consumes/produces data using DOM</LI>
+	<LI>SAXON XQuery engine consumes/produces data using NodeInfo</LI>
+	<LI>DAS implementation requires SDO</LI>
+	<LI>Script Implementation uses AXIOM</LI>
+</UL>
+
+
+<P>Application developers should have the freedom to choose their preferred data representation and components with compatible data should be able to interoperate without the intervention of the business logic. With the ability to attach data transformation mediations to wires, this actually becomes a requirement to support any data type that can be mapped from client to provider and back again.</P>
+
+<P>In any interchange there are just two things that are defined: the format of data that will be supplied by the client and the format of data that will be consumed by (delivered to) the provider. Neither client or provider needs to be aware of the format of data on the other end or of what gyrations the fabric went though in order to make the connection. As part of making the connection, it is the fabric's job to make the connection as efficient as possible, factoring in the semantic meaning of the data, the policies that need to be applied, and what the different containers support.</P>
+
+<P>Each SCA implementation and binding type just needs to declare which data formats it can support for each endpoint it manages. The wiring framework need to know about these formats and about what transformations can be engaged in the invocation pipeline.</P>
+
+<P>For example, the Axis2 transport may declare that it can support Axiom and StAX for a certain port and the Java container may declare that it can only handle SDOs for an implementation that expects to be passed a DataObject. The wiring framework can resolve this by adding a StAX-&gt;SDO transform into the pipeline.</P>
+
+<P>The limitation here is whether a transformation can be constructed to match the formats on either end. If one exists then great, but as the number increases then developing n-squared transforms becomes impractical. A better approach would be to pick the most common formats and require bindings and containers to support those at a minimum, with other point-to-point transforms being added as warranted. </P>
+
+<H2><A name="TuscanyDatabindingGuide-UsageScenarios"></A>Usage Scenarios</H2>
+
+<P>Let's look at a simple scenario. The business function is to report all accounts for a given customer. The data exchanged between the client and server side will be Customer and AccountReport. Let's assume that the business objects are modeled using XML schema and the client side will talk to the server side over Web Service using Axis2. The client program decides to use SDO to represent the business data while the server side prefers to use JAXB.</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_scenario.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>In this case, there are three data formats involved: SDO, JAXB and AXIOM (The AXIS2 XML Infoset) and all of them come from the same model in the following XSD type definitions:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;xsd:complexType name=<SPAN class="code-quote">&quot;Customer&quot;</SPAN>&gt;
+        &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;id&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;firstName&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;lastName&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+        &lt;/xsd:sequence&gt;
+    &lt;/xsd:complexType&gt;
+
+    &lt;xsd:complexType name=<SPAN class="code-quote">&quot;AccountReport&quot;</SPAN>&gt;
+        &lt;xsd:sequence&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;id&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;type&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;balance&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">double</SPAN>&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+        &lt;/xsd:sequence&gt;
+    &lt;/xsd:complexType&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Client java component:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SDO_AccountReport getAccountReport(SDO_Customer customer); <SPAN class="code-comment">// SDO_Customer and SDO_AccountReport are generated SDO interfaces</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>AXIS2 Web Service Stack:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+OMElement getAccountReport(OMElement customer); <SPAN class="code-comment">// pseudo method, the operation is defined in WSDL</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>Service java component:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+JAXB_AccountReport getAccountReport(JAXB_Customer customer); <SPAN class="code-comment">// JAXB_Customer and JAXB_AccountReport are generated JAXB classes</SPAN>
+</PRE>
+</DIV></DIV>
+
+
+<H2><A name="TuscanyDatabindingGuide-What%27sadatabinding%3F"></A>What's a databinding?</H2>
+
+<P>A databinding represents a specific data format in the Tuscany runtime. Each databinding has a unique name which identifies the data format.</P>
+
+<P>Typical databindings</P>
+<UL>
+	<LI>XML/Java databinding frameworks
+	<UL>
+		<LI>SDO</LI>
+		<LI>JAXB</LI>
+		<LI>XMLBeans</LI>
+		<LI>Castor</LI>
+		<LI>AXIOM</LI>
+		<LI>FastInfoset</LI>
+	</UL>
+	</LI>
+	<LI>XML Parsing Technologies
+	<UL>
+		<LI>SAX (InputSource, ContentHandler)</LI>
+		<LI>DOM (Node)</LI>
+		<LI>StAX (XMLStreamReader/XMLStreamWriter/XMLEventReader/XMLEventWriter)</LI>
+	</UL>
+	</LI>
+	<LI>I/O
+	<UL>
+		<LI>InputStream/OutputStream</LI>
+		<LI>Reader/Writer</LI>
+		<LI>byte[] or String</LI>
+	</UL>
+	</LI>
+	<LI>Other
+	<UL>
+		<LI>JavaBeans</LI>
+		<LI>Simple Java Types</LI>
+		<LI>JSON</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Overloaded data fomats</B><BR>Please note the I/O kind of databindings are further defined by the type of the content. For example, the InputStream can feed XML stream, fastinfoset, or something else. The context of a String can be a XML document, a JSON string or a CSV.</TD></TR></TABLE></DIV>
+
+
+<H2><A name="TuscanyDatabindingGuide-What%27satransformer%3F"></A>What's a transformer?</H2>
+
+<P>A transformer is the data conversation logic that transforms data from one format to another format. For example, a transformer can convert the DOM Node into a SDO dataobject. A transformer will be registered as an edge connecting the source databinding to the target databinding. The weight of a transformer represents the cost<BR>
+of the transformation.</P>
+
+<P>The following is an incomplete list of transformers that we ship in 1.0-incubating release.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+org.apache.tuscany.sca.databinding.sdo.DataObject2String;source=commonj.sdo.DataObject,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.sdo.DataObject2XMLStreamReader;source=commonj.sdo.DataObject,target=javax.xml.stream.XMLStreamReader,weight=10
+org.apache.tuscany.sca.databinding.sdo.XMLDocument2String;source=commonj.sdo.helper.XMLDocument,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.sdo.String2DataObject;source=java.lang.<SPAN class="code-object">String</SPAN>,target=commonj.sdo.DataObject,weight=50
+org.apache.tuscany.sca.databinding.sdo.XMLDocument2XMLStreamReader;source=commonj.sdo.helper.XMLDocument,target=javax.xml.stream.XMLStreamReader,weight=10
+org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2DataObject;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.DataObject,weight=15
+org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2XMLDocument;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.helper.XMLDocument,weight=15
+org.apache.tuscany.sca.databinding.sdo.DataObject2Node;source=commonj.sdo.DataObject,target=org.w3c.dom.Node,weight=40
+org.apache.tuscany.sca.databinding.sdo.Node2DataObject;source=org.w3c.dom.Node,target=commonj.sdo.DataObject,weight=40
+
+org.apache.tuscany.sca.databinding.xml.InputSource2Node;source=org.xml.sax.InputSource,target=org.w3c.dom.Node,weight=40
+org.apache.tuscany.sca.databinding.xml.InputStream2Node;source=java.io.InputStream,target=org.w3c.dom.Node,weight=40
+org.apache.tuscany.sca.databinding.javabeans.DOMNode2JavaBeanTransformer;source=org.w3c.dom.Node,target=java.lang.<SPAN class="code-object">Object</SPAN>,weight=10000
+org.apache.tuscany.sca.databinding.xml.Node2String;source=org.w3c.dom.Node,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.xml.Node2XMLStreamReader;source=org.w3c.dom.Node,target=javax.xml.stream.XMLStreamReader,weight=40
+org.apache.tuscany.sca.databinding.javabeans.JavaBean2DOMNodeTransformer;source=java.lang.<SPAN class="code-object">Object</SPAN>,target=org.w3c.dom.Node,weight=10000
+org.apache.tuscany.sca.databinding.xml.Reader2Node;source=java.io.Reader,target=org.w3c.dom.Node,weight=40
+org.apache.tuscany.sca.databinding.xml.SAX2DOMPipe;source=org.xml.sax.ContentHandler,target=org.w3c.dom.Node,weight=30
+org.apache.tuscany.sca.databinding.xml.StreamDataPipe;source=java.io.OutputStream,target=java.io.InputStream,weight=50
+org.apache.tuscany.sca.databinding.xml.String2Node;source=java.lang.<SPAN class="code-object">String</SPAN>,target=org.w3c.dom.Node,weight=50
+org.apache.tuscany.sca.databinding.xml.String2XMLStreamReader;source=java.lang.<SPAN class="code-object">String</SPAN>,target=javax.xml.stream.XMLStreamReader,weight=50
+org.apache.tuscany.sca.databinding.xml.Writer2ReaderDataPipe;source=java.io.Writer,target=java.io.Reader,weight=50
+org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node;source=javax.xml.stream.XMLStreamReader,target=org.w3c.dom.Node,weight=40
+org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;source=javax.xml.stream.XMLStreamReader,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.xml.Node2SimpleJavaType;source=org.w3c.dom.Node,target=java:simpleType,weight=10000
+org.apache.tuscany.sca.databinding.xml.SimpleJavaType2Node;source=java:simpleType,target=org.w3c.dom.Node,weight=10000
+
+org.apache.tuscany.sca.databinding.axiom.Object2OMElement;source=java:simpleType,target=org.apache.axiom.om.OMElement,weight=10000
+org.apache.tuscany.sca.databinding.axiom.OMElement2Object;source=org.apache.axiom.om.OMElement,target=java:simpleType,weight=10000
+org.apache.tuscany.sca.databinding.axiom.OMElement2String;source=org.apache.axiom.om.OMElement,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.axiom.OMElement2XMLStreamReader;source=org.apache.axiom.om.OMElement,target=javax.xml.stream.XMLStreamReader,weight=10
+org.apache.tuscany.sca.databinding.axiom.String2OMElement;source=java.lang.<SPAN class="code-object">String</SPAN>,target=org.apache.axiom.om.OMElement,weight=40
+org.apache.tuscany.sca.databinding.axiom.XMLStreamReader2OMElement;source=javax.xml.stream.XMLStreamReader,target=org.apache.axiom.om.OMElement,weight=10
+
+org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;source=javax.xml.bind.JAXBElement,target=org.w3c.dom.Node,weight=30
+org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;source=org.w3c.dom.Node,target=javax.xml.bind.JAXBElement,weight=30
+org.apache.tuscany.sca.databinding.jaxb.Reader2JAXB;source=java.io.Reader,target=javax.xml.bind.JAXBElement,weight=30
+org.apache.tuscany.sca.databinding.jaxb.XMLStreamReader2JAXB;source=javax.xml.stream.XMLStreamReader,target=javax.xml.bind.JAXBElement,weight=10
+
+org.apache.tuscany.sca.databinding.saxon.Node2NodeInfoTransformer;source=org.w3c.dom.Node,target=net.sf.saxon.om.NodeInfo,weight=10
+org.apache.tuscany.sca.databinding.saxon.NodeInfo2NodeTransformer;source=net.sf.saxon.om.NodeInfo,target=org.w3c.dom.Node,weight=10
+org.apache.tuscany.sca.databinding.saxon.Object2ValueTransformer;source=java.lang.<SPAN class="code-object">Object</SPAN>,target=net.sf.saxon.value.Value,weight=10000
+org.apache.tuscany.sca.databinding.saxon.Value2ObjectTransformer;source=net.sf.saxon.value.Value,target=java.lang.<SPAN class="code-object">Object</SPAN>,weight=10000
+org.apache.tuscany.sca.databinding.saxon.SimpleType2ValueTransformer;source=java:simpleType,target=net.sf.saxon.value.Value,weight=10000
+org.apache.tuscany.sca.databinding.saxon.Value2SimpleTypeTransformer;source=net.sf.saxon.value.Value,target=java:simpleType,weight=10000
+org.apache.tuscany.sca.databinding.saxon.NodeInfo2DataObjectTransformer;source=net.sf.saxon.om.NodeInfo,target=commonj.sdo.DataObject,weight=20
+org.apache.tuscany.sca.databinding.saxon.DataObject2NodeInfoTransformer;source=commonj.sdo.DataObject,target=net.sf.saxon.om.NodeInfo,weight=10
+
+org.apache.tuscany.sca.databinding.sdo2om.DataObject2OMElement;source=commonj.sdo.DataObject,target=org.apache.axiom.om.OMElement,weight=1000
+org.apache.tuscany.sca.databinding.sdo2om.XMLDocument2OMElement;source=commonj.sdo.helper.XMLDocument,target=org.apache.axiom.om.OMElement,weight=1000
+
+</PRE>
+</DIV></DIV>
+
+<H2><A name="TuscanyDatabindingGuide-Thedatatransformationgraph"></A>The data transformation graph</H2>
+
+<P>In Tuscany, we register transformers to form a graph as folllows:</P>
+
+<UL>
+	<LI>The data transformation capabilities for various databindings can be nicely modeled as a weighted, directed graph with the following rules. (Illustrated in the attached diagram).</LI>
+	<LI>Each databinding is mapped to a vertex.</LI>
+	<LI>If databinding A can be transformed to databinding B, then an edge will be added from vertex A to vertex B.</LI>
+	<LI>The weight of the edge is the cost of the transformation from the source to the sink.</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_graph.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P>With the transformer graph, we support not only point-to-point transformations but also multiple-hop transformations. This approach greatly reduces the number of transformers required and makes it possible to transform data without a direct transformation logic. It's very common that some databindings will be supported as the intermediaries, for example, the XML Sting, DOM Node and StAX XMLStreamReader are very populate in the XML world. </P>
+
+<P>The algorithm to calculate the transformation path</P>
+<UL>
+	<LI>In the data interceptor on the wire, if we find out that the data needs to be transformed from databinding A to databinding E. Then we can apply Dijkstra's Shortest Path Algorithm to the graph and figure the most performed path. It can be A&#45;<DEL>&gt;E, or A</DEL><DEL>&gt;C</DEL>&#45;&gt;E depending on the weights. If no path can be found, then the data cannot be mediated.</LI>
+</UL>
+
+
+
+<H2><A name="TuscanyDatabindingGuide-What%27adatatype%3F"></A>What' a data type?</H2>
+
+<P>DataType is the decription of the data. It contains three pieces: the data binding, the physical type and the logical type. The runtime's main job is to connect user components together so typically the actual type used would be determined by the user code that implements the source or target. The databinding framework's role here is to convert from the type used by the source to the type used by the target. The internal types used by the runtime should not influence this - which is an essential separation to maintain given the components and the wire connecting them need to work on different runtimes (implemented in different languages).</P>
+
+<P>Where runtime types do matter is in the conversion between some serialized form and an in-memory representation and the two places where that occurs are in the configuration properties and in the binding implementations. To handle configuration properties (with the XPath requirement) we use DOM in the Java runtime. Each transport binding also tends to deserialize using a specific technology - for example, AXIOM for Axis2, JAXB for JAX-WS, Serializable for RMI and so the databinding framework is used to convert between the form generated by the binding and the form used by the component.</P>
+
+<P>The logical type represents the data type the user thinks is flowing across a wire. This could be a Java type, a XML type, a CORBA type, whatever depending on the /logical/ service contract defined in the assembly.</P>
+
+<P>The physical type is the actual representation of that type that is flowed by the runtime. In the Java runtime this will always be a Java type (i.e. some subclass of Object). In some cases it will be the same as the logical type - e.g. when a Java component calls another Java component over a local wire using a Java interface then both logical and physical types will be the same. In many cases though they will be different - for example, if the service contract was WSDL then the logical type would be the XML type used by the WSDL.</P>
+
+<P>Within the runtime the same logical type may have different physical forms. For example, the same XML document could be represented physically as a DOM, a StAX stream, an SDO, a JAXB object, or an AXIOM stream. The framework supports conversion between these different physical forms.</P>
+
+<P>1. A component (A) consumes a service provided by another component (B). The implementation of A prefers SDO while the implementation of B prefers JAXB.</P>
+
+<P>In the SCA term, A is wired to B using a reference.</P>
+<UL>
+	<LI>Data is represented by an interface which is independent of the databinding</LI>
+	<LI>Data is represented by an interface or class which is databinding-specific (either generated or dynamic)</LI>
+</UL>
+
+
+<P>2. A component (A) consumes a web service using axis2. Axis2 engine expects to handle AXIOM objects.</P>
+
+<P>3. A component is exposed as a service over a transport/protocol.</P>
+
+<P>Where runtime types do matter is in the conversion between some serialized form and an in-memory representation and the two places where that occurs are in the configuration properties and in the binding implementations. To handle configuration properties (with the XPath requirement) we use DOM in the Java runtime; I believe the C+&#43; runtime uses SDO. Each transport binding also tends to deserialize using a specific technology - for example, AXIOM for Axis2, JAXB for JAX-WS, Serializable for RMI and so the databinding framework is used to convert between the form generated by the binding and the form used by the component.</P>
+
+<P>interfaces for services and references are the contracts for SCA assembly.</P>
+
+
+<H2><A name="TuscanyDatabindingGuide-Introspectionofjavainterfacesfordatatypes"></A>Introspection of java interfaces for data types</H2>
+
+<P>The DataBindingJavaInterfaceProcessor is responsible to introspect the java interfaces to figure out the databindings of the parameters and return types. It delegates to all of the databinding implementations which will set the databinding and logical type if such data type is recognized by the databinding. This introspection process can handle most of the cases as the java types usually have some patterns, for example, implementing a know interface.</P>
+
+
+<H2><A name="TuscanyDatabindingGuide-DatamediationintheSCAassembly"></A>Data mediation in the SCA assembly</H2>
+
+<P>DataBindingRuntimeWireProcessor is responsible to insert a DataTransformationInteceptor into the invovcation chains if the data transformation is required between the source and target operations. Depending on the invocation patterns, it uses the effective interface contracts to determine if transformation should be applied.</P>
+
+<P>Typically, there are three cases:</P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TD class="confluenceTd"><B>Interaction</B></TD>
+<TD class="confluenceTd"><B>Effective Source Interface contract</B></TD>
+<TD class="confluenceTd"><B>Effective Target Interface Contract</B></TD>
+</TR>
+<TR>
+<TD class="confluenceTd">A SCA component talks to another SCA component over a remotable interface using binding.sca</TD>
+<TD class="confluenceTd">The interface contract of the reference defined by the source component type</TD>
+<TD class="confluenceTd">The interface contract of the service defined by the target component type</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">A SCA component talks to an external service using binding.x</TD>
+<TD class="confluenceTd">The interface contract of the reference defined by the source component type</TD>
+<TD class="confluenceTd">The interface contract imposed by the binding protocol</TD>
+</TR>
+<TR>
+<TD class="confluenceTd">The request from binding.y is routed to a component service</TD>
+<TD class="confluenceTd">The interface contract imposed by binding.y</TD>
+<TD class="confluenceTd">The interface contract of the service defined by the target component type</TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H3><A name="TuscanyDatabindingGuide-DatatransformationbetweenSCAcomponents"></A>Data transformation between SCA components</H3>
+
+<UL>
+	<LI>Data transformation can be performed on wire for remotable interfaces</LI>
+	<LI>Data transformation can handle interfaces defined using different IDLs such as Java or WSDL.</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_components.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="TuscanyDatabindingGuide-Datatransformationforservicebindings"></A>Data transformation for service bindings</H3>
+
+<UL>
+	<LI>&lt;interface.xxx&gt; defines the outbound service contract (SC2) which can be wired to a target component, reference or service (SC3).</LI>
+	<LI>&lt;binding.xxx&gt; can optionally hint a service contract for the inbound data from the binding protocol layer. <SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_service.jpg" style="border: 0px solid black"></SPAN></LI>
+</UL>
+
+
+<H3><A name="TuscanyDatabindingGuide-Datatransformationforreferencebindings"></A>Data transformation for reference bindings</H3>
+
+<UL>
+	<LI>&lt;interface.xxx&gt; defines the inbound service contract (SC2) which can be wired from a source component, reference or service (SC1).</LI>
+	<LI>&lt;binding.xxx&gt; can optionally hint a service contract (SC3) for the outbound data to the binding protocol layer.</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_reference.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="TuscanyDatabindingGuide-Datatransformationforpropertyvalues"></A>Data transformation for property values</H3>
+
+<UL>
+	<LI>Property values are loaded from SCDLs as DOM documents</LI>
+	<LI>The DOM Document can be transformed into a java object under a databinding, such as SDO, JAXB so that the component implementation code can work with the databinding directly instead of DOM.</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_property.jpg" style="border: 0px solid black"></SPAN></P>
+
+
+<H2><A name="TuscanyDatabindingGuide-Specialdatabindingsandtransformerstodealwithoperationleveltransformations"></A>Special databindings and transformers to deal with operation-level transformations</H2>
+<UL>
+	<LI>Input2InputTransformer: Transform the input data from the source operation to the input data expected by the target operation</LI>
+	<LI>Output2OutputTransformer: Transform the output data from the target operation to the output data expected by the source operation</LI>
+	<LI>Exception2ExceptionTransformer: Transform the fault data from the target operation to the fault data expected by the source operaion</LI>
+</UL>
+
+
+<P>Deal with interfaces defined using different IDLs </P>
+<UL>
+	<LI>SCA allows the interfaces to be defined using various IDLs, for example, java interface or WSDL portType</LI>
+	<LI>IDLs may have different ways to represent the input/output/fault data</LI>
+	<LI>The databinding framework is designed to support the transformation across IDLs</LI>
+</UL>
+
+
+<UL>
+	<LI>Some special databindings are internally used for this purpose:
+	<UL>
+		<LI>idl:input The input data format for an operation</LI>
+		<LI>idl:output: The output data format for an operation</LI>
+		<LI>idl:fault: The fault data format for an operation</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<UL>
+	<LI>SimpleTypeMapper: convert data between XSD simple types (by the databinding, for example, OMElement with an OMText child) and java objects</LI>
+</UL>
+
+
+
+<H3><A name="TuscanyDatabindingGuide-Operationleveltransformations"></A>Operation-level transformations</H3>
+
+<P>The signature of an operation is modeled as follows:</P>
+
+<UL>
+	<LI>InputType: The data type for the input. The logical type is a list of data types that represent the list of parameters</LI>
+	<LI>OutputType: The data type for the output. The logical type is the data type that represents the return value</LI>
+	<LI>FaultTypes: The list of data types for all the faults</LI>
+</UL>
+
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/databinding_operation.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H3><A name="TuscanyDatabindingGuide-WrapperstyleWSDLoperation"></A>Wrapper style WSDL operation</H3>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;wsdl:definitions name=<SPAN class="code-quote">&quot;AccountService&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/AccountService/&quot;</SPAN>
+</SPAN>    xmlns:wsdl=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//schemas.xmlsoap.org/wsdl/&quot;</SPAN> xmlns:tns=<SPAN class="code-quote">&quot;http://www.example.org/AccountService/&quot;</SPAN>
+</SPAN>    xmlns:xsd=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema&quot;</SPAN>&gt;
+</SPAN>    &lt;wsdl:types&gt;
+        &lt;xsd:schema xmlns:xsd=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.w3.org/2001/XMLSchema&quot;</SPAN>
+</SPAN>            targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.example.org/AccountService/&quot;</SPAN>&gt;
+</SPAN>
+            &lt;xsd:complexType name=<SPAN class="code-quote">&quot;Customer&quot;</SPAN>&gt;
+                &lt;xsd:sequence&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;id&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;firstName&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;lastName&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                &lt;/xsd:sequence&gt;
+            &lt;/xsd:complexType&gt;
+
+            &lt;xsd:complexType name=<SPAN class="code-quote">&quot;AccountReport&quot;</SPAN>&gt;
+                &lt;xsd:sequence&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;id&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;type&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:string&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;xsd:element name=<SPAN class="code-quote">&quot;balance&quot;</SPAN> type=<SPAN class="code-quote">&quot;xsd:<SPAN class="code-object">double</SPAN>&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                &lt;/xsd:sequence&gt;
+            &lt;/xsd:complexType&gt;
+
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;getAccountReport&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;customer&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:Customer&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+
+            &lt;xsd:element name=<SPAN class="code-quote">&quot;getAccountReportResponse&quot;</SPAN>&gt;
+                &lt;xsd:complexType&gt;
+                    &lt;xsd:sequence&gt;
+                        &lt;xsd:element name=<SPAN class="code-quote">&quot;report&quot;</SPAN> type=<SPAN class="code-quote">&quot;tns:AccountReport&quot;</SPAN>&gt;&lt;/xsd:element&gt;
+                    &lt;/xsd:sequence&gt;
+                &lt;/xsd:complexType&gt;
+            &lt;/xsd:element&gt;
+        &lt;/xsd:schema&gt;
+    &lt;/wsdl:types&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;getAccountReportRequest&quot;</SPAN>&gt;
+        &lt;wsdl:part name=<SPAN class="code-quote">&quot;parameters&quot;</SPAN> element=<SPAN class="code-quote">&quot;tns:getAccountReport&quot;</SPAN>&gt;&lt;/wsdl:part&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:message name=<SPAN class="code-quote">&quot;getAccountReportResponse&quot;</SPAN>&gt;
+        &lt;wsdl:part name=<SPAN class="code-quote">&quot;<SPAN class="code-keyword">return</SPAN>&quot;</SPAN> element=<SPAN class="code-quote">&quot;tns:getAccountReportResponse&quot;</SPAN>&gt;&lt;/wsdl:part&gt;
+    &lt;/wsdl:message&gt;
+    &lt;wsdl:portType name=<SPAN class="code-quote">&quot;AccountService&quot;</SPAN>&gt;
+        &lt;wsdl:operation name=<SPAN class="code-quote">&quot;getAccountReport&quot;</SPAN>&gt;
+            &lt;wsdl:input message=<SPAN class="code-quote">&quot;tns:getAccountReportRequest&quot;</SPAN>&gt;&lt;/wsdl:input&gt;
+            &lt;wsdl:output message=<SPAN class="code-quote">&quot;tns:getAccountReportResponse&quot;</SPAN>&gt;&lt;/wsdl:output&gt;
+        &lt;/wsdl:operation&gt;
+    &lt;/wsdl:portType&gt;
+&lt;/wsdl:definition
+</PRE>
+</DIV></DIV>
+
+<P>The WrapperHandler provides wrapper style WSDL wrapping/unwrapping support</P>
+
+<P><SPAN class="image-wrap" style="display: block; text-align: center"><IMG src="tuscany-databinding-guide.data/wrapper_transformation.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyDatabindingGuide-Extendthedatabindingframework"></A>Extend the databinding framework</H2>
+
+
+<H3><A name="TuscanyDatabindingGuide-Whatcanbeextended%3F"></A>What can be extended?</H3>
+
+<P>The Tuscany databinding framework can be extended in two ways:</P>
+
+<P>1. Add more databinding providers to&nbsp;support new formats to represent business data</P>
+
+<P>2. Add more transformers to&nbsp;facilitate the data exchange accross databindings&nbsp;</P>
+
+<H3><A name="TuscanyDatabindingGuide-Howtocontributeanewdatabindingortransformer%3F"></A>How to contribute a new databinding or transformer?</H3>
+
+<P>Databindings and transformers can be plugged into Tuscany runtime following the Tuscany extensibility story. It can be achieved in the following steps:</P>
+
+<P>Add a new databinding:<BR>
+1. Provide a java class which implements the DataBinding interface. You can subclass the BaseDataBinding.<BR>
+2. Register your databindings against the DataBindingExtensionPoint.</P>
+
+<P>Add a new transformer:<BR>
+1. Provide a java class which implements the Transformer interface. You can subclass the BasePullTransformer or BasePushTransformer.<BR>
+2. Register your transformers against the TransformerExtensionPoint.</P>
+
+<H4><A name="TuscanyDatabindingGuide-TheDataBindingSPI%3A"></A>The DataBinding SPI:</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * DataBinding represents a data representation, <SPAN class="code-keyword">for</SPAN> example, SDO, JAXB and AXIOM
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> DataBinding {
+    /**
+     * A special databinding <SPAN class="code-keyword">for</SPAN> input message of an operation
+     */
+    <SPAN class="code-object">String</SPAN> IDL_INPUT = <SPAN class="code-quote">&quot;idl:input&quot;</SPAN>;
+    /**
+     * A special databinding <SPAN class="code-keyword">for</SPAN> output message of an operation
+     */
+    <SPAN class="code-object">String</SPAN> IDL_OUTPUT = <SPAN class="code-quote">&quot;idl:output&quot;</SPAN>;
+    /**
+     * A special databinding <SPAN class="code-keyword">for</SPAN> fault message of an operation
+     */
+    <SPAN class="code-object">String</SPAN> IDL_FAULT = <SPAN class="code-quote">&quot;idl:fault&quot;</SPAN>;
+    /**
+     * The name of a databinding should be <SPAN class="code-keyword">case</SPAN>-insensitive and unique
+     * 
+     * @<SPAN class="code-keyword">return</SPAN> The name of the databinding
+     */
+    <SPAN class="code-object">String</SPAN> getName();
+    
+    /**
+     * Get the aliases <SPAN class="code-keyword">for</SPAN> the databinding
+     * 
+     * @<SPAN class="code-keyword">return</SPAN> An array of aliases
+     */
+    <SPAN class="code-object">String</SPAN>[] getAliases();
+
+    /**
+     * Introspect and populate information to a DataType model
+     * 
+     * @param dataType The data type to be introspected
+     * @param annotations The java annotations
+     * @<SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">true</SPAN> <SPAN class="code-keyword">if</SPAN> the databinding has recognized the given data type
+     */
+    <SPAN class="code-object">boolean</SPAN> introspect(DataType dataType, Annotation[] annotations);
+
+    /**
+     * Introspect the data to figure out the corresponding data type
+     * 
+     * @param value The object to be checked
+     * @<SPAN class="code-keyword">return</SPAN> The DataType or <SPAN class="code-keyword">null</SPAN> <SPAN class="code-keyword">if</SPAN> the java type is not supported by <SPAN class="code-keyword">this</SPAN> databinding
+     */
+    DataType introspect(<SPAN class="code-object">Object</SPAN> value);
+
+    /**
+     * Provide a WrapperHandler <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">this</SPAN> databinding
+     * @<SPAN class="code-keyword">return</SPAN> A wrapper handler which can handle wrapping/wrapping <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">this</SPAN> databinding
+     */
+    WrapperHandler getWrapperHandler();
+
+    /**
+     * Make a copy of the object <SPAN class="code-keyword">for</SPAN> <SPAN class="code-quote">&quot;pass-by-value&quot;</SPAN> semantics
+     * @param source object to copy 
+     * @<SPAN class="code-keyword">return</SPAN> copy of the object passed in as argument
+     */
+    <SPAN class="code-object">Object</SPAN> copy(<SPAN class="code-object">Object</SPAN> object);
+    
+    /**
+     * Get the type mapper <SPAN class="code-keyword">for</SPAN> simple types
+     * @<SPAN class="code-keyword">return</SPAN> The databinding-specific simple type mapper
+     */
+    SimpleTypeMapper getSimpleTypeMapper();
+    
+    /**
+     * Get the handler that can handle exceptions/faults in the
+     * databinding-specific way
+     * 
+     * @<SPAN class="code-keyword">return</SPAN> An instance of the exception handler
+     */
+    ExceptionHandler getExceptionHandler();
+}
+</PRE>
+</DIV></DIV>
+
+<UL>
+	<LI>Support introspection of java types</LI>
+	<LI>Support data copying for pass-by-value</LI>
+	<LI>Support warpping/unwrapping for WSDL wrapper style</LI>
+	<LI>Support exception handling</LI>
+</UL>
+
+
+<H4><A name="TuscanyDatabindingGuide-TransformerSPI"></A>Transformer SPI</H4>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+/**
+ * A transformer provides the data transformation from source type to target type. The cost of the transformation is
+ * modeled as weight.
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Transformer {
+    /**
+     * Get the source type that <SPAN class="code-keyword">this</SPAN> transformer transforms data from. The type is used as the key when the transformer
+     * is registered with TransformerRegistry.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> A key indentifying the source type
+     */
+    <SPAN class="code-object">String</SPAN> getSourceDataBinding();
+
+    /**
+     * Get the target type that <SPAN class="code-keyword">this</SPAN> transformer transforms data into. The type is used as the key when the transformer
+     * is registered with TransformerRegistry.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> A key indentifying the target type
+     */
+    <SPAN class="code-object">String</SPAN> getTargetDataBinding();
+
+    /**
+     * Get the cost of the transformation. The weight can be used to choose the most efficient path <SPAN class="code-keyword">if</SPAN> there are more
+     * than one available from the source to the target.
+     *
+     * @<SPAN class="code-keyword">return</SPAN> An integer representing the cost of the transformation
+     */
+    <SPAN class="code-object">int</SPAN> getWeight();
+}
+
+
+/**
+ * PullTransformer transforms data from one binding format to the other one which can be directly consumed
+ * 
+ * @param &lt;S&gt; The source data type
+ * @param &lt;R&gt; the target data type
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> PullTransformer&lt;S, R&gt; <SPAN class="code-keyword">extends</SPAN> Transformer {
+    /**
+     * Transform source data into the result type.
+     * 
+     * @param source The source data
+     * @param context The context <SPAN class="code-keyword">for</SPAN> the transformation
+     * @<SPAN class="code-keyword">return</SPAN> The transformed result
+     */
+    R transform(S source, TransformationContext context);
+}
+</PRE>
+</DIV></DIV>
+
+<H4><A name="TuscanyDatabindingGuide-Registerdatabindingsandtransformers"></A>Register databindings and transformers</H4>
+
+<P>To regsiter one or more databindings, you need to add entries to a plain text file named as META-INF/services/org.apache.tuscany.sca.databinding.DataBinding. This service provider file needs to be on the classpath when Tuscany is bootstrapped.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+# implementation classes <SPAN class="code-keyword">for</SPAN> the databindings
+org.apache.tuscany.sca.databinding.axiom.AxiomDataBinding;type=org.apache.axiom.om.OMElement,name=axiom
+</PRE>
+</DIV></DIV>
+
+<P>The syntax is: &lt;implementation_class_name&gt;;type=&lt;databinding_id&gt;,name=&lt;databinding_alias&gt;</P>
+
+<P>To register one or more transformers, you need to add entries to a plain text file named as META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer. This service provider file needs to be on the classpath when Tuscany is bootstrapped.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+# Implementation classes <SPAN class="code-keyword">for</SPAN> the transformers
+org.apache.tuscany.sca.databinding.axiom.Object2OMElement;source=java:simpleType,target=org.apache.axiom.om.OMElement,weight=10000
+org.apache.tuscany.sca.databinding.axiom.OMElement2Object;source=org.apache.axiom.om.OMElement,target=java:simpleType,weight=10000
+org.apache.tuscany.sca.databinding.axiom.OMElement2String;source=org.apache.axiom.om.OMElement,target=java.lang.<SPAN class="code-object">String</SPAN>,weight=40
+org.apache.tuscany.sca.databinding.axiom.OMElement2XMLStreamReader;source=org.apache.axiom.om.OMElement,target=javax.xml.stream.XMLStreamReader,weight=10
+org.apache.tuscany.sca.databinding.axiom.String2OMElement;source=java.lang.<SPAN class="code-object">String</SPAN>,target=org.apache.axiom.om.OMElement,weight=40
+org.apache.tuscany.sca.databinding.axiom.XMLStreamReader2OMElement;source=javax.xml.stream.XMLStreamReader,target=org.apache.axiom.om.OMElement,weight=10
+</PRE>
+</DIV></DIV>
+
+<P>The syntax is: &lt;implementation_class_name&gt;;source=&lt;source_databinding_id&gt;,target=&lt;target_databinding_id&gt;,weight=&lt;cost_of_the_transformation&gt;</P>
+
+<H1><A name="TuscanyDatabindingGuide-TODOList"></A>TODO List</H1>
+
+<UL>
+	<LI>Support Collection or Array data types</LI>
+	<LI>Better support interface/operation level databinding mappings</LI>
+	<LI>Support databinding for java types which can be used for multiple datatypes, for example, InputStream or String can be used to represent various formats</LI>
+	<LI>Better support exception/fault</LI>
+	<LI>Support application data based introspection of operations</LI>
+</UL>
+
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-downloads-documentations.html b/site/trunk/site-publish/tuscany-downloads-documentations.html
new file mode 100644
index 0000000000..8058479d02
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-downloads-documentations.html
@@ -0,0 +1,264 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Downloads & Documentations</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=55199">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Downloads & Documentations">Tuscany Downloads &amp; Documentations</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="TuscanyDownloads%26Documentations-TuscanyReleaseDownloadsandDocumentation%28Stablereleases%29"></A>Tuscany Release Downloads and Documentation (Stable releases)</H2>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Project Release Download </TH>
+<TH class="confluenceTh"> Documentation </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-1x-releases.html" title="SCA Java 1.x Releases"><B>SCA Java 1.x</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Infrastructure implemented in Java for developing/running SCA applications</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-travel-sample-1x-releases.html" title="SCA Java Travel Sample 1.x Releases"><B>SCA Java Travel Sample 1.x</B></A></B> </TD>
+<TD class="confluenceTd"> See README file </TD>
+<TD class="confluenceTd"> Sample SCA Java application for Tuscany SCA Java 1.x</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases"><B>SCA Java 2.x</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Infrastructure implemented in Java for developing/running SCA applications</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="sca-native-releases.html" title="SCA Native Releases"><B>SCA Native</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="sca-native-documentation-menu.html" title="SCA Native Documentation Menu">Latest guides here</A></TD>
+<TD class="confluenceTd"> Infrastructure implemented in C+&#43; for developing/running SCA applications </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SDO%20Java%20Releases" class="external-link" rel="nofollow"><B>SDO Java</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Implements SDO in Java </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="http://cwiki.apache.org/confluence/display/TUSCANY/SDO%20Downloads" class="external-link" rel="nofollow"><B>SDO C+&#43;</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="sdo-c-documentation-menu.html" title="SDO C++ Documentation Menu">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Implements SDO in C+&#43; </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B><A href="http://cwiki.apache.org/confluence/display/TUSCANY/DAS%20Java%20Releases" class="external-link" rel="nofollow"><B>DAS</B></A></B> </TD>
+<TD class="confluenceTd"> <A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">Latest guides here</A> </TD>
+<TD class="confluenceTd"> Provides different DAS implementations for different data source types </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+
+<H2><A name="TuscanyDownloads%26Documentations-TuscanyNightlyBuildDownloads%28Builtagainsttrunk%2Clatestcode%29"></A>Tuscany Nightly Build Downloads (Built against trunk, latest code)</H2>
+
+<P>These nightly builds are listed here as an aid for Tuscany developers testing the latest code, they ARE NOT INTENDED FOR USE BY USERS. If you need a recent change thats not yet available in an official release then please do pester us to do a release. </P>
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh"> Nightly Build Download </TH>
+<TH class="confluenceTh"> Build Status Log </TH>
+<TH class="confluenceTh"> Win32 bin </TH>
+<TH class="confluenceTh"> Win32 src </TH>
+<TH class="confluenceTh"> Linux bin </TH>
+<TH class="confluenceTh"> Linux src </TH>
+<TH class="confluenceTh"> Description </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SCA Java 1.x</B> </TD>
+<TD class="confluenceTd"> <A href="http://hudson.zones.apache.org/hudson/job/Tuscany-1x/lastBuild/testReport/" class="external-link" rel="nofollow">Status Log</A> </TD>
+<TD class="confluenceTd">&ndash;</TD>
+<TD class="confluenceTd">&ndash;</TD>
+<TD class="confluenceTd"> &ndash;</TD>
+<TD class="confluenceTd">&ndash;</TD>
+<TD class="confluenceTd"> Latest nightly build for Java SCA 1.x </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SCA Java 2.x</B> </TD>
+<TD class="confluenceTd"> <A href="https://hudson.apache.org/hudson/job/Tuscany-2x-deploy/lastBuild/" class="external-link" rel="nofollow">Status Log</A> </TD>
+<TD class="confluenceTd"><A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT.zip" class="external-link" rel="nofollow">sca-all .zip</A></TD>
+<TD class="confluenceTd"><A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT-src.zip" class="external-link" rel="nofollow">sca-all-src .zip</A></TD>
+<TD class="confluenceTd"><A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT.tar.gz" class="external-link" rel="nofollow">sca-all .tar.gz</A></TD>
+<TD class="confluenceTd"><A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sca/tuscany-distribution-all/2.0-SNAPSHOT/tuscany-distribution-all-2.0-SNAPSHOT-src.gz" class="external-link" rel="nofollow">sca-all-src .tar.gz</A></TD>
+<TD class="confluenceTd"> Latest nightly build for Java SCA 2.x </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>SDO Java</B> </TD>
+<TD class="confluenceTd"> <A href="http://hudson.zones.apache.org/hudson/job/Tuscany-SDO/lastBuild/console" class="external-link" rel="nofollow">Status Log</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sdo/tuscany-sdo-distribution/1.2-SNAPSHOT/tuscany-sdo-distribution-1.2-SNAPSHOT.zip" class="external-link" rel="nofollow">Win32 bin</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sdo/tuscany-sdo-distribution/1.2-SNAPSHOT/tuscany-sdo-distribution-1.2-SNAPSHOT-src.zip" class="external-link" rel="nofollow">Win32 src</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sdo/tuscany-sdo-distribution/1.2-SNAPSHOT/tuscany-sdo-distribution-1.2-SNAPSHOT.gz" class="external-link" rel="nofollow">Linux bin</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/sdo/tuscany-sdo-distribution/1.2-SNAPSHOT/tuscany-sdo-distribution-1.2-SNAPSHOT-src.gz" class="external-link" rel="nofollow">Linux src</A></TD>
+<TD class="confluenceTd">  Latest Nightly build for SDO Java </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <B>DAS Java</B> </TD>
+<TD class="confluenceTd"> <A href="http://hudson.zones.apache.org/hudson/job/Tuscany-DAS/lastBuild/console" class="external-link" rel="nofollow">Status Log</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/das/distribution/tuscany-das-bin/1.0-SNAPSHOT/tuscany-das-bin-1.0-SNAPSHOT-bin.zip" class="external-link" rel="nofollow">Win32 bin</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/das/distribution/tuscany-das-src/1.0-SNAPSHOT/tuscany-das-src-1.0-SNAPSHOT-src.zip" class="external-link" rel="nofollow">Win32 src</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/das/distribution/tuscany-das-bin/1.0-SNAPSHOT/tuscany-das-bin-1.0-SNAPSHOT-bin.gz" class="external-link" rel="nofollow">Linux bin</A> </TD>
+<TD class="confluenceTd"> <A href="https://repository.apache.org/content/repositories/snapshots/org/apache/tuscany/das/distribution/tuscany-das-src/1.0-SNAPSHOT/tuscany-das-src-1.0-SNAPSHOT-src.gz" class="external-link" rel="nofollow">Linux src</A> </TD>
+<TD class="confluenceTd"> Latest Nightly build for DAS Java </TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="TuscanyDownloads%26Documentations-Documentation"></A>Documentation</H2>
+
+<P><A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Java SCA Documentation Menu</A><BR>
+<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="tuscany-cwiki-website-structure.html" title="Tuscany cwiki & Website Structure">Tuscany cwiki &amp; Website Structure</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-downloads.html b/site/trunk/site-publish/tuscany-downloads.html
new file mode 100644
index 0000000000..f9dd213e52
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-downloads.html
@@ -0,0 +1,132 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Downloads : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55199">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Downloads">Tuscany Downloads</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="" title="Tuscany Downloads">Downloads</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyDownloads-TuscanyDownloadsandDocumentation"></A>Tuscany Downloads and Documentation</H1>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Project Download</TH>
+<TH class="confluenceTh"> Documentation</TH>
+<TH class="confluenceTh">Description</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="sca-java-releases.html" title="SCA Java Releases">SCA Java</A></B></TD>
+<TD class="confluenceTd"><A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Latest guides here</A></TD>
+<TD class="confluenceTd">Infrastructure implemented in Java to run SCA applications</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="sca-downloads.html" title="Visit page outside Confluence" rel="nofollow">SCA Native<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"> Infrastructure implemented in C++ to run SCA applications</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="sdo-downloads.html" title="Visit page outside Confluence" rel="nofollow">SDO Java<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"> Implements SDO in Java</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="sdo-downloads.html" title="Visit page outside Confluence" rel="nofollow">SDO C++<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"> Implements SDO in C++</TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="das-downloads.html" title="Visit page outside Confluence" rel="nofollow">DAS<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"> Provides different DAS implementations for different data source types </TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-downloads2-java-sca.html b/site/trunk/site-publish/tuscany-downloads2-java-sca.html
new file mode 100644
index 0000000000..4c3849cfc3
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-downloads2-java-sca.html
@@ -0,0 +1,168 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Downloads2 Java SCA : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55411">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Downloads2 Java SCA">Tuscany Downloads2 Java SCA</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Whats New" class="createlink">What's New?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyDownloads2JavaSCA-TuscanyDownloads"></A>Tuscany Downloads</H1>
+
+<P>These are the latest available releases of the Apache Tuscany sub-projects</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Project</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="" title="Tuscany Downloads2 Java SCA">Java SCA 0.90 (June 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" title="Visit page outside Confluence" rel="nofollow">Changes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="tuscany-downloads2-java-sdo.html" title="Tuscany Downloads2 Java SDO">Java SDO 1.0 Beta1 (May 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating-beta1/sdo/distribution/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20DAS&linkCreation=true&fromPageId=55411" title="Create Page: Tuscany Downloads2 Java DAS" class="createlink">Java DAS M2 (Nov 2006)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/das/1.0-incubator-M2/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20Native&linkCreation=true&fromPageId=55411" title="Create Page: Tuscany Downloads2 C++ Native" class="createlink">C++ Native M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20SDO&linkCreation=true&fromPageId=55411" title="Create Page: Tuscany Downloads2 C++ SDO" class="createlink">C++ SDO M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/cpp-sdo-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+
+<P>Previous releases are avaiable <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/downloads.html" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H1><A name="TuscanyDownloads2JavaSCA-JavaSCA0.90%28June2007%29Distributions"></A>Java SCA 0.90 (June 2007) Distributions</H1>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Windows</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-0.90-incubating.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.zip.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.zip.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-0.90-incubating-src.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.zip.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.zip.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TH class="confluenceTh">*nix</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-0.90-incubating.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sca-0.90-incubating-src.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/~antelder/tuscany/0.90-rc2/apache-tuscany-sca-0.90-incubating-src.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-downloads2-java-sdo.html b/site/trunk/site-publish/tuscany-downloads2-java-sdo.html
new file mode 100644
index 0000000000..e2b3dbb409
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-downloads2-java-sdo.html
@@ -0,0 +1,158 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Downloads2 Java SDO : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55415">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Downloads2 Java SDO">Tuscany Downloads2 Java SDO</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Whats New" class="createlink">What's New?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyDownloads2JavaSDO-TuscanyDownloads"></A>Tuscany Downloads</H1>
+
+<P>These are the latest available releases of the Apache Tuscany sub-projects</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Project</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="tuscany-downloads2-java-sca.html" title="Tuscany Downloads2 Java SCA">Java SCA 0.90 (June 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" title="Visit page outside Confluence" rel="nofollow">Changes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="" title="Tuscany Downloads2 Java SDO">Java SDO 1.0 Beta1 (May 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating-beta1/sdo/distribution/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20DAS&linkCreation=true&fromPageId=55415" title="Create Page: Tuscany Downloads2 Java DAS" class="createlink">Java DAS M2 (Nov 2006)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/das/1.0-incubator-M2/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20Native&linkCreation=true&fromPageId=55415" title="Create Page: Tuscany Downloads2 C++ Native" class="createlink">C++ Native M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20SDO&linkCreation=true&fromPageId=55415" title="Create Page: Tuscany Downloads2 C++ SDO" class="createlink">C++ SDO M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/cpp-sdo-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+
+<P>Previous releases are avaiable <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/downloads.html" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H1><A name="TuscanyDownloads2JavaSDO-JavaSDO1.0Beta1%28May2007%29Distributions"></A>Java SDO 1.0 Beta1 (May 2007) Distributions</H1>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Windows</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating-beta1-bin.zip<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.zip.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TH class="confluenceTh">*nix</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz" title="Visit page outside Confluence" rel="nofollow">apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.asc" title="Visit page outside Confluence" rel="nofollow">asc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="http://people.apache.org/dist/incubator/tuscany/java/sdo/1.0-incubating-beta1/bin/apache-tuscany-sdo-1.0-incubating-beta1-bin.tar.gz.md5" title="Visit page outside Confluence" rel="nofollow">md5<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-downloads2.html b/site/trunk/site-publish/tuscany-downloads2.html
new file mode 100644
index 0000000000..fe774058b4
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-downloads2.html
@@ -0,0 +1,133 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Downloads2 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55409">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Downloads2">Tuscany Downloads2</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Whats New" class="createlink">What's New?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-development-guide.html" title="SCA Java Extension Development Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyDownloads2-TuscanyDownloads"></A>Tuscany Downloads</H1>
+
+<P>These are the latest available releases of the Apache Tuscany sub-projects</P>
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Project</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="tuscany-downloads2-java-sca.html" title="Tuscany Downloads2 Java SCA">Java SCA 0.90 (June 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" title="Visit page outside Confluence" rel="nofollow">Changes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><A href="tuscany-downloads2-java-sdo.html" title="Tuscany Downloads2 Java SDO">Java SDO 1.0 Beta1 (May 2007)</A></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating-beta1/sdo/distribution/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20DAS&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 Java DAS" class="createlink">Java DAS M2 (Nov 2006)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/das/1.0-incubator-M2/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20Native&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 C++ Native" class="createlink">C++ Native M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20SDO&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 C++ SDO" class="createlink">C++ SDO M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/cpp-sdo-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+
+<P>Previous releases are avaiable <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/downloads.html" title="Visit page outside Confluence" rel="nofollow">here<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-maven-archetypes.html b/site/trunk/site-publish/tuscany-maven-archetypes.html
new file mode 100644
index 0000000000..b17f710a1b
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-maven-archetypes.html
@@ -0,0 +1,323 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Tuscany Maven Archetypes : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329557">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Maven Archetypes">Tuscany Maven Archetypes</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://bit.ly/1DTAYA" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyMavenArchetypes-TuscanyMavenArchetypes"></A>Tuscany Maven Archetypes</H1>
+
+<P>Tuscany provides some <A href="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html" rel="nofollow">Maven archetypes </A> to make it easy to get going using Tuscany. Maven archetypes provide a simple way to create a project thats configured with exactly what you need to develop your application. You don't need to download, install, or pre-configure Tuscany or your environment, thats all done for you automatically, all you need pre-installed is Maven and Java.</P>
+
+<P>To give it a try run the following command:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn archetype:generate -DarchetypeCatalog=http:<SPAN class="code-comment">//tuscany.apache.org</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>That will list out the available archetypes and ask you to choose which one you want:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Choose archetype:
+1: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-jar (Create an SCA contribution JAR)
+</SPAN>2: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart (Create a Tuscany SCA and JSP project)
+</SPAN>3: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-stripes (Create a Tuscany SCA and Stripes Web Framework project)
+</SPAN>4: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-jsf (Create a Tuscany SCA and JSF project)
+</SPAN>Choose a number:  (1/2/3/4):
+</PRE>
+</DIV></DIV>
+
+<P>You are then prompted to answer several questions about the project such as the Maven group and artifact IDs, Java package names etc. Some of those will show default values before the prompt so you can just hit enter to take the default. Thats it, and then the Maven project is created in a folder in the current directory named after the artifactid you entered.</P>
+
+<P>The following shows the console session for creating an SCA contribution JAR:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Choose a number:  (1/2/3/4): 4
+Define value <SPAN class="code-keyword">for</SPAN> groupId: : org.myco.sca.test
+Define value <SPAN class="code-keyword">for</SPAN> artifactId: : scatest
+Define value <SPAN class="code-keyword">for</SPAN> version:  1.0-SNAPSHOT: :
+Define value <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">package</SPAN>:  org.myco.sca.test: :
+Confirm properties configuration:
+groupId: org.myco.sca.test
+artifactId: scatest
+version: 1.0-SNAPSHOT
+<SPAN class="code-keyword">package</SPAN>: org.myco.sca.test
+ Y: :
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 1 minute 15 seconds
+[INFO] Finished at: Tue Mar 31 15:08:45 BST 2009
+[INFO] Final Memory: 8M/14M
+[INFO] ------------------------------------------------------------------------
+</PRE>
+</DIV></DIV>
+
+<P>That will create a Maven project in a folder named scatest with the following directory structure and files:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+scatest\pom.xml
+scatest\src\main\java\org\myco\sca\test\HelloworldImpl.java
+scatest\src\main\java\org\myco\sca\test\HelloworldService.java
+scatest\src\main\resources\helloworld.composite
+scatest\src\main\resources\META-INF\sca-contribution.xml
+</PRE>
+</DIV></DIV>
+
+<P>When using one of the archetypes which create webapp projects the pom.xml is configured with the maven Jetty plugin so you can run the webapp right away without needing to install the WAR file into an appserver by using the command &quot;mvn jetty:run&quot;. The following shows an examaple of this using the tuscany-quickstart archetype:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&gt; mvn archetype:generate -DarchetypeCatalog=http:<SPAN class="code-comment">//tuscany.apache.org
+</SPAN>[INFO] Scanning <SPAN class="code-keyword">for</SPAN> projects...
+. . .
+Choose archetype:
+1: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-jar (Create an SCA JAR contribution project)
+</SPAN>2: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-contribution-zip (Create an SCA ZIP contribution project)
+</SPAN>3: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart (Create a simple SCA webapp project)
+</SPAN>4: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-jsf (Create a Webapp using SCA and JSF)
+</SPAN>5: http:<SPAN class="code-comment">//tuscany.apache.org -&gt; tuscany-quickstart-stripes (Create a Webapp using SCA and the Stripes Web Framework)
+</SPAN>Choose a number:  (1/2/3/4/5): 3
+Define value <SPAN class="code-keyword">for</SPAN> groupId: : mygroup
+Define value <SPAN class="code-keyword">for</SPAN> artifactId: : mytest
+Define value <SPAN class="code-keyword">for</SPAN> version:  1.0-SNAPSHOT: :
+Define value <SPAN class="code-keyword">for</SPAN> <SPAN class="code-keyword">package</SPAN>:  mygroup: :
+Confirm properties configuration:
+groupId: mygroup
+artifactId: mytest
+version: 1.0-SNAPSHOT
+<SPAN class="code-keyword">package</SPAN>: mygroup
+ Y: :
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+
+&gt; cd mytest
+&gt; mvn jetty:run
+. . .
+[INFO] Started Jetty Server
+</PRE>
+</DIV></DIV> 
+
+<P>The webapp runs at the context path of the artifact name on port 8080 so on a web browser go to <A href="http://localhost:8080/mytest/" rel="nofollow">http://localhost:8080/mytest/</A> and you should see a page showing:</P>
+
+<P>Calling HelloworldService sayHello(&quot;world&quot;) returns:<BR>
+Hello world </P>
+
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-portal.html b/site/trunk/site-publish/tuscany-portal.html
new file mode 100644
index 0000000000..609f6b99b1
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-portal.html
@@ -0,0 +1,285 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Portal : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=84484">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Portal">Tuscany Portal</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Tuscany Bookmarks</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/" title="Visit page outside Confluence" rel="nofollow">Tuscany Website<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java" title="Visit page outside Confluence" rel="nofollow">Tuscany Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="home.html" title="Visit page outside Confluence" rel="nofollow">Tuscany Wiki (Website)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="../TUSCANYWIKI/home.html" title="Visit page outside Confluence" rel="nofollow">Tuscany Wiki<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.oasis-opencsa.org/sca" title="Visit page outside Confluence" rel="nofollow">Open CSA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/" title="Visit page outside Confluence" rel="nofollow">Osoa.org<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Tuscany Release Downloads</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">SCA Java 1.2-incubating <EM>(Apr, 2008)</EM></A><BR>
+<A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating">SDO Java 1.1-incubating</A> <EM><A href="sdo-java-11-incubating.html" title="SDO Java 1.1-incubating"><EM>(Apr 2008)</EM></A></EM><BR>
+<A href="das-java-releases.html" title="DAS Java Releases">DAS Java 1.0-incubating-beta2_(Oct, 2007)_</A><BR>
+<A href="sca-native-incubator-m3.html" title="SCA Native Incubator-M3">SCA Native Incubator-M3 <EM>(May, 2007)</EM></A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>SCA Specifications</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Assembly Model V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_Policy_Framework_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Policy Framework V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_TransactionPolicy_V1.0.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Transaction Policy V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_JavaAnnotationsAndAPIs_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Java Common Annotations and APIs V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_JavaComponentImplementation_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Java Component Implementation V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_SpringComponentImplementationSpecification-V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA Spring Component Implementation V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforBPEL_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA BPEL Client and Implementation V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModel_Cpp-V100.pdf?version=2" title="Visit page outside Confluence" rel="nofollow">SCA C++ Client and Implementation V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_WebServiceBinding_V100.pdf?version=2" title="Visit page outside Confluence" rel="nofollow">SCA Web Services Binding V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_JMSBinding_V100.pdf?version=2" title="Visit page outside Confluence" rel="nofollow">SCA JMS Binding V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_EJBSessionBeanBinding_V100.pdf?version=1" title="Visit page outside Confluence" rel="nofollow">SCA EJB Session Bean Binding V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.osoa.org/download/attachments/35/SCA_JCABindings_V1_00.pdf?version=2" title="Visit page outside Confluence" rel="nofollow">SCA JCA Binding V1.00<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+
+
+
+
+
+</TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Working with Open source</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://producingoss.com/" title="Visit page outside Confluence" rel="nofollow">Producing Open Source Software<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.catb.org/~esr/faqs/smart-questions.html" title="Visit page outside Confluence" rel="nofollow">How to Ask Questions the Smart Way<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.cubiclemuses.com/cm/files/open_source_works.pdf" title="Visit page outside Confluence" rel="nofollow">Make Open Source work for you<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://us.apachecon.com/us2007/downloads/H2MPIP.pdf" title="Visit page outside Confluence" rel="nofollow">How to make patches<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Learning SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://www.davidchappell.com/articles/Introducing_SCA.pdf" title="Visit page outside Confluence" rel="nofollow">David Chappel's Introduction to SCA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.infoq.com/articles/setting-out-for-sca" title="Visit page outside Confluence" rel="nofollow">Henning Blohm - Setting Out for SCA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://jdj.sys-con.com/read/325183.htm" title="Visit page outside Confluence" rel="nofollow">What is SCA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://soa.sys-con.com/read/458183.htm" title="Visit page outside Confluence" rel="nofollow">Building SOA with Apache Tuscany<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://www.regdeveloper.co.uk/2007/03/20/creating_services_sca/" title="Visit page outside Confluence" rel="nofollow">Taking your first steps with SCA<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+
+<TD class="confluenceTd" valign="top" width="30%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Apache Tuscany</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P>
+    <TABLE width="100%" cellspacing="0" class="grid">
+                <TR>
+            <TH style="text-align: left;">
+                                <A href="http://feeds.feedburner.com/apache-tuscany"><IMG src="http://cwiki.apache.org/confluence/images/icons/rss.gif" border="0" height="15" width="27" align="right"></A>
+                <A href="http://apache-tuscany.blogspot.com/">Apache Tuscany</A>
+                <SPAN class="smalltext">(rss_2.0)</SPAN>
+                            </TH>
+        </TR>
+                                            <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2008/04/apache-tuscany-sca-java-11-released.html">Apache Tuscany SCA Java 1.2 released</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 27, 2008 20:20</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2008/02/tuscany-sca-support-for-relax-ws.html">Tuscany SCA support for Relax-ws interfaces</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Feb 12, 2008 03:23</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2008/02/apache-tuscany-sca-11-release-announced.html">Apache Tuscany SCA 1.1 Release Announced</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Feb 06, 2008 17:06</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2007/11/series-of-webinar-on-sca-by-oasis-in.html">Series of Webinar on SCA by OASIS in December</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Nov 26, 2007 15:27</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://apache-tuscany.blogspot.com/2007/11/upcoming-sca-skills-shortage.html">Upcoming SCA skills shortage</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Nov 16, 2007 09:04</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                        </TABLE>
+</P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>PlanetApache.org</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P>
+    <TABLE width="100%" cellspacing="0" class="grid">
+                <TR>
+            <TH style="text-align: left;">
+                                <A href="http://www.planetapache.org/rss20.xml"><IMG src="http://cwiki.apache.org/confluence/images/icons/rss.gif" border="0" height="15" width="27" align="right"></A>
+                <A href="http://www.planetapache.org/">Planet Apache</A>
+                <SPAN class="smalltext">(rss_2.0)</SPAN>
+                            </TH>
+        </TR>
+                                            <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://bluxte.net/blog/2008-04/29-54-29.html">Sylvain Wallez: Speeding up mobile web applications</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 15:54</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://www.sauria.com/blog/2008/04/29/erlang-cgi/">Ted Leung: Erlang == CGI?</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 14:12</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://feeds.feedburner.com/~r/links/ZvUZ/~3/280288542/">Ben Laurie: Fun With FreeBSD and gmirror</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 12:49</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://rollerweblogger.org/roller/entry/social_software_at_javaone">Dave Johnson: Social Software at JavaOne 2008</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 12:00</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://feeds.feedburner.com/~r/trustin/~3/280248684/long-technical-irc-conversation.html">Trustin Lee: Long technical IRC conversation</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 11:21</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </TABLE>
+</P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>Planet WebServices.org</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P>
+    <TABLE width="100%" cellspacing="0" class="grid">
+                <TR>
+            <TH style="text-align: left;">
+                                <A href="http://ws.apache.org/blog/rss20.xml"><IMG src="http://cwiki.apache.org/confluence/images/icons/rss.gif" border="0" height="15" width="27" align="right"></A>
+                <A href="http://www.planetapache.org/">Planet Webservices</A>
+                <SPAN class="smalltext">(rss_2.0)</SPAN>
+                            </TH>
+        </TR>
+                                            <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://azeez78.blogspot.com/2008/04/gold-award-for-wso2-wsas-data-services.html">Afkham Azeez: Gold Award for WSO2 WSAS - Data Services</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 11:28</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://ajith-ranabahu.blogspot.com/2008/04/ubuntu-804-first-impression.html">Ajith Ranabahu: Ubuntu 8.04 - First Impression</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 29, 2008 01:10</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://www.intertwingly.net/blog/2008/04/28/Sleep-Quirks-Debugged">Sam Ruby: Sleep Quirks &mdash; Debugged!</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 28, 2008 19:17</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://sanjiva.weerawarana.org/2008/04/upgraded-to-ubuntu-804.html">Sanjiva Weerawarana: Upgraded to Ubuntu 8.04</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 28, 2008 16:53</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                <TR>
+                    <TD valign="top">
+                                                    <B><A href="http://sanjiva.weerawarana.org/2008/04/shell-scripts-as-web-services.html">Sanjiva Weerawarana: Shell scripts as Web services??</A></B>
+                        
+                                                                                    <SPAN class="smalltext-blue">(<I>Apr 28, 2008 16:50</I>)</SPAN>
+                                                                                                </TD>
+                </TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </TABLE>
+</P>
+</DIV></DIV>
+
+</TD>
+</TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+    
+        <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sca-databinding-faq.html b/site/trunk/site-publish/tuscany-sca-databinding-faq.html
new file mode 100644
index 0000000000..9c2489b29b
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-databinding-faq.html
@@ -0,0 +1,130 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany SCA - DataBinding - FAQ : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=43356">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java Subproject</A>&nbsp;&gt;&nbsp;<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">Tuscany SCA Java - FAQ</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA - DataBinding - FAQ">Tuscany SCA - DataBinding - FAQ</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java-subproject.html" title="SCA Java Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A><BR>
+<A href="sca-releases.html" title="SCA Releases">SCA Releases</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="TuscanySCA-DataBinding-FAQ-SCADataBindingFAQs"></A>SCA DataBinding FAQs</H2>
+
+<OL>
+	<LI><B>What is he difference between Logical Type and Physical Type?  From the comments in DataType.java, logical type is used by the assembly, physical type is used by the runtime, and for Tuscany Java the physical type is always a Java Type</B><BR>
+     The logical type represents the data type the user thinks is flowing across a wire. This could be a Java type, a XML type, a CORBA type, whatever depending on the /logical/ service contract defined in the assembly.<BR>
+     The physical type is the actual representation of that type that is flowed by the runtime. In the Java runtime this will always be a Java type (i.e. some subclass of Object). In some cases it will be the same as the logical type - e.g. when a Java component calls another Java component over a local wire using a Java interface then both logical and physical types will be the same. In many cases though they will be different - for example, if the service contract was WSDL then the logical type would be the XML type used by the WSDL.<BR>
+     Within the runtime the same logical type may have different physical forms. For example, the same XML document could be represented physically as a DOM, a StAX stream, an SDO, a JAXB object, or an AXIOM stream. The framework supports conversion between these different physical forms. <BLOCKQUOTE></BLOCKQUOTE></LI>
+	<LI><B>What is the role of a data mediator interceptor? Can you cite an example of how mediation works say for a component A with reference R that references a service S in component B.?</B><BR>
+     The interceptor gets added by the connector. A's outbound wire and B's inbound wire describe the datatypes their implementations can support. When the wire ends are connected the connector adds the interceptor if mediation is needed.<BR>
+     One job of a transport binding is to convert an in-memory physical representation to a suitable set of bits on the network (aka serialization and deserialization). Rather than reinvent the different transports we reuse existing implementations such as Axis2 or RMI. As such we need to convert the physical representation on our internal wire with that used by the transport. So, for example, Axis2 only understands AXIOM so in a reference we need to convert the user's physical representation to AXIOM and in a service we need to convert the AXIOM generated by the transport into the form the user's implementation requires. The steps could be described as follows:
+	<OL>
+		<LI>A calls reference R with physical Java object X(java)</LI>
+		<LI>X is placed on R's outbound wire</LI>
+		<LI>data mediation converts X(java) to AXIOM object X(axiom)</LI>
+		<LI>X(axiom) is placed on inbound wire for the Axis2 binding</LI>
+		<LI>Axis2 binding serializes X(axiom) onto the network as XML</LI>
+		<LI>Axis2 binding on the target deserializes the XML from the network to X(axiom)</LI>
+		<LI>X(axiom) is placed on the outbound wire from the Axis2 binding</LI>
+		<LI>data mediation converts X(axiom) to X(java) as needed by the target component</LI>
+		<LI>X(java) is placed on B's inbound wire</LI>
+		<LI>the target instance for B is invoked passing in X(java)<BR>
+. An important thing to note here is that from the fabric's perspective we are dealing with two physical wires: the wire on the client connecting the source component A to the outbound Axis2 transport and the wire on the server connecting the inbound Axis2 transport to the target component B.<BR>
+From a global perspective there is one logical wire from A to B but because A and B are located on two different runtimes that logical wire gets split into two physical wires A-&gt;net and net-&gt;B.</LI>
+	</OL>
+	</LI>
+</OL>
+
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sca-faq.html b/site/trunk/site-publish/tuscany-sca-faq.html
new file mode 100644
index 0000000000..bf02b0232a
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-faq.html
@@ -0,0 +1,136 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany SCA - FAQ</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA - FAQ">Tuscany SCA - FAQ</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany SCA - FAQ</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35040">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35040">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35040">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35040">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35040">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35040">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=svkrish">S Venkatakrishnan</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=jmarino">jmarino</A> on Mar 02, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=35040&originalId=43355">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="TuscanySCA-FAQ-TuscanySCAFrequentlyAskedQuestions"></A>Tuscany SCA - Frequently Asked Questions</H3>
+<UL>
+	<LI><B><A href="tuscany-sca-databinding-faq.html" title="Tuscany SCA - DataBinding - FAQ">DataBinding related FAQs</A></B></LI>
+</UL>
+
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="tuscany-sca-databinding-faq.html" title="Tuscany SCA - DataBinding - FAQ">Tuscany SCA - DataBinding - FAQ</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sca-java-developer-guide.html b/site/trunk/site-publish/tuscany-sca-java-developer-guide.html
new file mode 100644
index 0000000000..5f695d4545
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-java-developer-guide.html
@@ -0,0 +1,124 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany SCA Java Developer Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-documentation.html" title="SCA Java Documentation">SCA Java Documentation</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA Java Developer Guide">Tuscany SCA Java Developer Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany SCA Java Developer Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46583">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46583">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=46583">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=46583">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=46583">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=46583">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=smoverton@gmail.com">Shelita Overton</A> on Feb 21, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=46583&originalId=46587">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <P>Welcome to the Apache Tuscany SCA Developer guide. Here you will find information aimed to help you develop SCA components and applications using Tuscany's Java SCA implementation.</P>
+
+
+<P><A href="getting-started.html" title="Getting Started">Getting Started</A>  <BR>
+<A href="tuscany-architecture-guide.html" title="Tuscany Architecture Guide">Architecture Guide</A><BR>
+<A href="setting-up-an-sca-developer-environment.html" title="Setting up an &quot;SCA Developer&quot; environment">Setting up an &quot;SCA Developer&quot; environment</A>  </P>
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sca-java-extension-developer-guide.html b/site/trunk/site-publish/tuscany-sca-java-extension-developer-guide.html
new file mode 100644
index 0000000000..80f9e97557
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-java-extension-developer-guide.html
@@ -0,0 +1,104 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany SCA Java Extension Developer Guide : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=46585">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="java-sca-subproject.html" title="Java SCA Subproject">Java SCA Subproject</A>&nbsp;&gt;&nbsp;<A href="sca-java-documentation.html" title="SCA Java Documentation">SCA Java Documentation</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA Java Extension Developer Guide">Tuscany SCA Java Extension Developer Guide</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #C3CDA1; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #C3CDA1; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="home.html" title="Home">Home</A><BR>
+<SPAN class="nobr"><A href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Visit page outside Confluence" rel="nofollow">License <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="tuscany-downloads.html" title="Tuscany Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="events.html" title="Events">Events </A><BR>
+<A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<SPAN class="nobr"><A href="http://apache-tuscany.blogspot.com/" title="Visit page outside Confluence" rel="nofollow">Blog <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="java-sca-subproject.html" title="Java SCA Subproject">SCA Java</A><BR>
+<A href="sca-cpp.html" title="SCA CPP">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">PHP SCA</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-downloads.html" title="SDO Downloads">Downloads</A></P>
+</DIV></DIV>
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview</A><BR>
+<A href="das-overview.html" title="DAS Overview">DAS types</A><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<P>Welcome to the Apache Tuscany SCA Extension Developer Guide. Here you will find information aimed to help you develop SCA extensions.</P>
+
+<P>This is a work in progress, so please contribute and comment so we can make this valuable to you</P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sca-java-faq.html b/site/trunk/site-publish/tuscany-sca-java-faq.html
new file mode 100644
index 0000000000..b71cdb921f
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-java-faq.html
@@ -0,0 +1,958 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany SCA Java - FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35040">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA Java - FAQ">Tuscany SCA Java - FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" class="external-link" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://tuscany.apache.org/documentation-2x/" class="external-link" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/" class="external-link" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" class="external-link" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<P>Welcome to the Apache Tuscany Java SCA FAQ page. Please help to keep the information on this page current.</P>
+
+<P><BR class="atl-forced-newline"></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SCA Frequently Asked Questions</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#TuscanySCAJava-FAQ-BuildQuestions">Build and Development Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildA">What version of Java do I need? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildB">What version of Maven do I need? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildC">Why does the Tuscany code I checked out of Subversion not build? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildD">Java Heap Error during compilation</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildDa">Java PermGen Error during compilation</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildE">How do I generate Eclipse projects from the source distribution or from Subversion trunk?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildF">How do I generate an Eclipse WTP project for the WebApp samples?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildG">When running the WSConfidentialityTestCase using IBM JDK I experience java.lang.ExceptionInInitializerError arising from the base java.security.InvalidKeyException: Public key presented not for certificate signature - how do I get over this?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildH">How do I run the samples from a release candidate before the maven artifacts have been published?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildI">How do I turn on more trace output?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildJ">How do I remote debug Tuscany Java SCA applications from Eclipse?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildK">Maven locks up during a build. What's going on?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildL">When deploying war into Tomcat, I get failure?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildM">Build stops because of test failure, what to do?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BuildN">Is there a public build of Apache Tuscany?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-ImplementationJavaQuestions">Implementation Java Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-ImplementationJavaA">What is the format for specifying multiple interfaces with the @Service annotation? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-ImplementationJavaB">Why are references not being injected into my component? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-ImplementationJavaC">How to deploy EJBs (stateless session bean, EJB2) in Tuscany? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-ImplementationJavaD">Is it possible to use the calculator-distributed example to run on multiple hosts? </A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-BindingQuestions">Binding Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-BindingA">Can I use the EJB binding to publish an SCA services as an SLSB? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BindingB">How to return application exception in RMI binding? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-BindingC">Is it possible to configure Tuscany to expose a service (e.g. JSON-RPC) that communicates over https? If yes then how to achieve this?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-DataBindingQuestions">DataBinding Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-DataBindingA">What is the difference between Logical Type and Physical Type?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-ContributionQuestions">Contribution Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-ContributionA">What is META-INF/sca-contribution.xml for?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-ContributionB">What is What is META-INF/sca-deployables/ for?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-PolicyFrameworkQuestions">Policy Framework Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-PolicyA">What is the level of policy support in Tuscany Release 1.0 ?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-PolicyB">How do I try out the 'confidentiality' policy intent for my webservice binding ?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-SpecificationQuestions">Specification Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-SpecificationA">Where are the specifications that Tuscany implements?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-SpecificationB">what does the promote keyword in the composite file mean?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-HostingQuestions">Hosting Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-HostingA">WebSphere - java.lang.ClassNotFoundException: org.apache.tuscany.sca.host.webapp.WebSCADomain?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-HostingB">WebSphere - java.lang.IllegalArgumentException: http://www.w3.org/2001/XMLSchema?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-HostingC">WebSphere - java.net.ConnectException: Connection refused: connect</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-GeneralSCAQuestions">General SCA Questions</A>
+	<UL>
+		<LI><A href="#TuscanySCAJava-FAQ-GetTargetName">Get Target Name From Composite without parsing? </A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-DuplicateComponentInComposite">Deploying composites with similar component names</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-SCAInterfaceExtension">How is the SCA Interface Extension used in SCA environment?</A></LI>
+		<LI><A href="#TuscanySCAJava-FAQ-SCABenefits">What are the benefits of designing applications using SCA?</A></LI>
+	</UL>
+	</LI>
+	<LI><A href="#TuscanySCAJava-FAQ-Didn%2527tFindit">Didn't Find My Answer</A></LI>
+</UL>
+
+
+<P>&nbsp;</P>
+</DIV></DIV>
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Build Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildA"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What version of Java do I need?</DIV>
+
+<P>Both IBM and Sun JDK 1.5 are known to work and are used regularly by our development community.</P>
+
+<P>JDK1.4 will not work as the Tuscany SCA code base relies on some of the features of JDK1.5 such as generics and annotations.</P>
+
+<P>JDK1.6 can be problematic depending on what version you are running with. The problems are usually due to bundled versions of either STaX or JAXB  being in conflict with the versions we are using in Tuscany.</P>
+
+<P>If you are getting errors that look like the following stack trace</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>java.lang.LinkageError: JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI 
+       (from jar:file:/home/jim/.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.5/jaxb-impl-2.1.5.jar!/com/sun/xml/bind/v2/model/impl/ModelBuilder.class) 
+       needs 2.1 API. Use the endorsed directory mechanism to place jaxb-api.jar in the bootstrap classloader. 
+       (See http://java.sun.com/j2se/1.5.0/docs/guide/standards/)
+       at com.sun.xml.bind.v2.model.impl.ModelBuilder.&lt;clinit&gt;(ModelBuilder.java:172)
+       at com.sun.xml.bind.v2.runtime.JAXBContextImpl.getTypeInfoSet(JAXBContextImpl.java:422)
+       at com.sun.xml.bind.v2.runtime.JAXBContextImpl.&lt;init&gt;(JAXBContextImpl.java:286)
+       at com.sun.tools.xjc.reader.xmlschema.bindinfo.BindInfo.getJAXBContext(BindInfo.java:332)
+</PRE>
+</DIV></DIV>
+
+<P>Then it's related to JDK 6 shipping with its own version of JAXB impl. Up to JDK 6 Update 3, the JDK ships with JAX-WS 2.0 (which includes JAXB 2.0), but Tuscany requires JAXB 2.1. There are some possible solutions to this problem:</P>
+
+<OL>
+	<LI>Upgrade your JDK to 1.6.0_04 or above, which will include JAX-WS (and JAXB) 2.1</LI>
+	<LI>Copy the version 2.1 jaxb-api.jar or jaxws-api.jar (you can probably find them in your local maven repo) to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</LI>
+	<LI>Use the -Djava.endorsed.dir=&lt;a folder containing our JAXB jars&gt; to override the JAXB from JDK 6.</LI>
+</OL>
+
+
+<P>If you see an error like the following </P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>javax.xml.stream.FactoryConfigurationError: Provider
+javax.xml.stream.XMLInputFactory could not be
+instantiated: java.lang.InstantiationException
+at
+javax.xml.stream.XMLInputFactory.newInstance(XMLInputFactory.java:158)
+</PRE>
+</DIV></DIV>
+
+<P>It's the same problem but related to the version of the STaX API in use. TODO - locate the specific jar that causes the problem</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildB"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What version of Maven do I need?</DIV>
+
+<P>To build the Apache Tuscany source code that you have checked out of subversion you need to install Maven. The build is know to work relatively reliably with Maven 2.0.5. People have had it working with later versions but it you are encountering unpredicatbility in the build then give 2.0.5 a go.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Why does the Tuscany code I checked out of Subversion not build?</DIV>
+
+<P>If you are taking code out of the trunk of the Tuscany Subversion repository then you may have been unlucky and picked up a revision of the code where the build is broken. As trunk is where the development takes place this happens now and again although the development community tries to avoid build breaks if at all possible and tries to fix them quickly when they do happen.</P>
+
+<P>There are may and various other things that can cause your build to break. Its worth checking on the mail list that the trunk is building. Assuming that it is we will usually ask you to do the following as a basic level set.</P>
+
+<P>Stop any IDE you may have running<BR>
+Check out the latest trunk revision</P>
+
+<P> cd mytuscanydir<BR>
+ svn checkout <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/</A></P>
+
+<P>or (if you already have a version of the code)</P>
+
+<P> svn update <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/</A></P>
+
+<P>Clean all the maven projects</P>
+
+<P> cd mytuscanydir/sca<BR>
+ mvn clean</P>
+
+<P>Remove all the sca artifacts from the local maven repository by removing (or renaming) all of the directories under</P>
+
+<P> .m2\repository\org\apache\tuscany\sca</P>
+
+<P>Rebuild sca</P>
+
+<P> cd mytuscanydir/sca<BR>
+ mvn</P>
+
+<P>If it still doesn't work then get back on the mail list</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildD"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Java Heap error during compilation</DIV>
+
+<P>I always get a &quot;Java heap space&quot; error during the build while the itests are running these days. Runs fine if I build from within the itests folder but building from the top sca folder always fails.</P>
+
+<P>try MAVEN_OPTS=&quot;-Xmx1024m &#45;Xms512m&quot; or You can also increase the memory options in the sca pom <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=35040" class="createlink">1</A>, in the surefire plugin configuration section.</P>
+
+<P><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=1&linkCreation=true&fromPageId=35040" class="createlink">1</A> <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/pom.xml" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/incubator/tuscany/java/sca/pom.xml</A></P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildDa"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Java PermGen error during compilation</DIV>
+
+<P>I always get a similar to the following when compiling Tuscany SCA</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java.lang.OutOfMemoryError: PermGen space
+       at java.lang.<SPAN class="code-object">ClassLoader</SPAN>.defineClass1(Native Method)
+       at java.lang.<SPAN class="code-object">ClassLoader</SPAN>.defineClass(Unknown Source)
+</PRE>
+</DIV></DIV>
+
+<P>try MAVEN_OPTS=&quot;-XX:MaxPermSize=256m&quot;. This works on the Sun JDK6. Check the JDK document for other JDKs</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildE"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">How do I generate Eclipse projects from the source distribution or from Subversion trunk?</DIV>
+
+<P>If you have unpacked the source distribution or have checked out all of the code under the tuscany/java/sca directory in subversion then you should end up with a source directory containing something like:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>demos
+distribution
+itest
+modules
+samples
+tools
+pom.xml
+</PRE>
+</DIV></DIV>
+<P>You can build the source from using maven with the command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn
+</PRE>
+</DIV></DIV>
+<P>If you are going to use Eclipse with the Tuscany code, first ensure that Eclipse is aware of your Maven setup, which you can do using the command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo
+</PRE>
+</DIV></DIV>
+<P>For more details on using Eclipse with Maven, look at this page: <A href="http://maven.apache.org/guides/mini/guide-ide-eclipse.html" class="external-link" rel="nofollow">http://maven.apache.org/guides/mini/guide-ide-eclipse.html</A><BR>
+You can then build Eclipse projects for all the modules in the project using the command</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+<P>This builds &quot;.classpath&quot; and &quot;.project&quot; files for each modules. The easiest thing to do is import all of these generated projects. In Eclipse choose &quot;File/Import/Existing Projects Into Workspace&quot;. From the wizard select your source directory and Eclipse should now find all of the Eclipse projects that have been generated.</P>
+
+<P>If you imported all modules into Eclipse you should find that project dependencies are satisfied by reference to other Tuscany SCA projects in your workspace. This is convenient for debugging as all Tuscany SCA source it now available in your workspace.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildF"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">How do I generate an Eclipse WTP project for the WebApp samples?</DIV>
+
+<P>If you're using Eclipse WTP and want to get WTP Web Projects generated for our Webapp samples you can simply pass a &#45;Dwtpversion=1.5 option tothe usual mvn eclipse:eclipse command, like this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+mvn -Dwtpversion=1.5 -Peclipse eclipse:eclipse
+</PRE>
+</DIV></DIV>
+<P>The magic &#45;Dwtpversion=1.5 option will add the WTP Web project nature to all the Eclipse projects with &lt;packaging&gt;war&lt;/packaging&gt; in their Maven pom.xml. You'll then be able to add these projects to a WTP Tomcat or Geronimo Server configuration, to publish and run them straight from your Eclipse workspace.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildG"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">When running the WSConfidentialityTestCase using IBM JDK I experience java.lang.ExceptionInInitializerError arising from the base java.security.InvalidKeyException: Public key presented not for certificate signature - how do I get over this?</DIV>
+
+<P>To get over this exception please go over to the jre\lib\security\java.security of the IBM JDK installation and set up the security providers as follows.</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>#
+# List of providers and their preference orders:
+#
+security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider
+security.provider.3=com.ibm.jsse2.IBMJSSEProvider2
+security.provider.2=com.ibm.crypto.provider.IBMJCE
+security.provider.4=com.ibm.security.jgss.IBMJGSSProvider
+security.provider.5=com.ibm.security.cert.IBMCertPath
+security.provider.6=com.ibm.security.sasl.IBMSASL
+</PRE>
+</DIV></DIV>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildH"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">How do I run the samples from a release candidate before the maven artifacts have been published?</DIV>
+
+
+<P>The samples in the binary distribution won't build with mvn till we actually release and the artifacts get published to the live maven repository. To test things you can bypass this by setting up a mirror pointing to the release candidate maven repository. You do that by adding the following to your maven settings.xml file:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   &lt;mirrors&gt;
+    &lt;mirror&gt;
+      &lt;id&gt;ant.staging&lt;/id&gt;
+      &lt;url&gt;http:<SPAN class="code-comment">//people.apache.org/~antelder/tuscany/1.0-RC1a/maven&lt;/url&gt;
+</SPAN>      &lt;mirrorOf&gt;apache.incubator&lt;/mirrorOf&gt;
+
+
+    &lt;/mirror&gt;
+</PRE>
+</DIV></DIV>
+
+<P>The settings.xml is in a .m2 folder in your home directory, eg mines at: &quot;C:\Documents and Settings\Administrator\.m2&quot;. If you don't have one then we've an example at: <A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/etc/settings.xml" class="external-link" rel="nofollow">settings.xml</A></P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildI"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">How do I turn on more trace output?</DIV>
+
+<P>Tuscany uses the JDK logger for writing out info, warning etc. How much gets written out is controlled by a logging.properties file. We don't ship a file with Tuscany as we rely in the default INFO logging level that Java assumes. If you wan't to change the defaults then you can create (or edit) a logging.properties file in you jre/lib directory. Foe example, if you're using the IBM JDK you should end up with the file</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+C:\thedirwhereiinstalledjava\jre\lib\logging properties
+</PRE>
+</DIV></DIV>
+
+<P>You might want to go and change the logging level by setting it to FINE to get more information generally</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+.level= FINE
+</PRE>
+</DIV></DIV>
+
+<P>or for getting more information printed on the console</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java.util.logging.ConsoleHandler.level = INFO
+</PRE>
+</DIV></DIV>
+
+<P>See <A href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html" class="external-link" rel="nofollow">here</A> for some overview information about JDK logging.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildJ"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">How do I remote debug Tuscany Java SCA applications from Eclipse?</DIV>
+
+
+<P>There are many good articles about how to turn on java remote debugging, for exampe, <A href="http://www.eclipsezone.com/eclipse/forums/t53459.html" class="external-link" rel="nofollow">here's one</A></P>
+
+<P>The long and short of it is that you need to tell the JVM to list on a port for debug connections. For example, here the Calculator sample is being debugged.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar;.calculator.CalculatorClient
+Listening <SPAN class="code-keyword">for</SPAN> transport dt_socket at address: 8000
+3 + 2=5.0
+3 - 2=1.0
+3 * 2=6.0
+3 / 2=1.5
+</PRE>
+</DIV></DIV>
+
+<P>The important bits are the arguments starting -X. Note the address is set to port 8000. In Eclipse you can then simply open the debug dialog and create a new &quot;Remote Java Application&quot; profile specifying the port of 8000 to match the above command line. </P>
+
+<P>Assuming that you have the Tuscany SCA source available to Eclipse you can then debug through the calculator sample and the Tuscany SCA code. </P>
+
+<P>If you want to remote debug some tests running in the maven build then you can either do. </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+set MAVEN_OPTS=<SPAN class="code-quote">&quot;-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>or use the following surefire option</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+-Dmaven.surefire.debug . 
+</PRE>
+</DIV></DIV>
+
+<P>This opens the debugger on port 5005 with suspend=y. You then run mvn as you normally would and connect Eclipse to the running test as described above.</P>
+
+<P>If you want to debug through a webapp running in tomcat you can set up tomcat as follows:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+set JPDA_TRANSPORT=dt_socket
+set JPDA_ADDRESS=5005
+set JPDA_SUSPEND=y
+tomcat-install\bin&gt;catalina jpda run
+</PRE>
+</DIV></DIV>
+<P>Again from eclipse choose to remote debug. </P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildK"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">Maven locks up during a build. What's going on?</DIV>
+
+<P>The short answer is that we don't know. However we have seen this occasionally on Windows and is some cases it can be tracked back to some kind of interaction between Maven and other applications running on the machine. So the first thing to try is to stop all other applications that you are running and retry the Maven build and see if that helps.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildL"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">When I deploy my war in tomcat,while thereare no previous errors in the <BR>
+stack trace!</DIV>
+
+
+<P>When the StandardContext catches errors like this there will be additional<BR>
+messages about the problem written to the logs in the Tomcat log directory,<BR>
+please check to see what the errors are.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildM"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;"> My build fails when I get any test failure. Is there a way to make progress?</DIV>
+
+<P>You can use the following mvn command to ignore test failures.  </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java"> 
+mvn clean install -fn 
+</PRE>
+</DIV></DIV>
+<P> </P>
+
+<P>This depends on what you want to do! With -fn the tests still run with -<BR>
+Dmaven.test.skip=true they don't. Not running the tests makes the build much<BR>
+faster but without running the tests you don't know what problems there<BR>
+might be with the jars that get built. A key thing is that with -fn a test<BR>
+failure in one module does not stop the build of other modules, but, the jar<BR>
+for the module with the test failure does not get built so if you want to<BR>
+ignore a test failure but still rebuild a module then you need to use -<BR>
+Dmaven.test.skip=true. On the other hand for things like the itest modules<BR>
+you just want to see the tests results so it doesn't make much sense to use<BR>
+-Dmaven.test.skip=true but -fn can be useful to see how good or bad the<BR>
+state of the code is.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BuildN"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">Is there a public build of Tuscany so I can check progress or build integrity?</DIV>
+
+
+<P>There is a Continuum build at:<BR>
+<A href="http://vmbuild.apache.org/continuum/buildResults.action?projectGroupId=19&projectId=277" class="external-link" rel="nofollow">http://vmbuild.apache.org/continuum/buildResults.action?projectGroupId=19&amp;projectId=277</A></P>
+
+<P>You can also use the Tuscany Continuum build to check for which commits are incorportated into the build.</P>
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-MavenQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Maven Questions</DIV>
+
+
+<H2><A name="TuscanySCAJava-FAQ-ImplementationJavaQuestions"></A><A name="TuscanySCAJava-FAQ-ImplementationJavaQuestions"></A> Implementation Java Questions</H2>
+
+<H3><A name="TuscanySCAJava-FAQ-Whatistheformatforspecifyingmultipleinterfaceswiththe@Serviceannotation%3F"></A><A name="TuscanySCAJava-FAQ-ImplementationJavaA"></A> What is the format for specifying multiple interfaces with the @Service annotation?</H3>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+@Service(interfaces={Interface1.class, Interface2.class, Interface3.class} )
+<SPAN class="code-keyword">public</SPAN> class ServiceImpl <SPAN class="code-keyword">implements</SPAN> Interface1, Interface2, Interface3{
+ ...
+}
+</PRE>
+</DIV></DIV>
+
+<H3><A name="TuscanySCAJava-FAQ-Whyarereferencesnotbeinginjectedintomycomponent%3F"></A><A name="TuscanySCAJava-FAQ-ImplementationJavaB"></A> Why are references not being injected into my component?</H3>
+<P>If you have a component implementation that looks something like...</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class ServiceImpl <SPAN class="code-keyword">implements</SPAN> ServiceInterface1{
+ @Reference
+ ServiceInterface2 serviceReference1;
+
+ @Reference
+ <SPAN class="code-keyword">private</SPAN> ServiceInterface2 serviceReference2;
+
+ @Reference
+ <SPAN class="code-keyword">protected</SPAN> ServiceInterface2 serviceReference3;
+
+ @Reference
+ <SPAN class="code-keyword">public</SPAN> ServiceInterface2 serviceReference4;
+
+ ...
+}
+</PRE>
+</DIV></DIV>
+<P>Then in you operation you will find that serviceReference1 and serviceReference2 are null because SCA will only inject references into fields marked protected or public. This is true for the other injecting annotations, for example, @Callback, @ConversationId and @Context.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-HowtodeployEJBs%28statelesssessionbean%2CEJB2%29inTuscany%3F"></A><A name="TuscanySCAJava-FAQ-ImplementationJavaC"></A> How to deploy EJBs (stateless session bean, EJB2) in Tuscany?</H3>
+
+<P>There are different options for this:   </P>
+<UL>
+	<LI>Use binding.ejb to expose an SCA service as a stateless session bean. You can find some experimental implementation using OpenEJB.</LI>
+	<LI>Develop EJBs using JEE programming model and use them as SCA component implementations (implementation.ejb).</LI>
+</UL>
+
+
+<H3><A name="TuscanySCAJava-FAQ-Isitpossibletousethecalculatordistributedexampletorunonmultiplehosts%3F"></A><A name="TuscanySCAJava-FAQ-ImplementationJavaD"></A> Is it possible to use the calculator-distributed example to run on multiple hosts?</H3>
+
+<P>The calculator-distributed is configured to run in multiple VMs. The node launchers are hard coded to talk to the domain at &quot;http://localhost:9990&quot;.   </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+   (In each of the node launcher classes, the 'NodeLauncher.main(<SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">String</SPAN>[] {<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:9990/node-config/NodeC&quot;</SPAN>});' statement does <SPAN class="code-keyword">this</SPAN>) </SPAN>
+</PRE>
+</DIV></DIV>
+<P>In order to run the domain in a remote location, change the localhost to the host where domain is running in above mentioned statement .</P>
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-BindingQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Binding Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-CanIusetheEJBbindingtopublishanSCAservicesasanSLSB%3F"></A><A name="TuscanySCAJava-FAQ-BindingA"></A> Can I use the EJB binding to publish an SCA services as an SLSB? </H3>
+<P>Unfortunately, we only have the reference binding support for SLSB (call<BR>
+SLSB from SCA) in Tuscany at this moment. Any contribution to support SLSB<BR>
+service binding is welcome. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+
+<H3><A name="TuscanySCAJava-FAQ-HowtoreturnapplicationexceptioninRMIbinding%3F"></A><A name="TuscanySCAJava-FAQ-BindingB"></A> How to return application exception in RMI binding?</H3>
+<P>RemoteException and its subclasses are usually used to represent communication issues and not treated as      business exceptions by Tuscany (Ref.: JAXWS Specification v2.1 section 3.7). In order to return application pecific exception, you can add the RemoteException on the &quot;throws&quot; clause instead of having the user exception extend the RemoteException.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-IsitpossibletoconfigureTuscanytoexposeaservice%28e.g.JSONRPC%29thatcommunicatesoverhttps%3FIfyesthenhowtoachievethis%3F"></A><A name="TuscanySCAJava-FAQ-BindingC"></A> Is it possible to configure Tuscany to expose a service (e.g. JSON-RPC) that communicates over https? If yes then how to achieve this?</H3>
+<P>Yes, it is possible by enhancing the Tuscany code where the embedded Tomcat Server is created.<BR>
+We need to create few properties on the HHTP connector as follows:</P>
+
+<P>    if (isSSLEnabled) </P>
+<DIV class="error"><SPAN class="error">Unknown macro: {
+        IntrospectionUtils.setProperty(httpConnector, &quot;sslProtocol&quot;, &quot;TLS&quot;);
+        IntrospectionUtils.setProperty(httpConnector, &quot;keystoreFile&quot;,getPath()+&quot;/conf/tomcat.keystore&quot;);
+        IntrospectionUtils.setProperty(httpConnector, &quot;keystoreType&quot;, &quot;JKS&quot;);
+        IntrospectionUtils.setProperty(httpConnector, &quot;clientAuth&quot;, &quot;false&quot;);
+        httpConnector.setProtocol( &quot;SSL&quot;);
+    }</SPAN> </DIV>
+<P> </P>
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-DataBindingQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">DataBinding Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-DataBindingA"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What is he difference between Logical Type and Physical Type?</DIV>
+
+<P> The logical type represents the data type the user thinks is flowing across a wire. This could be a Java type, a XML type, a CORBA type, whatever depending on the /logical/ service contract defined in the assembly.<BR>
+ The physical type is the actual representation of that type that is flowed by the runtime. In the Java runtime this will always be a Java type (i.e. some subclass of Object). In some cases it will be the same as the logical type - e.g. when a Java component calls another Java component over a local wire using a Java interface then both logical and physical types will be the same. In many cases though they will be different - for example, if the service contract was WSDL then the logical type would be the XML type used by the WSDL.<BR>
+ Within the runtime the same logical type may have different physical forms. For example, the same XML document could be represented physically as a DOM, a StAX stream, an SDO, a JAXB object, or an AXIOM stream. The framework supports conversion between these different physical forms.</P>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+<OL>
+	<LI><B>What is the role of a data mediator interceptor? Can you cite an example of how mediation works say for a component A with reference R that references a service S in component B.?</B><BR>
+ The interceptor gets added by the connector. A's outbound wire and B's inbound wire describe the datatypes their implementations can support. When the wire ends are connected the connector adds the interceptor if mediation is needed.<BR>
+ One job of a transport binding is to convert an in-memory physical representation to a suitable set of bits on the network (aka serialization and deserialization). Rather than reinvent the different transports we reuse existing implementations such as Axis2 or RMI. As such we need to convert the physical representation on our internal wire with that used by the transport. So, for example, Axis2 only understands AXIOM so in a reference we need to convert the user's physical representation to AXIOM and in a service we need to convert the AXIOM generated by the transport into the form the user's implementation requires. The steps could be described as follows:
+	<OL>
+		<LI>A calls reference R with physical Java object X(java)</LI>
+		<LI>X is placed on R's outbound wire</LI>
+		<LI>data mediation converts X(java) to AXIOM object X(axiom)</LI>
+		<LI>X(axiom) is placed on inbound wire for the Axis2 binding</LI>
+		<LI>Axis2 binding serializes X(axiom) onto the network as XML</LI>
+		<LI>Axis2 binding on the target deserializes the XML from the network to X(axiom)</LI>
+		<LI>X(axiom) is placed on the outbound wire from the Axis2 binding</LI>
+		<LI>data mediation converts X(axiom) to X(java) as needed by the target component</LI>
+		<LI>X(java) is placed on B's inbound wire</LI>
+		<LI>the target instance for B is invoked passing in X(java)<BR>
+. An important thing to note here is that from the fabric's perspective we are dealing with two physical wires: the wire on the client connecting the source component A to the outbound Axis2 transport and the wire on the server connecting the inbound Axis2 transport to the target component B.<BR>
+From a global perspective there is one logical wire from A to B but because A and B are located on two different runtimes that logical wire gets split into two physical wires A-&gt;net and net-&gt;B.</LI>
+	</OL>
+	</LI>
+</OL>
+
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-ContributionQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Contribution Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-ContributionA"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What is META-INF/sca-contribution.xml for?</DIV>
+
+<P>The <A href="http://www.osoa.org/display/Main/Service%20Component%20Architecture%20Specifications" class="external-link" rel="nofollow">SCA Assembly Model Specification V1.00</A> describes this file in section 1.10.2.3.  Any composites that are named in the sca-contribution.xml file will be automatically be included in the deployable list maintained by the contribution.</P>
+
+<P>If you have a contribution in a directory say.</P>
+
+<P>/my/contribution/dir</P>
+
+<P>Then all composites, along with any other resources, under this directory will be located by the contribution service. For example, assume we have</P>
+
+<P>/my/contribution/dir/META-INF/sca-contribution.xml<BR>
+/my/contribution/dir/mycomposite.composite</P>
+
+<P>Where sca-contribution.xml is</P>
+
+<P>&lt;contribution xmlns=&quot;http://www.osoa.org/xmlns/sca/1.0&quot;<BR>
+targetNamespace=&quot;http://mycomposite&quot;<BR>
+ xmlns:management=&quot;http://mycomposite&quot;&gt;<BR>
+ &lt;deployable composite=&quot;mycomposite:MyComposite&quot;/&gt;<BR>
+&lt;/contribution&gt;</P>
+
+<P>So in this case the contribution service will locate the file mycomposite.composite and, assuming it contains a composite called mycomposite:MyComposite, will present it as being deployable based on the information in sca-contribution.xml.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-ContributionB"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What is META-INF/sca-deployables/ for?</DIV>
+
+<P>This is a Tuscany specific shorthand for defining deployable components, i.e. you won't find it in the SCA specifications.</P>
+
+<P>If you have a contribution in a directory say.</P>
+
+<P>/my/contribution/dir</P>
+
+<P>Then all components in composites under this directory will be located by the contribution service and any components in composites under the directory /META-INF/sca-deployables/ will automatically be included in the deployable list maintained by the contribution, for example</P>
+
+<P>/my/contribution/dir/META-INF/sca-deployables/mycomposite.composite</P>
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-PolicyFrameworkQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Policy Framework Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-PolicyA"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What is the level of policy support in Tuscany Release 1.0 ?</DIV>
+
+<P>In Java SCA Release 1.0, policy intents and policysets can be defined for an SCA Domain in the definitions.xml file and specified for various SCA Artifacts in assembly composites (composite, component, services, references, bindings, implementation).  With respect to processing, computing aplicable policies and applying them is concerned here is what the Release 1.0 supports:</P>
+<UL class="alternate" type="square">
+	<LI>appplicable policysets are computed only for 'binding' elements only i.e. only Interaction Policies are supported.  The next release will have support for 'implementation' elements also</LI>
+	<LI>definition of policy attachments to represent axis2 config params.  As sample representations of this, there are itests in the binding-ws-axis2 module and there is a sample (helloworld-ws-service-secure) that defines policies to enable ws-security in Axis2.  The intents that are supported in the itests and sample are athentication, integrity and confidentiality</LI>
+	<LI>the itest and sample does not exercise confidentiality intent due to legal issues that Tuscany has with respect to distributing bouncycastle encryption provider jars.</LI>
+	<LI>support for WS-Policy attachments, annotated intents and policyset are not yet supported</LI>
+	<LI>in identifying policysets applicable to sca elements, the xpath expression in the 'appliesTo' attribute of policy sets is not yet processed as xpath since we are sorting out some specs and implementation details with this - <A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg21699.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-dev%40ws.apache.org/msg21699.html</A></LI>
+</UL>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-PolicyB"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">How do I try out/exercise the 'confidentiality' policy intent for the Axis2 WS binding ?</DIV>
+
+<UL class="alternate" type="square">
+	<LI>First you must ensure that you are not encumbered by the legal and licensing requirements of bouncycastle.  There are algorithms in the bouncycastle distributions (such as IDEA) that have patent obligations and you are responsible for sorting this out for yourself.</LI>
+	<LI>Next you must be familiar with setting up Axis2 for confidentiality.  Here are some useful links for this <A href="http://wso2.org/library/234" class="external-link" rel="nofollow">http://wso2.org/library/234</A>, <A href="http://wso2.org/library/174" class="external-link" rel="nofollow">http://wso2.org/library/174</A>, <A href="http://wso2.org/library/255" class="external-link" rel="nofollow">http://wso2.org/library/255</A>.</LI>
+	<LI>The itest in the ws-binding-axis2 module and the helloworld-ws-service-secure have definitions.xml file that define the intents and policyset for confidentiality.  Change the values that have been provided in the Axis2ConfigParam policy attachment, to suit what you have defined for your application - such as the keystore, the userid and password to the keystore, the password callback handler class etc.</LI>
+	<LI>Now, specify the confidentiality intent on any of the binding.ws elements in your application composite and ensure that the bcprov-jdk15-132.jar is in the classpath.</LI>
+	<LI>Some JREs might require a bit of tweaking with the security.policy settings that deal with encryption providers.  We have tried and tested this successfuly on Sun and IBM JREs.</LI>
+	<LI>For the binding-ws-axis2 tests that use keys from the keystore called tuscanyKeys.jks the following command was used to generate the very basic keystore used here
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+keytool -genkey -alias TuscanyWsUser -keyalg RSA -keystore tuscanyKeys.jks -validity 9999
+</PRE>
+</DIV></DIV></LI>
+	<LI>The following command can be used to list the contents of the keystore
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+keytool -list -v -keystore tuscanyKeys.jks -storepass TuscanyWsUserPasswd
+</PRE>
+</DIV></DIV></LI>
+</UL>
+
+
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-SpecificationQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Specification Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-SpecificationA"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">Where are the specifications that Tuscany implements?</DIV>
+
+<P>You can find the 6 SCA technical committees here:</P>
+
+<P><A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-assembly</A><BR>
+<A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-policy</A><BR>
+<A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bindings</A><BR>
+<A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-j</A><BR>
+<A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-c-cpp</A><BR>
+<A href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel" class="external-link" rel="nofollow">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sca-bpel</A></P>
+
+<P>Meeting minutes, documents, issues and so on are linked from the main page.</P>
+
+<P>Mailing list archives can be found here:</P>
+
+<P><A href="http://www.oasis-open.org/archives/sca-assembly/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-assembly/</A></P>
+
+<P><A href="http://www.oasis-open.org/archives/sca-policy/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-policy/</A><BR>
+<A href="http://www.oasis-open.org/archives/sca-bindings/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-bindings/</A><BR>
+<A href="http://www.oasis-open.org/archives/sca-j/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-j/</A><BR>
+<A href="http://www.oasis-open.org/archives/sca-c-cpp/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-c-cpp/</A><BR>
+<A href="http://www.oasis-open.org/archives/sca-bpel/" class="external-link" rel="nofollow">http://www.oasis-open.org/archives/sca-bpel/</A></P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-SpecificationB"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">What does the promote keyword in the composite file mean?</DIV>
+
+
+<P>An SCA composite can be used as an implementation (implementation.composite) for a component. This is so-called recursive composition. It allows pre-assembled composites to be reused.</P>
+
+<P>&quot;promote&quot; can be used to make services or references declared on a component inside the composite visible for wiring at the composite level. The composite services and references can be then further configured when it's used as a component implementation at outer level.</P>
+
+<P>Hope the following samples help.</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite name=<SPAN class="code-quote">&quot;Composite1&quot;</SPAN> xmlns:ns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//dummy&quot;</SPAN>&gt;
+</SPAN>   &lt;component name=<SPAN class="code-quote">&quot;C1&quot;</SPAN>&gt;
+           &lt;implementation.composite name=<SPAN class="code-quote">&quot;ns:Composite2&quot;</SPAN>&gt;
+           &lt;!-- wire ref1 to component C3's service1 --&gt;
+           &lt;reference name=<SPAN class="code-quote">&quot;ref1&quot;</SPAN> target=<SPAN class="code-quote">&quot;C3/service1&quot;</SPAN>/&gt;
+           &lt;!-- configure the service with ws binding --&gt;
+           &lt;service name=<SPAN class="code-quote">&quot;svc1&quot;</SPAN>&gt;
+               &lt;binding.ws .../&gt;
+           &lt;/service&gt;
+   &lt;/component&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;composite name=<SPAN class="code-quote">&quot;Composite2&quot;</SPAN> targetNamespace=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//dummy&quot;</SPAN>
+</SPAN>xmlns:ns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//dummy&quot;</SPAN>&gt;
+</SPAN>   &lt;component name=<SPAN class="code-quote">&quot;C2&quot;</SPAN>&gt;
+           &lt;implementation.java class=<SPAN class="code-quote">&quot;my.C2Impl&quot;</SPAN>&gt;
+   &lt;/component&gt;
+
+   &lt;!-- innerService of component C2 is promoted as svc1 --&gt;
+   &lt;service name=<SPAN class="code-quote">&quot;svc1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;C2/innerService&quot;</SPAN>/&gt;
+   &lt;!-- innerReference of component C2 is promoted as ref1 --&gt;
+   &lt;reference name=<SPAN class="code-quote">&quot;ref1&quot;</SPAN> promote=<SPAN class="code-quote">&quot;C2/innerReference&quot;</SPAN>/&gt;
+&lt;/composite&gt;
+</PRE>
+</DIV></DIV>
+
+
+
+<H2><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-HostingQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Hosting Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-HostingA"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">WebSphere - java.lang.ClassNotFoundException: org.apache.tuscany.sca.host.webapp.WebSCADomain ?</DIV>
+
+
+<P>f you are trying to run some of the Tuscany sample and demo web applications on WebSphere, you may see the following exception:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+Caused by: java.lang.ClassNotFoundException: org.apache.tuscany.sca.host.webapp.WebSCADomain
+       at java.lang.<SPAN class="code-object">Class</SPAN>.forNameImpl(Native Method)
+       at java.lang.<SPAN class="code-object">Class</SPAN>.forName(<SPAN class="code-object">Class</SPAN>.java:169)
+</PRE>
+</DIV></DIV>
+
+<P>The solution to this problem is that you must set application properties to use the application class loader before the parent container class loader. Then Tuscany class dependencies packaged in your web app will be successfully loaded and resolved.</P>
+
+<P>A step by step explanation and walk through is given my Jean-Sebastien at <A href="http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html" class="external-link" rel="nofollow">http://jsdelfino.blogspot.com/2007/10/how-to-use-apache-tuscany-with.html</A>.</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-HostingB"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">WebSphere - java.lang.IllegalArgumentException: <A href="http://www.w3.org/2001/XMLSchema" class="external-link" rel="nofollow">http://www.w3.org/2001/XMLSchema?</A></DIV>
+
+<P>This means that, for some reason, you don't have the correct XML parser packages in your webapp. Usually including Xerces and Xalan implementations in your webapp will solve this problem. Arrange for the files xercesImpl.2.8.1.jar and xalan-2.7.0.jar to be copied to the webapp lib folder</P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-HostingC"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">WebSphere - java.net.ConnectException: Connection refused: connect?</DIV>
+
+
+<P>There are a couple of likely reasons why this can happen. </P>
+
+<P>Firstly, by default, WebSphere is set up to use port 9080 while all of the Tuscany samples are set up to use port 8080 so if, for example, you are trying to deploy samples/calculator-ws-webapp to a default WebSphere configuration you will need to go in and change the client component reference description to read:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;component name=<SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>&gt;
+        &lt;implementation.java class=<SPAN class="code-quote">&quot;calculator.CalculatorServiceImpl&quot;</SPAN>/&gt;
+        &lt;reference name=<SPAN class="code-quote">&quot;addService&quot;</SPAN> &gt;
+           &lt;<SPAN class="code-keyword">interface</SPAN>.java <SPAN class="code-keyword">interface</SPAN>=<SPAN class="code-quote">&quot;calculator.AddService&quot;</SPAN> /&gt;        
+            &lt;binding.ws uri=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//localhost:9080/sample-calculator-ws-webapp/AddServiceComponent&quot;</SPAN>/&gt;        
+</SPAN>        &lt;/reference&gt;  
+</PRE>
+</DIV></DIV>
+
+<P>Another thing to watch out for is a WebSphere configuration that tells the web container to pass requests on to the filter chain when URLs remain unsatisfied. </P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+com.ibm.ws.webcontainer.invokeFiltersCompatibility = <SPAN class="code-keyword">true</SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>See the details here <A href="http://www-1.ibm.com/support/docview.wss?rs=180&uid=swg1PK31377" class="external-link" rel="nofollow">http://www-1.ibm.com/support/docview.wss?rs=180&amp;uid=swg1PK31377</A></P>
+
+<DIV class="" style="background-color: #C3CDA1;">General SCA Questions</DIV>
+
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-GetTargetName"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">How to get Target Name from Composite without parsing? </DIV>
+
+<P>You can use the StAX to get the QName as follows:</P>
+
+<P>Assuming url points to the composite file:</P>
+
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE> 
+URLConnection connection = url.openConnection();
+connection.setUseCaches(false);
+XMLStreamReader reader = factory.createXMLStreamReader(connection.getInputStream());
+reader.nextTag();
+
+assert Constants.COMPOSITE_QNAME.equals(reader.getName());
+String ns = reader.getAttributeValue(null, &quot;targetNamespace&quot;);
+if (ns == null) {
+ns = XMLConstants.NULL_NS_URI;
+}
+String name = reader.getAttributeValue(null, &quot;name&quot;);
+reader.close();
+</PRE>
+</DIV></DIV> 
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-DuplicateComponentInComposite"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">Different composites can contain components with the same name. How can I reference the components if the composites are contributed to one SCA Domain? </DIV>
+
+
+<P>You should consider that in order to enable 2 separate composites they need to be contributed to the domain in some way. For example, </P>
+
+<P>1 - composites contributed as deployable<BR>
+2 - included in other composites that are included as deployable composites<BR>
+3 - named as component implementations using implementation.composite</P>
+
+<P>In cases 1 and 2 the composite is flattened out and become part of another composite. In case 1 this other composite is the virtual domain composite. The component name must be unique in this context. </P>
+
+<H3><A name="TuscanySCAJava-FAQ-HowistheSCAInterfaceExtensionusedinSCAenvironment%3F"></A><A name="TuscanySCAJava-FAQ-SCAInterfaceExtension"></A> How is the SCA Interface Extension used in SCA environment?</H3>
+<P>SCA allows you to define interfaces for SCA references and services using different languages such as Java, WSDL 1.1, WSDL 2.0 or CORBA<BR>
+IDL. <BR>
+For example, consider following two components:  <BR>
+OrderProcessingClient (java component): It takes the order from the web front and calls the OrderProcessing process to fulfill the    order    <BR>
+OrderProcessing (BPEL component): A business process that handles the order and it defines a service using WSDL 1.1 <BR>
+OrderProcessingClient defines a reference using java interface. <BR>
+When OrderProcessingClient is wired to OrderProcessing,  the java code for OrderProcessingClient can call the OrderProcessing component <BR>
+using the java interface if it's compatible with the WSDL portType for the OrderProcessing component. The SCA interface extension makes<BR>
+it possible for components to choose the suitable interface definition languages. </P>
+
+<H3><A name="TuscanySCAJava-FAQ-WhatarethebenefitsofdesigningapplicationsusingSCA%3F"></A><A name="TuscanySCAJava-FAQ-SCABenefits"></A> What are the benefits of designing applications using SCA?</H3>
+<P>Please refer to the following email thread for answer:<BR>
+  <A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01114.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01114.html</A></P>
+
+<H3><A name="TuscanySCAJava-FAQ-"></A><A name="TuscanySCAJava-FAQ-Didn%27tFindit"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;">Didn't Find my answer</DIV>
+
+<P>If you still have not found your answer, please take a look at the email archive. You can do a search on your topic. </P>
+
+<P><A href="http://www.mail-archive.com/user@tuscany.apache.org/" class="external-link" rel="nofollow">User Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/" class="external-link" rel="nofollow">User Discussion Archives (when under incubation)</A><BR>
+<A href="http://www.mail-archive.com/dev@tuscany.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives</A><BR>
+<A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/" class="external-link" rel="nofollow">Dev Discussion Archives (when under incubation)</A></P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-sca-web-application-integration-story.html b/site/trunk/site-publish/tuscany-sca-web-application-integration-story.html
new file mode 100644
index 0000000000..de5c7e5c44
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sca-web-application-integration-story.html
@@ -0,0 +1,230 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany SCA Web Application Integration Story</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53596">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="sca-java-work-in-progress.html" title="SCA Java Work-In-Progress">SCA Java Work-In-Progress</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SCA Web Application Integration Story">Tuscany SCA Web Application Integration Story</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="TuscanySCAWebApplicationIntegrationStory-WebApplicationIntegrationstorygoals"></A>Web Application Integration story goals</H2>
+
+<UL class="alternate" type="square">
+	<LI>Simplify the web application as a client application story</LI>
+	<LI>Use a simple approach, familiar to all web application developers</LI>
+</UL>
+
+
+<H2><A name="TuscanySCAWebApplicationIntegrationStory-IntegratingusingServletContextLister"></A>Integrating using ServletContextLister</H2>
+
+<P>This approach register a context listener on the application web.xml that will bootstrap the runtime when the web-app is started, and closes the runtime when the web-app is shutdown.</P>
+
+<P>Necessary updates in web.xml</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;listener&gt;
+ &lt;listener-class&gt;org.apache.tuscany.sca.webapp.TuscanyContextListener&lt;/listener-class&gt;
+&lt;/listener&gt;
+</PRE>
+</DIV></DIV>
+
+<P>Then, once this integration part is defined, developers only need to get a reference to the SCADomain in their JSP and then get a reference to a service and start consuming it<BR>
+Below, you can find the JSP code snippet to get a SCARuntime reference :</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+SCADomain domain = (SCADomain) application.getAttribute(<SPAN class="code-quote">&quot;org.apache.tuscany.sca.SCADomain&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+
+<P>In order to use this approach, you will need to specify a sca-contribution.xml inside the META-INF directory of your web-app, this file will be used to identify the root of the contribution as well as the list of deployable composites.</P>
+
+<P>Here is a sample sca-contribution.xml used in the calculator-web application:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;
+&lt;contribution xmlns=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//www.osoa.org/xmlns/sca/1.0&quot;</SPAN>&gt;
+</SPAN>   &lt;deployable composite=<SPAN class="code-quote">&quot;Calculator&quot;</SPAN>/&gt;
+&lt;/contribution&gt;
+</PRE>
+</DIV></DIV>
+
+
+<P>Tuscany also supports the scenario where you would drop the SCA composite files inside the META-INF\sca-deployables directory, and this would also be used to identify the root of the contribution and the list of deployable composites.</P>
+
+<P><B>pros</B>: Consistent programming model between JSP and Servlets<BR>
+<B>cons</B>: require web.xml integration and sca-contribution.xml, although the trend is to make web apps simpler and web.xml is optional in newer specs of J2EE</P>
+
+<H2><A name="TuscanySCAWebApplicationIntegrationStory-IntegratingusingpureJSPcode"></A>Integrating using pure JSP code</H2>
+
+<P>Integration using useBean tag: This approach would be very simple, and would basically ask the developer to add a useBean to instantiate the domain, and a setProperty to set the deployableComposite/</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;jsp:useBean id=<SPAN class="code-quote">&quot;SCADomain&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.apache.tuscany.host.embedded.SCADomainBean&quot;</SPAN> scope=<SPAN class="code-quote">&quot;application&quot;</SPAN>&gt;
+ &lt;jsp:setProperty property=<SPAN class="code-quote">&quot;deployableComposite&quot;</SPAN> value=<SPAN class="code-quote">&quot;Calculator.composite&quot;</SPAN> /&gt;
+&lt;/jsp:useBean&gt;
+...
+&lt;%
+ SCADomain domain = (SCADomain) application.getAttribute(<SPAN class="code-quote">&quot;SCADomain&quot;</SPAN>);
+ CalculatorService calculatorService = domain.getService(CalculatorService.class, <SPAN class="code-quote">&quot;CalculatorServiceComponent&quot;</SPAN>);
+%&gt;
+</PRE>
+</DIV></DIV>
+<P>Optional attributes can be defined by using the &lt;jsp:setProperty&gt; calls, if no attributes are specified, the sca-contribution.xml will be used to hint the root of the contribution as well as to find the deployable composites.</P>
+
+<P>In this scenario, the SCADomain is stopped when the application goes out of scope and the garbage collection process the termination of the SCADomain.</P>
+
+<P><B>pros</B>: simple, does not involve changes on web.xml<BR>
+<B>cons</B>: leaves toping the sca domain/runtime to when garbage collection process the application scope bean, also introduce different programming model between JSP and Servlets.</P>
+
+
+
+<H2><A name="TuscanySCAWebApplicationIntegrationStory-References"></A>References</H2>
+
+<P><A href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/" class="external-link" rel="nofollow">http://java.sun.com/j2ee/1.4/docs/tutorial/doc/</A><BR>
+<A href="http://java.sun.com/products/jsp/docs.html#syntax" class="external-link" rel="nofollow">http://java.sun.com/products/jsp/docs.html#syntax</A><BR>
+<A href="http://java.sun.com/products/jsp/tags/11/syntaxref11.fm14.html" class="external-link" rel="nofollow">http://java.sun.com/products/jsp/tags/11/syntaxref11.fm14.html</A><BR>
+<A href="http://java.sun.com/products/javabeans/docs/spec.html" class="external-link" rel="nofollow">http://java.sun.com/products/javabeans/docs/spec.html</A></P>
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-sdo-cpp-faq.html b/site/trunk/site-publish/tuscany-sdo-cpp-faq.html
new file mode 100644
index 0000000000..8c2abfe641
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sdo-cpp-faq.html
@@ -0,0 +1,105 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany SDO CPP - FAQ : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35043">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SDO CPP - FAQ">Tuscany SDO CPP - FAQ</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H3><A name="TuscanySDOCPP-FAQ-TuscanySDOFrequentlyAskedQuestions"></A>Tuscany SDO - Frequently Asked Questions</H3>
+
+
+<OL>
+	<LI><B>Does SDO for C++ provide a static interface as the Java implementation does?</B><BR>
+No. It is not clear that this is a useful feature in a language like C++ so we have no plans to implement it.</LI>
+	<LI><B>How do I load an XML file using SDO static type?</B><BR>
+The basic pattern is fairly simple. 
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>  // Get hold of a helper context. This holds an XMLHelper instance
+  HelperContext scope = SDOUtil.createHelperContext();
+   
+  // Register all of the types we have generated into the HelperContext
+  GenerateFactory.INSTANCE.register(scope);
+
+  // A normal input stream to read the XML file
+  fis = new FileInputStream(&quot;some.xml&quot;);
+ 
+  // Use the HelperContext to get and XMLHelper and use this to load the XML
+  XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
+
+  // Now we have a document we can get the root object and cast it to the expected type
+  GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
+</PRE>
+</DIV></DIV>
+<P>There are some unit tests that show how to do this. You have to look in the tools tests cases as the Java static generator is in the tools project. Try looking in sdo\tools\src\test\java\org\apache\tuscany\sdo\test&#42;.java. </P></LI>
+</OL>
+
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sdo-faq.html b/site/trunk/site-publish/tuscany-sdo-faq.html
new file mode 100644
index 0000000000..6c892276ea
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sdo-faq.html
@@ -0,0 +1,146 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Tuscany SDO - FAQ</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-cpp.html" title="SDO CPP">SDO CPP</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SDO - FAQ">Tuscany SDO - FAQ</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Tuscany SDO - FAQ</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35043">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=35043">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35043">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=35043">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35043">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=35043">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=svkrish">S Venkatakrishnan</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Mar 12, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=35043&originalId=48531">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="TuscanySDO-FAQ-TuscanySDOFrequentlyAskedQuestions"></A>Tuscany SDO - Frequently Asked Questions</H3>
+
+
+<OL>
+	<LI><B>Does SDO for C++ provide a static interface as the Java implementation does?</B><BR>
+No. It is not clear that this is a useful feature in a language like C++ so we have no plans to implement it.</LI>
+	<LI><B>How do I load an XML file using SDO static type?</B><BR>
+The basic pattern is fairly simple. 
+<DIV class="preformatted"><DIV class="preformattedContent">
+<PRE>  // Get hold of a helper context. This holds an XMLHelper instance
+  HelperContext scope = SDOUtil.createHelperContext();
+   
+  // Register all of the types we have generated into the HelperContext
+  GenerateFactory.INSTANCE.register(scope);
+
+  // A normal input stream to read the XML file
+  fis = new FileInputStream(&quot;some.xml&quot;);
+ 
+  // Use the HelperContext to get and XMLHelper and use this to load the XML
+  XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
+
+  // Now we have a document we can get the root object and cast it to the expected type
+  GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
+</PRE>
+</DIV></DIV>
+<P>There are some unit tests that show how to do this. You have to look in the tools tests cases as the Java static generator is in the tools project. Try looking in sdo\tools\src\test\java\org\apache\tuscany\sdo\test&#42;.java. </P></LI>
+</OL>
+
+        </DIV>
+
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscany-sdo-java-faq.html b/site/trunk/site-publish/tuscany-sdo-java-faq.html
new file mode 100644
index 0000000000..411f3f4776
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-sdo-java-faq.html
@@ -0,0 +1,361 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany SDO Java - FAQ</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51434">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-overview.html" title="SDO Overview">SDO Overview</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany SDO Java - FAQ">Tuscany SDO Java - FAQ</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="sdo-java-get-involved.html" title="SDO Java Get Involved">Get Involved</A><BR>
+<A href="sdo-java-found-a-bug.html" title="SDO Java Found a Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SDO Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-java.html" title="SDO Java">SDO Java Home</A><BR>
+<A href="" title="Tuscany SDO Java - FAQ">FAQ</A><BR>
+<A href="sdo-java-releases.html" title="SDO Java Releases">Downloads</A><BR>
+<A href="sdo-java-documentation-menu.html" title="SDO Java Documentation Menu">Documentation</A><BR>
+<A href="http://svn.apache.org/repos/asf/tuscany/sdo-java/trunk/" class="external-link" rel="nofollow">Source Code</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>Apache Tuscany SDO Java Frequently Asked Questions</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<UL>
+	<LI><A href="#TuscanySDOJava-FAQ-BuildandDevelopmentQuestions">Build and Devlopment Questions</A>
+	<UL>
+		<LI><A href="#TuscanySDOJava-FAQ-DevA">How can I debug into EMF in Eclipse? </A></LI>
+		<LI><A href="#TuscanySDOJava-FAQ-DevB">What is the connection between static XSDHelper calls when definition and load could be using different XSDHelpers for the same instance in the same VM? </A></LI>
+		<LI><A href="#TuscanySDOJava-FAQ-DevC">Is there support for extending generated SDO implementation classes? </A></LI>
+		<LI><A href="#TuscanySDOJava-FAQ-DevD">How do I work with javajet files to modify the SDO generator code? </A></LI>
+		<LI><A href="#TuscanySDOJava-FAQ-DevE">Is there way to turn change summary on and off? </A></LI>
+	</UL>
+	</LI>
+</UL>
+</DIV></DIV>
+
+<H2><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-BuildandDevelopmentQuestions"></A></H2>
+
+<DIV class="" style="background-color: #C3CDA1;">Build and Development Questions</DIV>
+
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevA"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">How can I debug into EMF in Eclipse?</DIV>
+
+
+<P>Download an SDK archive of the appropriate version of eclipse EMF containing EMF and XSD (and Eclipse's SDO 1.0 impl which can be ignored) from <A href="http://www.eclipse.org/modeling/emf/downloads/#archives" class="external-link" rel="nofollow">http://www.eclipse.org/modeling/emf/downloads/#archives</A> (currently 2.2.3 and likely to remain that way until SDO is not constrained to work with Java 1.4.2).  The archive contains source code for each jar in zip files. Extract this archive onto your file system somewhere. You can associate a jar with a source zip in two ways.  Either ...</P>
+<OL>
+	<LI>wait until you debug into an EMF class file that doesn't have a source association and then click the &quot;Attach Source ...&quot; button,  or ...</LI>
+	<LI>in the package explorer pane, open up the &quot;Referenced Libraries&quot; part of a projects source hierarchy and right click on one of the referenced libraries.  Select Properties, and click on the Java Source Attachment tab.</LI>
+</OL>
+
+
+<P>Now you have the opportunity to define a variable for eclipse to provide an starting root location in the file system which can be extended in order to locate the source code (this allows for easy transport of eclipse projects between environments, since only the small set of environment variables need to be updated in order to make the project build again in the new environment.)  Define a &quot;New...&quot; variable (mine is EMF_SRC) and make it point to a location above all the source file zips.  The variable's value will be something like C:/Dev/downloads/emf-sdo-xsd-SDK-2.2.3/eclipse/plugins/.  Now create an extension to that variable by clicking on &quot;Extension...&quot;.  Select your new variable,  and open up the hierarchy to find the source zip file.  For example </P>
+
+<P>/EMF_SRC/org.eclipse.emf.source_2.2.3.v200705141058/src/org.eclipse.emf.ecore_2.2.3.v200705141058/src.zip</P>
+
+<P>Be sure to select the zip file,  and not a folder above the file.  Close all the dialogs.  Now your source file attachment is made and you will be able to debug through any file in that jar.  You'll need to make more associations for the other jars by extending the existing EMF_SRC variable for those jars.</P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevB"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">What is the connection between static XSDHelper calls when definition and load could be using different XSDHelpers for the same instance in the same VM?</DIV>
+
+
+<P><B>For example:</B></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+XSDHelper.INSTANCE.define(is, <SPAN class="code-keyword">null</SPAN>);
+</PRE>
+</DIV></DIV>
+<P><B>and then in another static method xml is loaded</B></P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+XMLDocument xmlDoc = XMLHelper.INSTANCE.load(is);
+</PRE>
+</DIV></DIV>
+
+<P><B>Answer:</B> The methods you point out are not static methods,  but are executed in the context of the singleton helpers,  and the<BR>
+metadata generated by the XSDHelper.INSTANCE singleton is stored in the TypeHelper.INSTANCE and accessed from there by the<BR>
+XMLHelper.INSTANCEsingleton.  Together these singletons form a default set of helpers centred<BR>
+around a default scope for types.  The recently introduced HelperContext SDO 2.1 API allows you to create new collections of helpers that together define alternative scopes.</P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Is there support for extending generated SDO implementation classes?</DIV>
+
+
+<P>Here is my understanding:<BR>
+1) I cannot have my own superclass of a generated SDO class since this is already occupied <BR>
+2) I cannot (yet) simply subclass a generated SDO class, this may be addressed in <A href="https://issues.apache.org/jira/browse/TUSCANY-513" class="external-link" rel="nofollow">TUSCANY-513</A> <BR>
+As a consequence I would have to modify the generated  SDO implementation class in order to offer custom formatter and validation logic!? Is there eventually a way to inject code using annotations? Or is it possible to re-generate and prevent override of custom code (merge)?*</P>
+
+<P><B>Answer:</B> The Tuscany SDO generator is currently reusing the code generator <BR>
+framework from Eclipse EMF project. If you look at the EMF generator,  you'll see that it's very powerful and customizable. In Tuscany all we've <BR>
+done is create a simple command line invocation of the EMF generator, using our own templates, and a few basic options.</P>
+
+<P>One thing we don't support is regen/merge because the EMF merger prereqs the Eclipse JDT, which we didn't want to drag into Tuscany as a <BR>
+dependency. If someone is willing to write a standalone merger for Tuscany, we could support regen.<BR>
+Other things like generating a different base class or adding methods, are supported in EMF but we don't have a way do it in with the Tuscany <BR>
+generator yet. If you'd be willing to help get some of this function into Tuscany, I'm sure a lot of people would be interested in it.</P>
+
+<P>The bottom line is that real sophisticated tooling is outside of the scope of the Tuscany project. Another possible direction for this is for some <BR>
+Eclipse project to provide a fancy GUI-generator (and possibly other tools) for developing Tuscany SDO applications. It would be nice to see something like that get started.</P>
+
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevD"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">How do I work with javajet files to modify the SDO generator code?</DIV>
+
+
+<P><B>Answer:</B> You can learn how to set up your Eclipse environment to have javajet function built in using this <A href="http://www.eclipse.org/articles/Article-JET/jet_tutorial1.html" class="external-link" rel="nofollow">tutorial</A>.<BR>
+Note that if you install the JET plugin via the Help =&gt; Software Updates =&gt; Find and Install .. menu of the eclipse IDE then you may see that selecting the &quot;Java Emitter Templates SDK&quot; causes the somewhat cryptic error message that you need the EMF codegen plugin,  but there is no such plugin listed as an additional item to select.  To clear this error and proceed you will need to select the &quot;EMF Extender SDK&quot; option.</P>
+
+<P>Once you have the right eclipse environment you must add a javajet nature to the sdo-tools project, and modify the javajet configuration to match the shape of the sdo-tools project.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  File =&gt; New =&gt; Other
+  Select <SPAN class="code-quote">&quot;Java Emitter Templates&quot;</SPAN>
+  Select <SPAN class="code-quote">&quot;Convert Projects to Jet Projects&quot;</SPAN>
+  Select <SPAN class="code-quote">&quot;tuscany-sdo-tools&quot;</SPAN>
+  Click <SPAN class="code-quote">&quot;Finish&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Then in the Package Explorer pane of the Java perspective of Eclipse, right click on the tuscany-sdo-tools project</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+  Select <SPAN class="code-quote">&quot;Properties&quot;</SPAN>
+  Select <SPAN class="code-quote">&quot;Jet Settings&quot;</SPAN>
+  Change the Source Container to <SPAN class="code-quote">&quot;src/main/java&quot;</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Following this,  when you change the code in templates/models/SDOClass.javajet, or templates/models/SDOFactoryClass.javajet, then the corresponding java class will be updated each time that you save the javajet file. </P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">How to make the SDO-Tuscany library work in an eclipse plugin?</DIV>
+
+
+<P><B>Answer:</B> Please refer to the following email thread for answer:<BR>
+        <A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg03101.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-user@ws.apache.org/msg03101.html</A></P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> How to use SDO in tuscany SCA?</DIV>
+
+
+<P><B>Answer:</B>- It's possible to use Static SDO or Dynamic SDO</P>
+<UL class="alternate" type="square">
+	<LI>For the dynamic SDO, you can use DataObject as parameter type.</LI>
+	<LI>You are required to put something like this in the SCDL (*.composite) file:
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+    &lt;composite ...
+        xmlns:dbsdo=<SPAN class="code-quote">&quot;http:<SPAN class="code-comment">//tuscany.apache.org/xmlns/sca/databinding/sdo/1.0&quot;</SPAN>;
+</SPAN>        ....&gt;
+    &lt;dbsdo:<SPAN class="code-keyword">import</SPAN>.sdo location=<SPAN class="code-quote">&quot;wsdl/helloworld.wsdl&quot;</SPAN>/&gt;-
+</PRE>
+</DIV></DIV>
+<P>    <SPAN class="error">&#91;Note: It's possible to have multiple &lt;import.sdo&gt; elements&#93;</SPAN></P></LI>
+</UL>
+
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> I am having issues with Sun JDK 1.4.2 while trying to do SDO build.</DIV>
+
+
+<P><B>Answer:</B> This is a known issue of SUN JDK. The Crimson DOM implementation in (some versions of) the Sun JDK 1.4 has a bug in the implementation of hasAttributeNS.<BR>
+        This bug can be seen as either a null pointer exception or as an error message &quot;Specify a valid XML Schema and try loading again&quot; while loading or importing a model from XML Schema.<BR>
+        To avoid this, use the following to control the JAXP implementaion:<BR>
+          &lt;eclipse-install-dir&gt;eclipse.exe -vmargs -Djava.endorsed.dirs=&lt;path-to-your-xerces-jars-folder&gt;</P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> Is there a way to restrict the version of maven used?</DIV>
+
+
+<P><B>Answer:</B> According to the POM model, you can use the &lt;prerequisites&gt; element to specify the minimum version of Maven required to build the project.<BR>
+for example:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+&lt;prerequisites&gt;
+    &lt;maven&gt;2.0.7&lt;/maven&gt;
+&lt;/prerequisites&gt;
+</PRE>
+</DIV></DIV>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> How can I define multiple XSD files with same namespace in same XSDHelper.INSTANCE?</DIV>
+
+
+<P><B>Answer:</B> You need to create a HelperContext that has the extensible namespaces set to true. So, instead of using XMLHelper.INSTANCE you must do the following:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+HelperContext scope = SDOUtil.createHelperContext(<SPAN class="code-keyword">true</SPAN>);
+   then use the XSDHelper from
+XSDHelper xsdHelper = scope.getXSDHelper()
+</PRE>
+</DIV></DIV>
+
+<P>        if you use this instance of XSDHelper you will be able to add types to your namespace.</P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;">Is it possible to generatie a DataObject from XML with XML Schema types?</DIV>
+
+
+<P>*Answer:*Currently, Tuscany doesn't automatically load metadata (schemas) on the fly. It is required to register the types before the instances are loaded.<BR>
+        It's required to execute something like this before calling XMLHelper.load():</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+URL url = SdoDroolsTest.class.getResource(<SPAN class="code-quote">&quot;/XYZ.xsd&quot;</SPAN>);
+getScope().getXSDHelper().define(url.openStream(), url.toString());
+</PRE>
+</DIV></DIV>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> How to add Property to an XSDHelper-defined Type&acirc;&euro;Ž?</DIV>
+
+
+<P><B>Answer:</B> If you create your HelperContext using SDOUtil.createHelperContext(true); XSDHelper.define() method will then let you add new types to an existing namespace <BR>
+        and also to replace an existing type with a new version (Note: This is a &quot;use at your own risk&quot; feature).<BR>
+    So, you could add a new property by calling XSDHelper.define() again passing in a new version of the XSD type that includes the new element/attribute. </P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> Why does the DataObject with contained DataGraph causes NullPointerException in ChangePackage$Literals?</DIV>
+
+
+<P><B>Answer:</B>  Please refer to the following email thread for answer:<BR>
+         <A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01178.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01178.html</A></P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevC"></A></H3>
+
+<DIV class="" style="background-color: #C3CDA1;"> How can I use SDO for my Eclipse RCP application?</DIV>
+
+
+<P><B>Answer:</B> Please refer to the following email thread for answer:<BR>
+        <A href="http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01129.html" class="external-link" rel="nofollow">http://www.mail-archive.com/tuscany-user@ws.apache.org/msg01129.html</A></P>
+
+<H3><A name="TuscanySDOJava-FAQ-"></A><A name="TuscanySDOJava-FAQ-DevE"></A></H3>
+<DIV class="" style="background-color: #C3CDA1;"> Is there a mechanism or workaround to pause and resume the recording in the ChangeSummary?
+</DIV>
+
+<P><B>Answer:</B> There's no standard &quot;spec-defined&quot; way, but I believe in Tuscany you can<BR>
+call endLogging() to suspend and then call<BR>
+ChangeSummaryImpl.resumeLogging() instead of beginLogging() to restart.<BR>
+Note that you'll need to cast your ChangeSummary to ChangeSummaryImpl to<BR>
+call resumeLogging().</P>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-subprojects.html b/site/trunk/site-publish/tuscany-subprojects.html
new file mode 100644
index 0000000000..f96d6151c9
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-subprojects.html
@@ -0,0 +1,160 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany Subprojects</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51556">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="getting-involved.html" title="Getting Involved">Getting Involved</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Subprojects">Tuscany Subprojects</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR><TD class="confluenceTd" valign="top" width="15%"><P></P>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD><TD class="confluenceTd" valign="top" width="85%">
+<H3><A name="TuscanySubprojects-TuscanySubprojects"></A>Tuscany Subprojects</H3>
+
+<P>Apache Tuscany project is focused on the development and innovation for three key technologies: <A href="sca-overview.html" title="SCA Overview">Service Component Arcitecture (SCA)</A>, <A href="sdo-overview.html" title="SDO Overview">Service Data Object (SDO)</A> and <A href="das-overview.html" title="DAS Overview">Data Access Service </A>. There are standards available for SCA and SDO at OASIS.</P>
+
+<P>There are two subprojects under Service Component Architecture which provide implementation for an infrastructure to support SCA in <A href="sca-java.html" title="SCA Java">Java</A> and <A href="sca-native.html" title="SCA Native">native</A> languages. Each of these infrastructures provide plug points for other lanaguage implementations and bindings.</P>
+
+
+<P>There are two subprojects under Service Data Object(SDO) which provide implementation of SDO runtime in <A href="sdo-java.html" title="SDO Java">Java</A> and in <A href="sdo-cpp.html" title="SDO CPP">native</A> languages. </P>
+
+<P>There are multiple projects in progress under Data Access Service(DAS) to enable data access to a variety of end data sources. </P></TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-tomcat-distribution.html b/site/trunk/site-publish/tuscany-tomcat-distribution.html
new file mode 100644
index 0000000000..713ad14c37
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-tomcat-distribution.html
@@ -0,0 +1,236 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Tuscany Tomcat Distribution : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329563">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Tomcat Distribution">Tuscany Tomcat Distribution</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 1.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/" rel="nofollow">1.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java 2.x</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java-2x-releases.html" title="SCA Java 2.x Releases">Downloads</A><BR>
+<A href="http://bit.ly/1DTAYA" rel="nofollow">Documentation</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV>
+</TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyTomcatDistribution-TuscanyTomcatDistribution"></A>Tuscany Tomcat Distribution</H1>
+
+<P>Tuscany includes a tuscany.war distribution for SCA-enabling <A href="http://tomcat.apache.org/" rel="nofollow">Apache Tomcat</A>, find it at the <A href="http://tuscany.apache.org/sca-java-2x-releases.html" rel="nofollow">Tuscany download page</A>. </P>
+
+<P>There are several advantages with using an SCA-enabled Tomcat:</P>
+<UL class="alternate" type="square">
+	<LI>Individual Web Applications do not need to include any Tuscany jars or Tuscany configuration in the web.xml.</LI>
+	<LI>Other SCA contribution formats such as jar or zip files can be deployed to Tomcat.</LI>
+	<LI>An SCA domain can be used to support SCA wiring accross Web Applications and contributions</LI>
+</UL>
+
+
+<P>Updating Tomcat to use the tuscany.way distribution is really simple - deploy the tuscany.war to Tomcat, go to the <A href="http://localhost:8080/tuscany" rel="nofollow">Tuscany admin application</A>, click on install, and thats it. On a restart of Tomcat it can now run SCA contributions and SCA enabled Web applications. </P>
+
+<P>The initial release of the tuscany.war in 2.0 M3 includes support for SCA-enabled Web applications as well as SCA contributions deployed to a directory named &quot;sca-contributions&quot; in the Tomcat top-level directory, and a single Tomcat instance wide SCA domain. Upcoming releases will enhance the domain support to allow multiple SCA domains and domains spanning more than a single Tomcat instance.</P>
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-war-dirstribution.html b/site/trunk/site-publish/tuscany-war-dirstribution.html
new file mode 100644
index 0000000000..d718b8941e
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-war-dirstribution.html
@@ -0,0 +1,214 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Tuscany WAR Dirstribution : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329563">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany WAR Dirstribution">Tuscany WAR Dirstribution</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/" rel="nofollow">1.x Source Code</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyWARDirstribution-TuscanyWARDirstribution"></A>Tuscany WAR Dirstribution</H1>
+
+
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-war-distribution.html b/site/trunk/site-publish/tuscany-war-distribution.html
new file mode 100644
index 0000000000..3160a89caf
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-war-distribution.html
@@ -0,0 +1,214 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+    <HEAD>
+           <META name="description" content="Apache Tuscany">
+   <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+
+
+
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+
+        <TITLE>Tuscany WAR Distribution : Apache Tuscany</TITLE>
+
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+
+    
+
+    <BODY onload="init()">
+
+        
+
+        
+    <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+
+        <TR>
+
+            <TD valing="top" align="left">
+
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+
+			</TD>
+
+			<TD>
+
+                <A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+
+            </TD>
+
+            
+
+            <TD width="100%">
+
+                &nbsp;
+
+            </TD>
+
+            <!--td align="right">
+
+                <img src="http://incubator.apache.org/tuscany/images/apache- incubator- logo.png" border="0">
+
+            </td-->
+
+
+
+            <!-- Adds the edit page link to the top banner-->
+
+            <TD valign="bottom">
+
+                <DIV style="padding: 2px 10px; margin: 0px;">
+
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=2329563">
+
+                    <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+
+                </DIV>
+
+            </TD>
+
+
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+
+        <TR class="topBar">
+
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-java-2x.html" title="SCA Java 2.x">SCA Java 2.x</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany WAR Distribution">Tuscany WAR Distribution</A>
+
+            </TD>
+
+            
+
+            <TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+
+            <A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+
+            </TD>
+
+        </TR>
+
+    </TABLE>
+
+
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+
+            <TR>
+
+                <TD align="left" valign="top">
+
+                    
+    <DIV id="PageContent">
+
+        
+        
+
+        <DIV class="pagecontent">
+
+            <DIV class="wiki-content">
+
+                <TABLE class="sectionMacroWithBorder" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" rel="nofollow">License </A><BR>
+<A href="sca-java-get-involved.html" title="SCA Java Get Involved">Get Involved</A><BR>
+<A href="sca-java-found-a-bug.html" title="SCA Java Found A Bug">Found a Bug?</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>SCA Java</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-java.html" title="SCA Java">SCA Java Home</A><BR>
+<A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-java-releases.html" title="SCA Java Releases">Downloads</A><BR>
+<A href="java-sca-documentation-menu.html" title="Java SCA Documentation Menu">Documentation</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">SCA Dashboard</A><BR>
+<A href="java-sca-tools.html" title="Java SCA Tools">Tools </A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.x/" rel="nofollow">1.x Source Code</A><BR>
+<A href="https://svn.apache.org/repos/asf/tuscany/java/sca/" rel="nofollow">2.x Source Code</A><BR>
+<A href="http://tinyurl.com/8rlxd3" rel="nofollow">Roadmap</A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H1><A name="TuscanyWARDistribution-TuscanyWARDistribution"></A>Tuscany WAR Distribution</H1>
+
+
+</TD></TR></TBODY></TABLE>
+
+            </DIV>
+
+        </DIV>
+
+    </DIV>
+
+
+                </TD>
+
+            </TR>
+
+        </TABLE>
+
+
+
+        
+    
+    <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+
+    </SCRIPT>
+
+    <SCRIPT type="text/javascript">
+
+       _uacct = "UA-1174707-5";
+
+       urchinTracker();
+
+    </SCRIPT>
+
+    
+
+    
+    <A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+
+
+    <DIV class="footer">
+
+        Copyright &copy; 2003-2008, The Apache Software Foundation&nbsp;&nbsp;
+
+    </DIV>
+
+
+
+
+    </BODY>
+
+</HTML>
diff --git a/site/trunk/site-publish/tuscany-website-development-guideline.html b/site/trunk/site-publish/tuscany-website-development-guideline.html
new file mode 100644
index 0000000000..9435511c7e
--- /dev/null
+++ b/site/trunk/site-publish/tuscany-website-development-guideline.html
@@ -0,0 +1,88 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Tuscany Website Development Guideline : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=56590">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany Website Development Guideline">Tuscany Website Development Guideline</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="TuscanyWebsiteDevelopmentGuideline-WikiversusWebsite"></A>Wiki versus Website</H1>
+
+<H1><A name="TuscanyWebsiteDevelopmentGuideline-WikiLayout"></A>Wiki Layout</H1>
+
+
+
+<H1><A name="TuscanyWebsiteDevelopmentGuideline-Namingconvention"></A>Naming convention</H1>
+
+
+
+<H1><A name="TuscanyWebsiteDevelopmentGuideline-HowtodeploytoWikitothewebsite%3F"></A>How to deploy to Wiki to the website?</H1>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscanydownloads2.html b/site/trunk/site-publish/tuscanydownloads2.html
new file mode 100644
index 0000000000..f3bb5464ba
--- /dev/null
+++ b/site/trunk/site-publish/tuscanydownloads2.html
@@ -0,0 +1,116 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://people.apache.org/~svkrish/tuscanySite/style/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>Tuscany+Downloads2 : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://people.apache.org/~svkrish/tuscanySite/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=55409">
+                    <IMG src="http://people.apache.org/~svkrish/tuscanySite/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany+Downloads2">Tuscany+Downloads2</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="tuscany-sca-java-faq.html" title="Tuscany SCA Java - FAQ">FAQ</A><BR>
+<A href="sca-downloads.html" title="SCA Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Whats%20New&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Whats New" class="createlink">What's New?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Guides</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><A href="sca-java-user-guide.html" title="SCA Java User Guide">User Guide</A><BR>
+<A href="sca-java-architecture-guide.html" title="SCA Java Architecture Guide">Architecture Guide</A><BR>
+<A href="sca-java-development-guide.html" title="SCA Java Development Guide">Developer Guide</A><BR>
+<A href="sca-java-extension-developer-guide.html" title="SCA Java Extension Developer Guide">Extension development Guide</A></P>
+</DIV></DIV>
+
+<DIV class="panel" style="border-style: solid; border-color: #b4b4b5; "><DIV class="panelHeader" style="border-bottom-style: solid; border-bottom-color: #b4b4b5; background-color: #C3CDA1; "><B>Development</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1; ">
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=SCA%20Java%20Doc&linkCreation=true&fromPageId=47581" title="Create Page: SCA Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/java/sca" title="Visit page outside Confluence" rel="nofollow">Java SCA Source <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Project</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+<TH class="confluenceTh">&nbsp;</TH>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20SCA&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 Java SCA" class="createlink">Java SCA 0.90 (June 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/RELEASE_NOTES" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sca/0.90-incubating/distribution/src/main/release/CHANGES" title="Visit page outside Confluence" rel="nofollow">Changes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20SDO&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 Java SDO" class="createlink">Java SDO 1.0 Beta1 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/sdo/1.0-incubating-beta1/sdo/distribution/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20Java%20DAS&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 Java DAS" class="createlink">Java DAS M2 (Nov 2006)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/java/das/1.0-incubator-M2/RELEASE_NOTES.txt" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20Native&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 C++ Native" class="createlink">C++ Native M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/native-sca-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+<TR>
+<TD class="confluenceTd"><B><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Tuscany%20Downloads2%20C%2B%2B%20SDO&linkCreation=true&fromPageId=55409" title="Create Page: Tuscany Downloads2 C++ SDO" class="createlink">C++ SDO M3 (May 2007)<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></B></TD>
+<TD class="confluenceTd"><SPAN class="nobr"><A href="https://svn.apache.org/repos/asf/incubator/tuscany/tags/cpp-sdo-1.0.incubating-M3/README" title="Visit page outside Confluence" rel="nofollow">Release Notes<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></TD>
+</TR>
+</TBODY></TABLE>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+            <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif b/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif
new file mode 100644
index 0000000000..4c5e5b7d71
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif.jpeg
new file mode 100644
index 0000000000..96d37e319d
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons150.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg b/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg
new file mode 100644
index 0000000000..02e36462f4
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg.jpeg
new file mode 100644
index 0000000000..50bcbc463c
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons150.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif b/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif
new file mode 100644
index 0000000000..e85dbf7c7f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif.jpeg
new file mode 100644
index 0000000000..4e9255fc41
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Balloons300.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg b/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg
new file mode 100644
index 0000000000..6fdf98ae17
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg.jpeg
new file mode 100644
index 0000000000..4abb81c617
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Bell_Tower_Image.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake150.gif b/site/trunk/site-publish/tuscanylogos.data/Cake150.gif
new file mode 100644
index 0000000000..e2d07eaec4
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake150.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake150.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Cake150.gif.jpeg
new file mode 100644
index 0000000000..9ead20de2f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake150.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg b/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg
new file mode 100644
index 0000000000..3ab1e237f1
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg.jpeg
new file mode 100644
index 0000000000..21832655aa
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake150.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake300.gif b/site/trunk/site-publish/tuscanylogos.data/Cake300.gif
new file mode 100644
index 0000000000..d620678711
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake300.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Cake300.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Cake300.gif.jpeg
new file mode 100644
index 0000000000..3374897b61
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Cake300.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif
new file mode 100644
index 0000000000..5e61b26dba
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif.jpeg
new file mode 100644
index 0000000000..8327f81e62
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg
new file mode 100644
index 0000000000..4aa37d633f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg.jpeg
new file mode 100644
index 0000000000..ddb7f24238
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog150.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif
new file mode 100644
index 0000000000..974728c19f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif.jpeg
new file mode 100644
index 0000000000..74d0a86f8b
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/HappyBirthdayDog300.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat150.gif b/site/trunk/site-publish/tuscanylogos.data/Hat150.gif
new file mode 100644
index 0000000000..332dcf9ca0
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat150.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat150.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Hat150.gif.jpeg
new file mode 100644
index 0000000000..1de254f350
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat150.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg b/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg
new file mode 100644
index 0000000000..b5af7f62c5
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg.jpeg
new file mode 100644
index 0000000000..2465bce7d9
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat150.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat300.gif b/site/trunk/site-publish/tuscanylogos.data/Hat300.gif
new file mode 100644
index 0000000000..2896db5d0b
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat300.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Hat300.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Hat300.gif.jpeg
new file mode 100644
index 0000000000..6047cc84e3
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Hat300.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present150.gif b/site/trunk/site-publish/tuscanylogos.data/Present150.gif
new file mode 100644
index 0000000000..59bc0cebb1
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present150.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present150.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Present150.gif.jpeg
new file mode 100644
index 0000000000..b30e7a4c83
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present150.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present150.jpg b/site/trunk/site-publish/tuscanylogos.data/Present150.jpg
new file mode 100644
index 0000000000..5a7907794f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present150.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present150.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Present150.jpg.jpeg
new file mode 100644
index 0000000000..43523ad6c5
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present150.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present300.gif b/site/trunk/site-publish/tuscanylogos.data/Present300.gif
new file mode 100644
index 0000000000..9aa1d62af7
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present300.gif
diff --git a/site/trunk/site-publish/tuscanylogos.data/Present300.gif.jpeg b/site/trunk/site-publish/tuscanylogos.data/Present300.gif.jpeg
new file mode 100644
index 0000000000..a0fda8ec4f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Present300.gif.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg b/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg
new file mode 100644
index 0000000000..826e643cf5
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg.jpeg
new file mode 100644
index 0000000000..ec1a0a2280
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/Road-with-Cypress-Tree-Sun-and-Moon.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg
new file mode 100644
index 0000000000..877467f788
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg.jpeg
new file mode 100644
index 0000000000..e26cd5c0ef
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo100.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg
new file mode 100644
index 0000000000..ab46d3c826
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg.jpeg
new file mode 100644
index 0000000000..db13a33352
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo200.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg
new file mode 100644
index 0000000000..0a4838874c
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg.jpeg
new file mode 100644
index 0000000000..557d1cb3be
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo400.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg
new file mode 100644
index 0000000000..191c8d841b
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg.jpeg
new file mode 100644
index 0000000000..99cdda75f0
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogo800.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg
new file mode 100644
index 0000000000..0747953309
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg.jpeg
new file mode 100644
index 0000000000..bb36606fd0
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoBalloons.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg
new file mode 100644
index 0000000000..824ddd0b47
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg.jpeg
new file mode 100644
index 0000000000..54ad9f7a9f
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoCake.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg
new file mode 100644
index 0000000000..bed7ad3245
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg.jpeg
new file mode 100644
index 0000000000..939d72348d
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoHat.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg
new file mode 100644
index 0000000000..3a31139098
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg.jpeg
new file mode 100644
index 0000000000..6e9fe8ded8
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoNEW.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png
new file mode 100644
index 0000000000..6601545ff0
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png.jpeg
new file mode 100644
index 0000000000..9b7a2f64c2
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoOLD.png.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg
new file mode 100644
index 0000000000..52df8d5930
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg.jpeg
new file mode 100644
index 0000000000..239a3d630d
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoPresent.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg
new file mode 100644
index 0000000000..9c18137656
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg.jpeg
new file mode 100644
index 0000000000..8101502449
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyLogoSmall.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg b/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg
new file mode 100644
index 0000000000..dd97115646
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg
diff --git a/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg.jpeg b/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg.jpeg
new file mode 100644
index 0000000000..ce8653fdde
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.data/TuscanyTower.jpg.jpeg
diff --git a/site/trunk/site-publish/tuscanylogos.html b/site/trunk/site-publish/tuscanylogos.html
new file mode 100644
index 0000000000..1f2e99c6d8
--- /dev/null
+++ b/site/trunk/site-publish/tuscanylogos.html
@@ -0,0 +1,138 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : TuscanyLogos</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54321">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="general-info.html" title="General Info">General Info</A>&nbsp;&gt;&nbsp;<A href="" title="TuscanyLogos">TuscanyLogos</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H2><A name="TuscanyLogos-TuscanyLogosinVariousSizes"></A>Tuscany Logos in Various Sizes</H2>
+<P><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogo800.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogo400.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogo200.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogo100.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyLogos-TuscanyLogo1"></A>Tuscany Logo 1</H2>
+
+<P><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoNEW.jpg" style="border: 0px solid black"></SPAN></P>
+
+<P><B>Small version of new logo</B><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoSmall.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyLogos-TuscanyLogo2"></A>Tuscany Logo 2</H2>
+<P><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyTower.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyLogos-TuscanLogo3%28fromlastyear%29"></A>Tuscan Logo3 (from last year)</H2>
+<P><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoOLD.png" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyLogos-BellTowerImage"></A>Bell Tower Image</H2>
+<P><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Bell_Tower_Image.jpg" style="border: 0px solid black"></SPAN></P>
+
+<H2><A name="TuscanyLogos-AnniversaryLogos"></A>Anniversary Logos</H2>
+<P>To celebrate Tuscany's 3rd birthday (2008-12-07), we created a number of logos to place around the site.<BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoBalloons.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoCake.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoHat.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/TuscanyLogoPresent.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Balloons150.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Cake150.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Hat150.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Present150.jpg" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/HappyBirthdayDog150.jpg" style="border: 0px solid black"></SPAN><BR>
+<SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Balloons150.gif" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Cake150.gif" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Hat150.gif" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/Present150.gif" style="border: 0px solid black"></SPAN><SPAN class="image-wrap" style=""><IMG src="tuscanylogos.data/HappyBirthdayDog150.gif" style="border: 0px solid black"></SPAN></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/tuscanytuscanyjavadas-java-overviewimproved-logging.html b/site/trunk/site-publish/tuscanytuscanyjavadas-java-overviewimproved-logging.html
new file mode 100644
index 0000000000..0db676e83a
--- /dev/null
+++ b/site/trunk/site-publish/tuscanytuscanyjavadas-java-overviewimproved-logging.html
@@ -0,0 +1,183 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Tuscany.TuscanyJava.DAS Java Overview.Improved logging</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52840">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Tuscany.TuscanyJava.DAS Java Overview.Improved logging">Tuscany.TuscanyJava.DAS Java Overview.Improved logging</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="Tuscany.TuscanyJava.DASJavaOverview.Improvedlogging-Tuscany%2FTuscanyJava%2FDASJavaOverview%2FImprovedlogging"></A>Tuscany/TuscanyJava/DAS Java Overview/Improved logging</H1>
+
+
+<H3><A name="Tuscany.TuscanyJava.DASJavaOverview.Improvedlogging-LoggingOverview"></A>Logging Overview</H3>
+
+<P><B>Overview</B></P>
+<UL>
+	<LI>Tuscany DAS uses log4J as its logging mechanism. For more information and complete documentation on log4j, please visit their website (<A href="http://logging.apache.org/log4j/docs/" class="external-link" rel="nofollow">http://logging.apache.org/log4j/docs/</A>)</LI>
+</UL>
+
+
+<P><B>Using log while contributting for Tuscany DAS code</B></P>
+<UL>
+	<LI>While contributing to DAS code, please follow the following guidelines to add logging to your class
+<BR class="atl-forced-newline">
+<EM>Instantiate a logger</EM>
+<BR class="atl-forced-newline">
+&#45; There is a logger factory available in org.apache.tuscany.das.rdb.util - To use it
+	<UL>
+		<LI>private final Logger logger = LoggerFactory.INSTANCE.getLogger(MappingWrapper.class);</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>&#45; To instrument your code with logging capabilities</P>
+<UL>
+	<LI>
+	<UL>
+		<LI>if(this.logger.isDebugEnabled())
+		<UL>
+			<LI>this.logger.debug(&quot;your debug message&quot;);</LI>
+		</UL>
+		</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P>Note: As a performance enhancement, please surround your debug code with a check to see if debug is enabled or not.</P>
+
+<P><B>Configuring DAS logging (log4j)</B></P>
+<UL>
+	<LI><EM>Configuring with Tomcat</EM>
+<BR class="atl-forced-newline">
+There are two ways to configure log4j in Tomcat :
+	<UL>
+		<LI>&#45; Having a global log4j.properties inside %CATALINA_HOME%\common\classes
+<BR class="atl-forced-newline">
+&#45; Having a global log4j.properties inside your own web app at WEB-INF\classes</LI>
+	</UL>
+	</LI>
+</UL>
+
+
+<P><B>Sample log4j.properties</B></P>
+
+<P>&#35; Set root logger level to DEBUG and its only appender to A1.</P>
+
+<P>log4j.rootLogger=INFO, A1</P>
+
+<P>&#35; A1 is set to be a ConsoleAppender.</P>
+
+<P>log4j.appender.A1=org.apache.log4j.ConsoleAppender</P>
+
+<P>&#35; A1 uses PatternLayout.</P>
+
+<P>log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n</P>
+
+<P>&#35; Print only messages of level WARN or above in the package com.foo.</P>
+
+<P>log4j.logger.org.apache.tuscany=OFF &#42;&#42; For further information, please follow the link : <A href="http://tomcat.apache.org/faq/logging.html" class="external-link" rel="nofollow">Tomcat FAQ - Logging</A></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/user-guide.html b/site/trunk/site-publish/user-guide.html
new file mode 100644
index 0000000000..2956f860c9
--- /dev/null
+++ b/site/trunk/site-publish/user-guide.html
@@ -0,0 +1,151 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>User Guide</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="index.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="sca-java.html" title="SCA Java">SCA Java</A>&nbsp;&gt;&nbsp;<A href="" title="User Guide">User Guide</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">User Guide</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44873">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=44873">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44873">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=44873">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44873">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=44873">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=danmurphy">Dan Murphy</A> on Feb 09, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=44873&originalId=45029">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          
+<P>Welcome to the Apache Tuscany SCA User guide. Here you will find information aimed to help you develop SCA components and applications using Tuscany's Java SCA implementation.</P>
+
+<P>This is a work in progress, so please contribute and comment so we can make this valuable to you</P>
+
+<UL><LI><A href="getting-tuscanys-java-sca-implementation.html" title="Getting Tuscany's Java SCA Implementation">Getting Tuscany's Java SCA Implementation</A></LI><LI><A href="setting-up-an-sca-developer-environment.html" title="Setting up an &quot;SCA Developer&quot; environment">Setting up an &quot;SCA Developer&quot; environment</A></LI><LI><A href="composing-components-into-composites.html" title="Composing components into Composites">Composing components into Composites</A></LI><LI><A href="deploying-to-server-runtime.html" title="Deploying to server runtime">Deploying to server runtime</A></LI><LI><A href="running-the-samples.html" title="Running the samples">Running the samples</A></LI><LI><A href="introduction.html" title="Introduction">Introduction</A></LI></UL>
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="getting-tuscanys-java-sca-implementation.html" title="Getting Tuscany's Java SCA Implementation">Getting Tuscany's Java SCA Implementation</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="setting-up-an-sca-developer-environment.html" title="Setting up an &quot;SCA Developer&quot; environment">Setting up an &quot;SCA Developer&quot; environment</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="composing-components-into-composites.html" title="Composing components into Composites">Composing components into Composites</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="deploying-to-server-runtime.html" title="Deploying to server runtime">Deploying to server runtime</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="running-the-samples.html" title="Running the samples">Running the samples</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                          <A href="introduction.html" title="Introduction">Introduction</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/using-sdo-java.html b/site/trunk/site-publish/using-sdo-java.html
new file mode 100644
index 0000000000..0618268911
--- /dev/null
+++ b/site/trunk/site-publish/using-sdo-java.html
@@ -0,0 +1,147 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
+    <STYLE type="text/css">
+      .footer {
+        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </STYLE>
+    <SCRIPT type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </SCRIPT>
+    <TITLE>Using SDO Java</TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+      <TR class="topBar">
+        <TD align="left" valign="middle" class="topBarDiv" nowrap="">
+          &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sdo-java.html" title="SDO Java">SDO Java</A>&nbsp;&gt;&nbsp;<A href="" title="Using SDO Java">Using SDO Java</A>
+        </TD>
+        <TD align="right" valign="middle" nowrap="">
+          <FORM name="search" action="http://www.google.com/search" method="get">
+            <INPUT type="hidden" name="ie" value="UTF-8">
+            <INPUT type="hidden" name="oe" value="UTF-8">
+            <INPUT type="hidden" name="domains" value="">
+            <INPUT type="hidden" name="sitesearch" value="">
+            <INPUT type="text" name="q" maxlength="255" value="">        
+            <INPUT type="submit" name="btnG" value="Google Search">
+          </FORM>
+        </TD>
+      </TR> 
+    </TABLE>
+
+    <DIV id="PageContent">
+      <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Tuscany</DIV>
+        <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Using SDO Java</DIV>
+
+        <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+          <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=48494">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=48494">Edit Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+            <A href="http://cwiki.apache.org/confluence/pages/listpages.action?key=TUSCANY">Browse Space</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=48494">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&fromPageId=48494">Add Page</A>
+          &nbsp;
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=48494">
+            <IMG src="http://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+          <A href="http://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=TUSCANY&fromPageId=48494">Add News</A>
+        </DIV>
+      </DIV>
+      <DIV class="pagesubheading" style="margin: 0px 10px 0px 10px;">
+                    Added by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=kelvingoodson@apache.org">kelvin goodson</A>, last edited by     <A href="http://cwiki.apache.org/confluence/users/viewuserprofile.action?username=haleh">haleh mahbod</A> on Apr 06, 2007
+                      &nbsp;(<A href="http://cwiki.apache.org/confluence/pages/diffpages.action?pageId=48494&originalId=51002">view change</A>)
+              
+      </DIV>
+
+      <DIV class="pagecontent">
+        <DIV class="wiki-content">
+          <H3><A name="UsingSDOJava-GettingStartedwithusingSDOJava"></A>Getting Started with using SDO Java</H3>
+<P><SPAN class="error">&#91;Note: This could be part of user guide. If agreed, let's move it&#93;</SPAN></P>
+
+<P>As an SDO user,  you have (at least) three ways of establishing a Tuscany SDO runtime environment on your machine.  In decreasing order of likelihood, you can either </P>
+<UL>
+	<LI><A href="sdo-java-download.html" title="SDO Java Download">download</A> a binary distribution of a Tuscany Java SDO milestone release, and follow the instructions in the release archive</LI>
+	<LI>Or you can <A href="getting-source.html" title="Getting Source">download</A> a Tuscany source distribution, and follow the instruction in the release archive to recreate the corresponding binary release</LI>
+	<LI>or you can <A href="getting-source.html" title="Getting Source">build from the svn repository</A> source code, giving you the flexibility to base your runtime on the most recent code, or a particular level of your choice.</LI>
+</UL>
+
+
+<P>If you are going to take either of the latter two approaches you will need to <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">establish a development environment</A>.</P>
+
+<P>For examples of how to use SDO, you can look at the <A href="sdo-java-documents.html" title="SDO Java Documents">documents</A> or at the samples.  If you have downloaded the source distribution, the sample code will be part of that distribution.  If however you have downloaded a binary distribution,  you'll need to go and <SPAN class="nobr"><A href="http://incubator.apache.org/tuscany/sca_downloads.html" title="Visit page outside Confluence" rel="nofollow">download<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> the sample source code as a separate archive.</P>
+
+<P>Other sources of inspiration might come from the use of SDO within the Tuscany DAS and SCA code.  When you come across issues, please look at and/or post to the Tuscany <A href="mailing-lists.html" title="Mailing Lists">mailing lists</A>.</P>
+
+        </DIV>
+
+                  <DIV class="tabletitle">
+            Children
+            <SPAN class="smalltext" id="show" style="display: inline;">
+              <A href="javascript:showChildren()">Show Children</A></SPAN>
+            <SPAN class="smalltext" id="hide" style="display: none;">
+              <A href="javascript:hideChildren()">Hide Children</A></SPAN>
+          </DIV>
+          <DIV class="greybox" id="children" style="display: none;">
+                                      <A href="set-up-sdo-development-environment.html" title="Set up SDO Development Environment">Set up SDO Development Environment</A>
+              <SPAN class="smalltext">(Apache Tuscany)</SPAN>
+              <BR>
+                      </DIV>
+        
+      </DIV>
+    </DIV>
+    <DIV class="footer">
+      Generated by
+      <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 2.2.9 Build: 527 Sep 07, 2006)
+      <A href="http://could.it/autoexport/">AutoExport Plugin</A> (Version: Unknown - PluginManager Error)
+    </DIV>
+  </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/web-sample.html b/site/trunk/site-publish/web-sample.html
new file mode 100644
index 0000000000..b9f96d098f
--- /dev/null
+++ b/site/trunk/site-publish/web-sample.html
@@ -0,0 +1,204 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Web Sample</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=53946">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Web Sample">Web Sample</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WebSample-TuscanyRDBDASSample%28companyweb%29"></A>Tuscany RDB DAS Sample (companyweb)</H1>
+
+<P>This stand-alone sample demonstrates the SDO RDB Data Access Service in the context of a simple web application.</P>
+
+<P>The application starts with a canned database of Companies and their related Departments.  Through the web page interface, a user can:</P>
+
+<UL>
+	<LI>Display all Companies in the database</LI>
+	<LI>Display all Companies and related Departments</LI>
+	<LI>Add a new Department to a Company</LI>
+	<LI>Delete all Departments from a Company</LI>
+	<LI>Change the names of Departments in a Company</LI>
+</UL>
+
+
+<P>So, this simple application covers all CRUD operations as well as the some relationship manipulation (adding a Department associates that Department with the Company).  The sample runs on Tomcat 5.5/6.x and employs a Derby database accessed via a DataSource.</P>
+
+<H3><A name="WebSample-Runningthesample"></A>Running the sample</H3>
+<P>There are two options for running this sample:</P>
+
+<OL>
+	<LI>Run from Tomcat configured by the build</LI>
+	<LI>Deploying the CompanyWeb WAR into a Tomcat you configure yourself</LI>
+</OL>
+
+
+
+<P> 1. Running from Tomcat configured by the build<BR>
+This sample application is deployed (along with the canned test database) to an instance of Tomcat as part of our automated sample testing.  This means you can run the java/das/samples/testing/tomcat build (see java/das/samples/testing/tomcat/readme.htm )  and then access the application by pointing your browser to <A href="http://localhost:8080/sample-companyweb/" class="external-link" rel="nofollow">http://localhost:8080/sample-companyweb/</A>.  </P>
+
+
+<P> 2. Deploying the CompanyWeb WAR into a Tomcat you configure yourself<BR>
+Alternatively, you can deploy the sample to your own configured Tomcat installation by following the <BR>
+instructions below.  These instructions assume that you have either 1) downloaded the Tuscany sample distribution or 2) Downloaded the Tuscany source and 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" class="external-link" rel="nofollow">http://incubator.apache.org/tuscany/java_das_overview.html</A> .</P>
+
+<H3><A name="WebSample-SetUp"></A>Set Up</H3>
+
+<OL>
+	<LI>Download and install the most recent stable version of Tomcat 5.5.  You can find it here:<BR>
+         <A href="http://tomcat.apache.org/download-55.cgi" class="external-link" rel="nofollow">http://tomcat.apache.org/download-55.cgi</A></LI>
+	<LI>Download the most recent official release of Derby from here: <A href="http://db.apache.org/derby/index.html" class="external-link" rel="nofollow">http://db.apache.org/derby/index.html</A>.<BR>
+         The only file you'll need from this download is derby.jar</LI>
+	<LI>Stop Tomcat</LI>
+	<LI>Copy derby.jar (from the derby distribution) to <EM>Tomcat_Home</EM>/common/lib</LI>
+	<LI>Add the sample war file to <EM>Tomcat_Home</EM>/webapps<BR>
+              a.sample-companyweb-xxx.war (e.g. &quot;sample-companyweb-1.0-incubator-M2.war&quot;)</LI>
+	<LI>Install the canned Derby database to Tomcat:<BR>
+              a.First, create a new directory named &quot;Databases&quot; to hold the sample database.Create  <BR>
+              Tomcat_Home / Databases<BR>
+              b.Copy the dastest folder (and all its contents) from (_build directory root OR where samples <BR>
+              were unzipped_/java/das/samples/companyweb) to <EM>Tomcat_Home</EM>/Databases (NOTE: If you are running <BR>
+              this from a sample distribution, the canned database is available in the distribution, inside <BR>
+              the databases directory. )         </LI>
+	<LI>Define a DataSource by adding a datasource definition to <EM>Tomcat_Home</EM>/conf/server.xml.<BR>
+             a.Find the end-of-section marker &lt;/GlobalNamingResources&gt; and add the following lines just above <BR>
+             it: (Requirement: You must include the absolute path to the &quot;Databases&quot; directory in the above url<BR>
+             attribute.  Fore example: url=&quot;jdbc:derby:c:\apache-tomcat-5.5.17\Databases/dastest&quot;/&gt;)
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>        &lt;!-- Global Datasource for Derby dastest database --&gt;
+         &lt;Resource name=&quot;jdbc/dastest&quot;
+              type=&quot;javax.sql.DataSource&quot;  auth=&quot;Container&quot;
+              description=&quot;Derby database for DAS Company sample&quot;
+              maxActive=&quot;100&quot; maxIdle=&quot;30&quot; maxWait=&quot;10000&quot;
+              username=&quot;&quot; password=&quot;&quot; 
+              driverClassName=&quot;org.apache.derby.jdbc.EmbeddedDriver&quot;
+              url=&quot;jdbc:derby:{absolute path}Databases/dastest&quot;/&gt;
+</PRE>
+</DIV></DIV></LI>
+	<LI>Start tomcat and point your browser to: <A href="http://localhost:8080/sample-companyweb-" class="external-link" rel="nofollow">http://localhost:8080/sample-companyweb-</A> <EM>version</EM> <EM>tag</EM>/<BR>
+         example: <A href="http://localhost:8080/sample-companyweb-1.0-incubator-M2/" class="external-link" rel="nofollow">http://localhost:8080/sample-companyweb-1.0-incubator-M2/</A></LI>
+</OL>
+
+
+<H3><A name="WebSample-SampleArchitecture"></A>Sample Architecture</H3>
+<P>This is a simple, single-page, web application.  The main components of this application are:</P>
+<UL>
+	<LI>The RDB Data Access Service (DAS)</LI>
+	<LI>SDO</LI>
+	<LI>CompanyClient.java</LI>
+	<LI>Company.jsp</LI>
+	<LI>The canned Derby database</LI>
+</UL>
+
+
+<P>The CompanyClient uses the DAS directly and provides high-level services to the jsp such as:<BR>
+public final List getCompanies()<BR>
+This is a good place to look for how you might use the DAS in your own application.</P>
+
+<P>The Company.jsp responds to client interaction by invoking services of the CompanyClient.  It receives data from the CompanyClient as SDO data graphs and manipulates SDOs directly to display data.</P>
+
+<P>The canned Derby database comes preloaded with Companies and related Departments.  The Derby database instance is a simple file folder.</P>
+
+<P>The DAS accepts directives (commands) from the CompanyClient and reads and writes to the derby database instance appropriately. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/whats-new-in-das-java.html b/site/trunk/site-publish/whats-new-in-das-java.html
new file mode 100644
index 0000000000..367541c083
--- /dev/null
+++ b/site/trunk/site-publish/whats-new-in-das-java.html
@@ -0,0 +1,137 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : What's New in DAS JAVA</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51174">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="" title="What's New in DAS JAVA">What's New in DAS JAVA</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="What%27sNewinDASJAVA-NewFeatures%28DASM3%29"></A>New Features (DAS M3)</H1>
+
+<H3><A name="What%27sNewinDASJAVA-DASusesoverqualifiedupdatebydefault"></A>DAS uses overqualified update by default</H3>
+
+<P>Currently in the DAS we either use a user-defined version column or do not use any concurrency control. We have enough information to build an overqualified update in cases where a version column is not defined. For example, if a field &quot;name&quot; is changed from &quot;Bob&quot; to &quot;John&quot;, we would generate a query such as:<BR>
+UPDATE CUSTOMER SET NAME = 'John' WHERE ID = 1 AND NAME = 'Bob'</P>
+
+<P>If the statement does not update any rows in the database, the DAS will throw a concurrency control exception. </P>
+
+<P>This scheme will not work in case of LONG VARCHAR, BLOB, or CLOB columns, so an exception should be thrown in that case indicating that a version column must be defined. </P>
+
+<H3><A name="What%27sNewinDASJAVA-DASConfigurationsupportsConnectionInfoforJ2SEenvironment"></A>DAS Configuration supports ConnectionInfo for J2SE environment</H3>
+
+<P>So far the DAS allowed users to specify a JDBC Connection for the DAS to utilize by either providing a JDBC Connection explicitly or providing a JNDI name in the config file. Now DAS supports DriverManager info to be provided to allow similar, config-based set up, in a J2SE environment.</P>
+
+<H3><A name="What%27sNewinDASJAVA-CreationandinitializationofdatabaseforDASsamples"></A>Creation and initialization of database for DAS samples</H3>
+
+<P>So far, the DAS samples provided canned database with them. This feature is an useful utility which supports an external configuration based creation and initialization of database when sample is loaded for the first time. User can design the database schema using the external configuration.</P>
+
+<H3><A name="What%27sNewinDASJAVA-DASsupportsqueriesthatreferencetablesinmultipleschema"></A>DAS supports queries that reference tables in multiple schema</H3>
+
+<P>So far DAS did not support multiple database schema. This feature allows DAS to execute all commands for tables in different schema.</P>
+
+<H3><A name="What%27sNewinDASJAVA-AdvancedDASfeaturesDemo"></A>Advanced DAS features Demo</H3>
+
+<P>This is not a few feature in itself but a new sample demonstrating multiple advanced features in DAS like optimistic concurrency control, column converter, result set shape...New features will keep getting added to this in future.</P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/whats-new-in-das.html b/site/trunk/site-publish/whats-new-in-das.html
new file mode 100644
index 0000000000..eebd7d4aa9
--- /dev/null
+++ b/site/trunk/site-publish/whats-new-in-das.html
@@ -0,0 +1,103 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>What's New in DAS : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51174">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="What's New in DAS">What's New in DAS</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <H1><A name="What%27sNewinDAS-NewFeatures%28DASM3%29"></A>New Features (DAS M3)</H1>
+
+<H3><A name="What%27sNewinDAS-DASusesoverqualifiedupdatebydefault"></A>DAS uses overqualified update by default</H3>
+
+<P>Currently in the DAS we either use a user-defined version column or do not use any concurrency control. We have enough information to build an overqualified update in cases where a version column is not defined. For example, if a field &quot;name&quot; is changed from &quot;Bob&quot; to &quot;John&quot;, we would generate a query such as:<BR>
+UPDATE CUSTOMER SET NAME = 'John' WHERE ID = 1 AND NAME = 'Bob'</P>
+
+<P>If the statement does not update any rows in the database, the DAS will throw a concurrency control exception. </P>
+
+<P>This scheme will not work in case of LONG VARCHAR, BLOB, or CLOB columns, so an exception should be thrown in that case indicating that a version column must be defined. </P>
+
+<H3><A name="What%27sNewinDAS-DASConfigurationsupportsConnectionInfoforJ2SEenvironment"></A>DAS Configuration supports ConnectionInfo for J2SE environment</H3>
+
+<P>So far the DAS allowed users to specify a JDBC Connection for the DAS to utilize by either providing a JDBC Connection explicitly or providing a JNDI name in the config file. Now DAS supports DriverManager info to be provided to allow similar, config-based set up, in a J2SE environment.</P>
+
+<H3><A name="What%27sNewinDAS-CreationandinitializationofdatabaseforDASsamples"></A>Creation and initialization of database for DAS samples</H3>
+
+<P>So far, the DAS samples provided canned database with them. This feature is an useful utility which supports an external configuration based creation and initialization of database when sample is loaded for the first time. User can design the database schema using the external configuration.</P>
+
+<H3><A name="What%27sNewinDAS-DASsupportsqueriesthatreferencetablesinmultipleschema"></A>DAS supports queries that reference tables in multiple schema</H3>
+
+<P>So far DAS did not support multiple database schema. This feature allows DAS to execute all commands for tables in different schema.</P>
+
+<H3><A name="What%27sNewinDAS-AdvancedDASfeaturesDemo"></A>Advanced DAS features Demo</H3>
+
+<P>This is not a few feature in itself but a new sample demonstrating multiple advanced features in DAS like optimistic concurrency control, column converter, result set shape...New features will keep getting added to this in future.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/whats-new-sca-java.html b/site/trunk/site-publish/whats-new-sca-java.html
new file mode 100644
index 0000000000..59c24663fd
--- /dev/null
+++ b/site/trunk/site-publish/whats-new-sca-java.html
@@ -0,0 +1,117 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : What's New SCA JAVA</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51138">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="sca-general-menu.html" title="SCA General Menu">SCA General Menu</A>&nbsp;&gt;&nbsp;<A href="java-sca-menu.html" title="Java SCA Menu">Java SCA Menu</A>&nbsp;&gt;&nbsp;<A href="" title="What's New SCA JAVA">What's New SCA JAVA</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H3><A name="What%27sNewSCAJAVA-Whatisthecommunityworkingtowards%3F"></A>What is the community working towards?</H3>
+
+<P>We are begining to build content for the next release of SCA JAVA at this <A href="http://cwiki.apache.org/confluence/display/TUSCANY/Java%20SCA%20Next%20Release%20Contents" class="external-link" rel="nofollow">wiki location</A>.  </P>
+
+<P>There is also discussion going on the mailing list. <BR>
+Please join us to help develop content or provide feedback to enhance Apache Tuscany. Thank you. <IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/whats-new.html b/site/trunk/site-publish/whats-new.html
new file mode 100644
index 0000000000..a3943815f7
--- /dev/null
+++ b/site/trunk/site-publish/whats-new.html
@@ -0,0 +1,78 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/pages/$images/favicon.ico">   
+        <TITLE>What's new? : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=51126">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="sca-overview.html" title="SCA Overview">SCA Overview</A>&nbsp;&gt;&nbsp;<A href="sca-native-subproject.html" title="SCA Native Subproject">SCA Native Subproject</A>&nbsp;&gt;&nbsp;<A href="" title="What's new?">What's new?</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <P>Work is going on to make the next release of native SCA/SDO available. Please see this <SPAN class="nobr"><A href="http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg15640.html" title="Visit page outside Confluence" rel="nofollow">email thread<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> for more detail.</P>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
diff --git a/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.pdf b/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.pdf
new file mode 100644
index 0000000000..6d5d642af3
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.pdf
diff --git a/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.ppt b/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.ppt
new file mode 100644
index 0000000000..9845ebf10c
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.data/Getting Involved In Apache Projects.ppt
diff --git a/site/trunk/site-publish/working-in-open-source.data/Learning Open Source.pdf b/site/trunk/site-publish/working-in-open-source.data/Learning Open Source.pdf
new file mode 100644
index 0000000000..a64b4d288c
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.data/Learning Open Source.pdf
diff --git a/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.pdf b/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.pdf
new file mode 100644
index 0000000000..c9c1d670f1
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.pdf
diff --git a/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.ppt b/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.ppt
new file mode 100644
index 0000000000..66929b1137
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.data/Working With Apache Tuscany-workshop.ppt
diff --git a/site/trunk/site-publish/working-in-open-source.html b/site/trunk/site-publish/working-in-open-source.html
new file mode 100644
index 0000000000..f16865ca17
--- /dev/null
+++ b/site/trunk/site-publish/working-in-open-source.html
@@ -0,0 +1,186 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : Working In Open Source</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=95644">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="menus.html" title="Menus">Menus</A>&nbsp;&gt;&nbsp;<A href="general.html" title="General">General</A>&nbsp;&gt;&nbsp;<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Tuscany Downloads &amp; Documentations</A>&nbsp;&gt;&nbsp;<A href="" title="Working In Open Source">Working In Open Source</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="15%">
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #C3CDA1;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #C3CDA1;background-color: #C3CDA1;"><B>General</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="home.html" title="Home">Home</A><BR>
+<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License </A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Downloads</A><BR>
+<A href="tuscany-downloads-documentations.html" title="Tuscany Downloads & Documentations">Documentation</A><BR>
+<A href="tuscany-books-and-articles.html" title="Tuscany Books and Articles">Books and Articles</A><BR>
+<A href="tuscany-dashboard.html" title="Tuscany Dashboard">Dashboard</A><BR>
+<A href="issue-tracking.html" title="Issue Tracking">Found a Bug?</A><BR>
+<A href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship </A><BR>
+<A href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks </A><BR>
+<A href="privacy-policy.html" title="Privacy Policy">Privacy Policy</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Community</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="getting-involved.html" title="Getting Involved">Get Involved</A><BR>
+<A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
+<A href="committers.html" title="Committers">Committers</A><BR>
+<A href="chinese-portal.html" title="Chinese Portal">Chinese Portal </A> <SPAN class="image-wrap" style=""><IMG src="community.data/chinese.jpg" style="border: 0px solid black"></SPAN><BR>
+<A href="projects-using-tuscany.html" title="Projects Using Tuscany">Powered By</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SCA</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sca-overview.html" title="SCA Overview">SCA Overview</A><BR>
+<A href="sca-java.html" title="SCA Java">SCA Java</A><BR>
+<A href="sca-native.html" title="SCA Native">SCA Native</A><BR>
+<A href="php-sca.html" title="PHP SCA">SCA PHP</A></P>
+</DIV></DIV>
+
+
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany SDO</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="sdo-overview.html" title="SDO Overview">SDO Overview</A><BR>
+<A href="sdo-java.html" title="SDO Java">SDO Java</A><BR>
+<A href="sdo-cpp.html" title="SDO CPP">SDO C+&#43;</A><BR>
+<A href="sdo-php.html" title="SDO PHP">SDO PHP</A></P>
+</DIV></DIV>
+<DIV class="panel" style="background-color: #ECF4D1;border-color: #b4b4b5;border-style: solid;border-width: 1px;"><DIV class="panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #b4b4b5;background-color: #C3CDA1;"><B>Tuscany DAS</B></DIV><DIV class="panelContent" style="background-color: #ECF4D1;">
+<P><A href="das-overview.html" title="DAS Overview">DAS Overview </A><BR>
+<A href="das-java.html" title="DAS Java">DAS Java</A><BR>
+<A href="das-c.html" title="DAS C++">DAS C++ </A></P>
+</DIV></DIV></TD>
+<TD class="confluenceTd" valign="top" width="85%">
+
+<H2><A name="WorkingInOpenSource-Informationonhowtoworkinopensource"></A>Information on  how to work in open source</H2>
+<P>Purpose of this page is to help new users and developers feel comfortable with working in open source environment. This could be from the point of view of using the source code or understanding how open source works or understanding how to get more involved. Please feel free to contribute to the page or raise questions that are not answered. </P>
+
+<P>Before we start, it is important to point out that Apache Open Source projects are open to all who want to participate. You do not need an invitation to get involved in a project. If you are interested in a project, just get involved! We, at Apache Tuscany, welcome your participation. We would like to help you come on board and the best way to make this happen is for you to let us know where you need help. Welcome and Let's start.</P>
+
+<P><B><A href="working-in-open-source.data/Learning%20Open%20Source.pdf">Learning Open Source</A></B><BR>
+By the end of this presentation you will have a good understanding of the following:</P>
+<UL>
+	<LI>Importance of Open Source</LI>
+	<LI>What is Open Source</LI>
+	<LI>Role of license and license types</LI>
+	<LI>Role of open source infrastructure and the different types</LI>
+	<LI>What is an open source community and why is it important</LI>
+</UL>
+
+
+<P><B><A href="working-in-open-source.data/Getting%20Involved%20In%20Apache%20Projects.pdf">Getting Involved In Apache Projects</A></B><BR>
+Many ask how do I get more involved in Apache Projects?  By the end of this presentation you will have a good understanding of the following:</P>
+<UL>
+	<LI>Apache Roles</LI>
+	<LI>What is the Apache Way</LI>
+	<LI>How to get involved</LI>
+</UL>
+
+
+<P><B><A href="working-in-open-source.data/Working%20With%20Apache%20Tuscany-workshop.pdf">Working with Apache Tuscany</A></B><BR>
+Now that you know how to work in open source, let's walk you through how to get more involved with Apache Tuscany. Please feel free to ask <BR>
+questions.</P>
+<UL>
+	<LI>Step by step how to guide for working with Apache Tuscany.</LI>
+</UL>
+
+</TD></TR></TBODY></TABLE>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithbasiccrud.html b/site/trunk/site-publish/workingwithbasiccrud.html
new file mode 100644
index 0000000000..f924f8456d
--- /dev/null
+++ b/site/trunk/site-publish/workingwithbasiccrud.html
@@ -0,0 +1,153 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithBasicCrud</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52824">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithBasicCrud">WorkingWithBasicCrud</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithBasicCrud-WorkingWithBasicCrud"></A>WorkingWithBasicCrud</H1>
+<P>The RDB DAS provides a simple, command-oriented approach for reading and writing to the database.</P>
+
+<H3><A name="WorkingWithBasicCrud-Asimpleread"></A>A simple read</H3>
+
+<P>The following illustrates the simplest possible read:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command readCustomers = das.createCommand(&quot;select * from CUSTOMER where ID = 22590&quot;);<BR>
+ DataObject root = readCustomers.executeQuery();</P>
+</DIV></DIV>
+<P>The first line creates an instance of the DAS that is primed with a given JDBC Connection object. The Connection can be procured in a number of different ways. This example is from the RDB DAS test suite and the implentation of getConnection() simply uses the DriverManager.getConnection() method.</P>
+
+<P>The second line uses the das instance as a factory to create a Command instance from the provided SQL SELECT string. The third line executes the command which returns a &quot;root&quot; SDO DataObject. This root DataObject is sometimes referred to as a &quot;dummy&quot; root and acts as a container for the graph of data returned from the query. The RDB DAS always returns a dummy root from executing a query.</P>
+
+<P>Once we have a handle to the root we can pull information from the returned customer object using the dynamic SDO apis like this:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DataObject cust = root.getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ String name = cust.getString(&quot;LASTNAME&quot;);</P>
+</DIV></DIV>
+<P>The first line retreives the first Customer from the root's list of returned Customers (since we queried by ID, thereis only one). The second line pulls the LASTNAME value from the customer.</P>
+
+<H3><A name="WorkingWithBasicCrud-Asimplewrite"></A>A simple write</H3>
+
+<P>The DAS leverages the SDO Change Summary to provide a very simple mechanism to flush data changes back to the database. We can illustrate this by continuing the previous example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> customer.set(&quot;LASTNAME&quot;, &quot;Pavick&quot;);<BR>
+ das.applyChanges(root);</P>
+</DIV></DIV>
+<P>The first line uses the SDO dynamic APIs to change the LASTNAME property of the Customer instance and the second line directs the das to flush graph changes back to the database. At this point, the das scans the SDO ChangeSummary and generates the required UPDATE statement necessary to synchronize this change with the database.</P>
+
+<P>Although this simple example demonstrates a single property change to a single object, the das will process any numbers of changes made to any number of objects in a graph. Even if we read 1000 customers from the database and made several changes to each, flushing those changes back to the database is still just one call to das.applyChanges().</P>
+
+<H3><A name="WorkingWithBasicCrud-Awritecommmand"></A>A write commmand</H3>
+
+<P>Writes to the database can also be done without using the change summary. To do this, we simply use the das instance as a factory to create a command initialized with a CREATE/UPDATE or DELETE statement.</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command insert = das.createCommand(&quot;insert into CUSTOMER values (10, 'Williams', '5555 Maine Ave.')&quot;);<BR>
+ insert.execute();</P>
+</DIV></DIV>
+<P>Although allowing the das to generate write statements from the change summary is recommended, this low level ability to execute aribtrary SQL is another option. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithcolumnconverters.html b/site/trunk/site-publish/workingwithcolumnconverters.html
new file mode 100644
index 0000000000..77144bacbb
--- /dev/null
+++ b/site/trunk/site-publish/workingwithcolumnconverters.html
@@ -0,0 +1,231 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithColumnConverters</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52836">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithColumnConverters">WorkingWithColumnConverters</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithColumnConverters-WorkingWithColumnConverters"></A>WorkingWithColumnConverters</H1>
+
+<P>Sometimes it is desireable to modify a column value retreived from a database column <B>before</B> it is stored into a DataObject property. One example might be a database column with possible values '0' or '1' but the desired DataObject property is 'false' or 'true'. Another example might be a String property that should be obfuscated or encryted before it is stored into a column.</P>
+
+<P>The RDB DAS provides a simple &quot;converter&quot; framework that can be used for these cases and others. To use this framework the application developer must provide a new Converter class to provide the desired transformations from column to property and from property back to column. The provided converter must implement the following interface:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">package</SPAN> org.apache.tuscany.das.rdb;
+
+/**
+ * A lightweight Table-column &lt;--&gt; DataObject-property converter framework. Converters allow a user to
+ * insert a transformation between a column value and is destination DataObject property value. For example,
+ * by <SPAN class="code-keyword">default</SPAN>, a VARCHAR column will be represented as a     <SPAN class="code-object">String</SPAN> in its corresponding DataObject property.
+ * A user could insert a converter that transforms the the VARCHAR value to an <SPAN class="code-object">Integer</SPAN>. If <SPAN class="code-keyword">this</SPAN> is done then
+ * although the column returns character data, the DataObject property will be an <SPAN class="code-object">Integer</SPAN>
+ */
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Converter {
+
+    /**
+     * Transform the columnData object to a <SPAN class="code-keyword">new</SPAN> value and possibly <SPAN class="code-keyword">new</SPAN> type. This should be the inverse
+     * operation of #getColumnValue
+     *
+     * @param columnData
+     *            The column value to transorm
+     * @<SPAN class="code-keyword">return</SPAN> Returns the transformed value
+     */
+    <SPAN class="code-object">Object</SPAN> getPropertyValue(<SPAN class="code-object">Object</SPAN> columnData);
+
+    /**
+     * Transform the columnData object to a <SPAN class="code-keyword">new</SPAN> value and possibly <SPAN class="code-keyword">new</SPAN> type. This should be the inverse
+     * operation of #getPropertyValue
+     *
+     * @param propertyData
+     *            The property value to transform
+     * @<SPAN class="code-keyword">return</SPAN> Returns the transformed value
+     */
+    <SPAN class="code-object">Object</SPAN> getColumnValue(<SPAN class="code-object">Object</SPAN> propertyData);
+
+}
+</PRE>
+</DIV></DIV>
+<P>The following example illustrates the use of the converter framework to obfuscate a String value before it is stored to the database and deobfuscate it on read.</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+DAS das = DAS.FACTORY.createDAS(getConfig(<SPAN class="code-quote">&quot;CustomerConfig.xml&quot;</SPAN>), getConnection());
+
+        <SPAN class="code-comment">// Create and initialize command to read customers
+</SPAN>        Command read = das.getCommand(<SPAN class="code-quote">&quot;getFirstCustomer&quot;</SPAN>);
+
+        <SPAN class="code-comment">// Read
+</SPAN>        DataObject root = read.executeQuery();
+
+        <SPAN class="code-comment">//Modify
+</SPAN>        root.setString(<SPAN class="code-quote">&quot;CUSTOMER[1]/LASTNAME&quot;</SPAN>, <SPAN class="code-quote">&quot;Some <SPAN class="code-keyword">new</SPAN> name&quot;</SPAN>);
+
+        das.applyChanges(root);
+</PRE>
+</DIV></DIV>
+<P>This example just shows a simple read of a customer DataObject followed setting the last name to some new value. You will have to take my word for it that the value is not written as-is but is instead obfuscated. The actual value written to the database table column is &quot;Fbzr arj anzr&quot; based on the ROT13 algorithm used in the converter.</P>
+
+<P>Converters are specified in the configuration, usually as part of a config.xml file.  Here is the config file for the example:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+  &lt;Command name=&quot;getFirstCustomer&quot; SQL=&quot;Select * from CUSTOMER where ID = 1&quot; kind=&quot;Select&quot;/&gt;
+
+  &lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+    &lt;Column columnName=&quot;LASTNAME&quot; converterClassName=&quot;org.apache.tuscany.das.rdb.test.mappings.StringObfuscationConverter&quot;/&gt;
+  &lt;/Table&gt;
+
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>Here is the user-defined converter class:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> class StringObfuscationConverter <SPAN class="code-keyword">implements</SPAN> Converter {
+
+    <SPAN class="code-keyword">public</SPAN> StringObfuscationConverter() {
+        <SPAN class="code-keyword">super</SPAN>();
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">Object</SPAN> getPropertyValue(<SPAN class="code-object">Object</SPAN> columnData) {
+        <SPAN class="code-keyword">return</SPAN> toRot13((<SPAN class="code-object">String</SPAN>) columnData);
+    }
+
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">Object</SPAN> getColumnValue(<SPAN class="code-object">Object</SPAN> propertyData) {
+        <SPAN class="code-keyword">return</SPAN> toRot13((<SPAN class="code-object">String</SPAN>) propertyData);
+    }
+
+    <SPAN class="code-comment">// Utilities
+</SPAN>
+    <SPAN class="code-comment">// A simple, reversible, obfuscation algorithm using a ROT13 implementation
+</SPAN>    <SPAN class="code-keyword">private</SPAN> <SPAN class="code-object">String</SPAN> toRot13(<SPAN class="code-object">String</SPAN> original) {
+
+        <SPAN class="code-object">int</SPAN> abyte = 0;
+        <SPAN class="code-object">byte</SPAN>[] buffer = {};
+        <SPAN class="code-keyword">try</SPAN> {
+            buffer = original.getBytes(<SPAN class="code-quote">&quot;ISO-8859-1&quot;</SPAN>);
+        } <SPAN class="code-keyword">catch</SPAN> (UnsupportedEncodingException e) {
+            <SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> Error(e);
+        }
+
+        <SPAN class="code-keyword">for</SPAN> (<SPAN class="code-object">int</SPAN> i = 0; i &lt; buffer.length; i++) {
+            abyte = buffer[i];
+            <SPAN class="code-object">int</SPAN> cap = abyte &amp; 32;
+            abyte &amp;= ~cap;
+            abyte = ((abyte &gt;= 'A') &amp;&amp; (abyte &lt;= 'Z') ? ((abyte - 'A' + 13) % 26 + 'A') : abyte) | cap;
+            buffer[i] = (<SPAN class="code-object">byte</SPAN>) abyte;
+        }
+        <SPAN class="code-keyword">try</SPAN> {
+            <SPAN class="code-keyword">return</SPAN> <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">String</SPAN>(buffer, <SPAN class="code-quote">&quot;ISO-8859-1&quot;</SPAN>);
+        } <SPAN class="code-keyword">catch</SPAN> (UnsupportedEncodingException e) {
+            <SPAN class="code-keyword">throw</SPAN> <SPAN class="code-keyword">new</SPAN> Error(e);
+        }
+    }
+}
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithcompoundkeys.html b/site/trunk/site-publish/workingwithcompoundkeys.html
new file mode 100644
index 0000000000..f74ecb2547
--- /dev/null
+++ b/site/trunk/site-publish/workingwithcompoundkeys.html
@@ -0,0 +1,145 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithCompoundKeys</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52838">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithCompoundKeys">WorkingWithCompoundKeys</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithCompoundKeys-WorkingWithCompoundKeys"></A>WorkingWithCompoundKeys</H1>
+<P>The RDB DAS provides the ability to work with single-column keys as well as keys composed of multiple columns (<A href="http://en.wikipedia.org/wiki/Compound_key" class="external-link" rel="nofollow">compound keys</A>). RDB DAS clients can specify the primary key for a table as well as foreign keys that reference other tables. The primary key for a table can be identified to the DAS via configuration (typically via a configuration xml file). The following is an example config file that defines a compound primary key:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILS&quot;&gt;
+         &lt;Column columnName=&quot;ORDERID&quot; primaryKey=&quot;true&quot;/&gt;
+         &lt;Column columnName=&quot;PRODUCTID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>Relationships between tables are in terms of primary keys and foreign keys and so foreign keys can also be compound. The following example illustrates a relationship using a compound foreign key:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILS&quot;&gt;
+         &lt;Column columnName=&quot;ORDERID&quot; primaryKey=&quot;true&quot;/&gt;
+         &lt;Column columnName=&quot;PRODUCTID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+      &lt;Table tableName=&quot;ORDERDETAILSDESC&quot;&gt;
+         &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+      &lt;Relationship name=&quot;orderDetailsDesc&quot; primaryKeyTable=&quot;ORDERDETAILS&quot;
+                     foriegnKeyTable=&quot;ORDERDETAILSDESC&quot; many=&quot;true&quot;&gt;
+         &lt;KeyPair primaryKeyColumn=&quot;ORDERID&quot; foriegnKeyColumn=&quot;ORDERID&quot;  /&gt;
+         &lt;KeyPair primaryKeyColumn=&quot;PRODUCTID&quot; foreignKeyColumn=&quot;PRODUCTID&quot; /&gt;
+      &lt;/Relationship&gt;
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithconventions.html b/site/trunk/site-publish/workingwithconventions.html
new file mode 100644
index 0000000000..1aef87bc97
--- /dev/null
+++ b/site/trunk/site-publish/workingwithconventions.html
@@ -0,0 +1,138 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithConventions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52833">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithConventions">WorkingWithConventions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithConventions-WorkingWithConventions"></A>WorkingWithConventions</H1>
+
+<P>The RDB DAS makes use of a concept referred to as <A href="conventionoverconfiguration.html" title="ConventionOverConfiguration">ConventionOverConfiguration</A>. This concept reflects the notion that configuration can be avoided by following convention and that this is generally a good thing.</P>
+
+<P>The DAS offers several conventions to reduce the need for configuration and we are considering the addition of more. The following is the current set.</P>
+
+<H3><A name="WorkingWithConventions-PrimaryKey"></A>Primary Key</H3>
+
+<P>The DAS must know the primary key of a table in order to generate a correct INSERT, UPDATE or DELETE statement. The primary key definition can be provided in the configuration. However, if the tables follow the convention that the primary key is named &quot;ID&quot; then no configuration to define the key is necessary. In the absence of configuration to the contrary, the DAS will assume that a DataObject property named &quot;ID&quot; represents the key column in the underlying database table.</P>
+
+<H3><A name="WorkingWithConventions-ForeignKeyRelationships"></A>Foreign Key Relationships</H3>
+
+<P>Similar to the way primary keys are handled, the DAS will assume that a property named &quot;xxx_ID&quot; represents a foreign key column in the underling database and further, that this foreign key references table &quot;xxx&quot;. If the application developer has the luxury of defining the database tables then the explicit definition of relationships via a config file is unnecessary if this convention can be followed.</P>
+
+<P>TBD - What is the default name of the relationship?</P>
+
+<H3><A name="WorkingWithConventions-NameMappings"></A>Name Mappings</H3>
+
+<P>In the absence of configuration to the contrary, the DAS will use a simple implicit mapping from Table/Column names to DataObject Type/Property names. An example of this convention is provided in <A href="conventionoverconfiguration.html" title="ConventionOverConfiguration">ConventionOverConfiguration</A>.</P>
+
+<H3><A name="WorkingWithConventions-OptimisticConcurrencyControl"></A>Optimistic Concurrency Control</H3>
+
+<P>This section is TBD. As of the current M2 release candidate, the absence of OCC configuration means that no collision detection will be performed. We are considering having the default behavior be to overqualify the update statement with all modified columns.</P>
+
+<H3><A name="WorkingWithConventions-PartialUpdate"></A>Partial Update</H3>
+
+<P>Unless otherwise specified, the RDB DAS will default to a scheme where INSERT/UPDATE/DELETE statements are generated based on the change summary (<A href="changesummaryprocessing.html" title="ChangeSummaryProcessing">ChangeSummaryProcessing</A>) associated with the modified datagraph. The DAS will not generate an UPDATE statement that updates all table columns. Instead, the DAS will update only those columns that were actually modified in the graph. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithgenerateddatabasekeys.html b/site/trunk/site-publish/workingwithgenerateddatabasekeys.html
new file mode 100644
index 0000000000..c3b4f13b21
--- /dev/null
+++ b/site/trunk/site-publish/workingwithgenerateddatabasekeys.html
@@ -0,0 +1,149 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithGeneratedDatabaseKeys</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52826">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithGeneratedDatabaseKeys">WorkingWithGeneratedDatabaseKeys</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithGeneratedDatabaseKeys-WorkingWithGeneratedDatabaseKeys"></A>WorkingWithGeneratedDatabaseKeys</H1>
+<P>The RDB DAS provides the ability to work with <A href="http://en.wikipedia.org/wiki/Surrogate_key" class="external-link" rel="nofollow">database generated keys</A>. A piece of configuration information , typically via a configuration XML file, is used to indicate to the DAS that a column value is generated by the database. This piece of information is necessary when new rows are inserted to the database since the DAS will generate an INSERT statement that does not include the generated column.</P>
+
+<P>The follwing example illustrates the use of generated keys with the DAS:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConfig(&quot;CompanyConfig.xml&quot;), getConnection());<BR>
+ Command select = das.getCommand(&quot;all companies&quot;);<BR>
+ DataObject root = select.executeQuery();</P>
+
+<P> // Create a new Company<BR>
+ DataObject company = root.createDataObject(&quot;COMPANY&quot;);<BR>
+ //Initialize properties of the new company<BR>
+ company.setString(&quot;NAME&quot;, &quot;Do-rite Pest Control&quot;);</P>
+
+<P> // Flush changes<BR>
+ das.applyChanges(root);</P>
+
+<P> // Inspect the id<BR>
+ Integer id = (Integer) company.get(&quot;ID&quot;);</P>
+</DIV></DIV>
+<P>The first line creates a DAS instance form the factory passing it a stream over the file &quot;CompanyConfig.xml&quot;. Here are the contents of that file: </P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+      &lt;Command name=&quot;all companies&quot; SQL=&quot;select * from COMPANY&quot; kind=&quot;Select&quot;/&gt;
+
+      &lt;Table tableName=&quot;COMPANY&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot; generated=&quot;true&quot;/&gt;
+      &lt;/Table&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>Note that only the 'ID' column is specified in the file since this is the only column we need to attach any information to. Notice also that when the new Company instance in created, no value is assigned to the 'ID' property since this value will be supplied by the database when the insert operation is performed.</P>
+
+<P>As part of the &quot;apply changes&quot; processing, the DAS will propogate the database-supplied key values back to the respective DataObjects in the graph. The purpose of this is to make the values available to the application if needed.</P>
+
+<P>This simple example only demosntrates the insertion of a flat graph of data since the graph consists only of Company instances. But, the DAS is capable of more complex scenarios. The DAS can also handle graphs of related DataObjects each with generated columns. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithnamemapping.html b/site/trunk/site-publish/workingwithnamemapping.html
new file mode 100644
index 0000000000..3bff19ee29
--- /dev/null
+++ b/site/trunk/site-publish/workingwithnamemapping.html
@@ -0,0 +1,147 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithNameMapping</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52839">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithNameMapping">WorkingWithNameMapping</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithNameMapping-WorkingWithNameMapping"></A>WorkingWithNameMapping</H1>
+
+<P>The default behavior for the RDB DAS is to map database names to SDO names. So, if a CUTSOMER table is read from the database then each row will be represented as a CUSTOMER DataObject. Likewise, if the CUSTOMER tabel has columns (ID, LASTNAME, ADDRESS) then CUSTOMER DataObject instances will have properties (ID, LASTNAME, ADDRESS). Database Table names map to DataObject Type names and database column names map to DataObject property names.</P>
+
+<P>This implicit mapping of database and SDO names woks well but some developers will want explicit name mapping that allows the database and SDO names to vary. One typical example is that the database might have all tables and columns conventionally named in all upercase but a Java developer might want to work with SDO Types and properties that are camelcased. So, database names CUSTOMER and LASTNAME might map to SDO names Customer and lastName.</P>
+
+<P>The RDB DAS allows this type of explicit mapping via configuration (usually in the form of a XML config file). The following example illstrates the use of this feature:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">DAS das = DAS.FACTORY.createDAS(getConfig(<SPAN class="code-quote">&quot;BooksConfigWithAlias.xml&quot;</SPAN>), getConnection());
+
+   Command select = das.getCommand(<SPAN class="code-quote">&quot;get book by ID&quot;</SPAN>);
+   select.setParameter(1, <SPAN class="code-object">Integer</SPAN>.valueOf(1));
+
+   DataObject root = select.executeQuery();
+   <SPAN class="code-object">String</SPAN> author = root.getString(<SPAN class="code-quote">&quot;Book[1]/Writer&quot;</SPAN>));
+</PRE>
+</DIV></DIV>
+<P>Here is the associated configuration file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+       &lt;Command name=&quot;get all books&quot; SQL=&quot;SELECT * FROM BOOK&quot; kind=&quot;Select&quot;/&gt;
+
+       &lt;Command name=&quot;get Cat in the Hat&quot; SQL=&quot;SELECT * FROM BOOK WHERE NAME = 'Cat in the Hat'&quot; kind=&quot;Select&quot;/&gt;
+
+       &lt;Command name=&quot;get book by ID&quot; SQL=&quot;SELECT * FROM BOOK WHERE BOOK.BOOK_ID = ?&quot; kind=&quot;Select&quot;/&gt;
+
+       &lt;Table tableName=&quot;BOOK&quot; typeName=&quot;Book&quot;&gt;
+           &lt;Column columnName=&quot;BOOK_ID&quot; primaryKey=&quot;true&quot;/&gt;
+           &lt;Column columnName=&quot;AUTHOR&quot; propertyName=&quot;Writer&quot;/&gt;
+           &lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot;/&gt;
+       &lt;/Table
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>You can see that the Table definition provides &quot;typeName&quot; and &quot;propertyName&quot; attributes to override the defualt use of the all-uppercase database names. You can also see the use of these names in the example Java source. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithoptimisticconcurrencycontrol.html b/site/trunk/site-publish/workingwithoptimisticconcurrencycontrol.html
new file mode 100644
index 0000000000..43a11b2fea
--- /dev/null
+++ b/site/trunk/site-publish/workingwithoptimisticconcurrencycontrol.html
@@ -0,0 +1,149 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithOptimisticConcurrencyControl</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52825">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithOptimisticConcurrencyControl">WorkingWithOptimisticConcurrencyControl</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithOptimisticConcurrencyControl-WorkingWithOptimisticConcurrencyControl"></A>WorkingWithOptimisticConcurrencyControl</H1>
+
+<P>The RDB DAS provides a straightforward mechanism for support of <A href="optimisticconcurrencycontrol.html" title="OptimisticConcurrencyControl">OptimisticConcurrencyControl</A>. To enable OCC a client must designate an integer version column in the configuration (usually via a config xml file). The following example is an example of a cofig file that identifies a version column:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+     &lt;Command name=&quot;select book 1&quot; SQL=&quot;select * from BOOK where BOOK_ID = 1&quot; kind=&quot;Select&quot;/&gt;
+
+     &lt;Table tableName=&quot;BOOK&quot;&gt;
+        &lt;Column columnName=&quot;BOOK_ID&quot; primaryKey=&quot;true&quot;/&gt;
+        &lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This line in the config file &#95;&lt;Column columnName=&quot;OCC&quot; collision=&quot;true&quot; managed=&quot;true&quot;/&gt;_designates the column named &quot;OCC&quot; as the version column and also sets &quot;managed&quot; to true. The &quot;managed&quot; attribute has to do with how the version column is changed. In order for OCC to work, some agent must change the value of the version column each time the row is modified. A new value in the version column is what tells the DAS that the row has been modified. If a version column is &quot;managed&quot; then the DAS is responsible for incrementing the value of the column each time some column in the row is changed. The other option is &quot;managed= false&quot; and in this case, the DAS will assume some other agent is responsible for updating the version column. This other agent is likely to be the client application itself or the database via a trigger or some other mechanism.</P>
+
+<P>When applying changes made to a graph (see <A href="changesummaryprocessing.html" title="ChangeSummaryProcessing">ChangeSummaryProcessing</A>), the DAS will throw an exception if any table row has been modified since the row was read. For example, if a DAS client reads a row representing a specific Customer and then tries to update that Customer, the DAS will throw an exception if the Customer has already been modified by some other agent. The following example illustrates applying changes and checking for a collision failure:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+DAS das = DAS.FACTORY.createDAS(getConfig(<SPAN class="code-quote">&quot;ManagedBooksConfig.xml&quot;</SPAN>), getConnection());
+   <SPAN class="code-comment">// Read a book instance
+</SPAN>   Command select = das.getCommand(<SPAN class="code-quote">&quot;select book 1&quot;</SPAN>);
+   DataObject root = select.executeQuery();
+   DataObject book = root.getDataObject(<SPAN class="code-quote">&quot;BOOK[1]&quot;</SPAN>);
+   book.setInt(<SPAN class="code-quote">&quot;QUANTITY&quot;</SPAN>, 2);
+
+   <SPAN class="code-comment">// Try to apply changes and <SPAN class="code-keyword">catch</SPAN> potential update collision
+</SPAN>   <SPAN class="code-keyword">try</SPAN> {
+      das.applyChanges(root);
+   } <SPAN class="code-keyword">catch</SPAN> (RuntimeException ex) {
+      <SPAN class="code-keyword">if</SPAN> (!ex.getMessage().equals(<SPAN class="code-quote">&quot;An update collision occurred&quot;</SPAN>)) {
+          recover();
+      }
+   }
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithpaging.html b/site/trunk/site-publish/workingwithpaging.html
new file mode 100644
index 0000000000..ffced67df1
--- /dev/null
+++ b/site/trunk/site-publish/workingwithpaging.html
@@ -0,0 +1,166 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithPaging</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52837">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithPaging">WorkingWithPaging</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithPaging-WorkingWithPaging"></A>WorkingWithPaging</H1>
+<P>The RDB DAS provides a mechanism for working with the result of large queries one chunk (page) at a time. This capability is modeled after the behavior of web search engines. For example, if I Google &quot;RDB DAS&quot; I am presented with a page representing the first ten references. I am also told that there were close to 500,000 matches and I am given the opportunity to go to the next page or directly to pages two through ten. After moving from the first page I am also provided the opportunity to move back to some previous page.</P>
+
+<P>The DAS &quot;Pager&quot; is a wrapper around a provided read command and provides the APIs for paging.  Here is the Pager interface:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+<SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">interface</SPAN> Pager {
+
+    /**
+     * Get the next page of data
+     */
+    DataObject next();
+
+    /**
+     * Get the page prior to the last page returned
+     */
+    DataObject previous();
+
+    /**
+     * Return a specific identified page.
+     */
+    DataObject getPage(<SPAN class="code-object">int</SPAN> page);
+
+}
+</PRE>
+</DIV></DIV>
+<P>A Pager is instantiated on a given read Command and the constructor is used to specify the desired page size (number of database rows per page). The following example illustrates construction and use of a pager: </P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+DAS das = DAS.FACTORY.createDAS(getConnection());
+   <SPAN class="code-comment">// Build command to read all customers
+</SPAN>   Command custCommand = das.createCommand(<SPAN class="code-quote">&quot;select * from CUSTOMER order by ID&quot;</SPAN>);
+
+   <SPAN class="code-comment">// Create a pager with the command
+</SPAN>   Pager pager = <SPAN class="code-keyword">new</SPAN> PagerImpl(custCommand, 2);
+
+   <SPAN class="code-comment">// Get and work with first page
+</SPAN>   DataObject root = pager.next();
+   DataObject customer1 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[1]&quot;</SPAN>);
+   DataObject customer2 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[2]&quot;</SPAN>);
+
+   <SPAN class="code-comment">// Get and work with the second page
+</SPAN>   root = pager.next();
+   customer1 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[1]&quot;</SPAN>);
+   customer2 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[2]&quot;</SPAN>);
+
+   <SPAN class="code-comment">// First page again
+</SPAN>   root = pager.previous();
+   customer1 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[1]&quot;</SPAN>);
+   customer2 = root.getDataObject(<SPAN class="code-quote">&quot;CUSTOMER[2]&quot;</SPAN>);
+</PRE>
+</DIV></DIV>
+<P>The current Pager specification and implementation are very preliminary and will likely change in significant ways&#33; For instance, the pager is intended to work in completely disconnected scenarios so there should be no connection context maintained between invocations of the pager. Currently the Pager references a Command that, in turn, references a connection (oops&#33;). Some work must be done to make the pager lightweight as it will likely be stored in session.</P>
+
+<P>We probably should also create a Factory rather than using the impl constructor. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithrelationships.html b/site/trunk/site-publish/workingwithrelationships.html
new file mode 100644
index 0000000000..263b28ce67
--- /dev/null
+++ b/site/trunk/site-publish/workingwithrelationships.html
@@ -0,0 +1,149 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithRelationships</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52845">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithRelationships">WorkingWithRelationships</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithRelationships-WorkingWithRelationships"></A>WorkingWithRelationships</H1>
+
+<P>As mentioned elsewhere in this guide, the RDB DAS provides a simple, implicit mapping from SDO Types/Properties to Relational Tables/Columns. So, in the absence of configuration to the otherwise, reading a table named CUSTOMER with columns NAME and ADDRESS will result in a data graph containing SDO DataObjects of Type CUSTOMER with properties NAME and ADDRESS.</P>
+
+<P>This is great for reading entities from a single table but clients often need to read data from related tables for example Customers and their related Orders. The RDB DAS can work with related database tables and reads that span tables produce graphs of related data objects. Continuing with our Customer-&gt;Order example, a client can read a set of Customers and related Orders by using a SELECT statement that includes a join as in the following example:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DAS das = DAS.FACTORY.createDAS(getConfig(&quot;CustomerOrderConfig.xml&quot;), getConnection());<BR>
+ // Read some customers and related orders<BR>
+ Command select = das.createCommand(&quot;SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1&quot;);</P>
+
+<P> DataObject root = select.executeQuery();<BR>
+ DataObject customer = root.getDataObject(&quot;CUSTOMER[1]&quot;);<BR>
+ List orders = customer.getList(&quot;orders&quot;);</P>
+</DIV></DIV>
+<P>You can see that the client can work with the data graph as a set of related objects. Once the application has a handle to a customer, it can reference that customers related orders by accessing the customers &quot;orders&quot; property.</P>
+
+<P>Notice that the example provides a config file as part of creating the DAS. This file contains mapping information that defines to the DAS how the queried tables are related. Here are the contents of the config file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+     &lt;Table tableName=&quot;CUSTOMER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Table tableName=&quot;ANORDER&quot;&gt;
+        &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+     &lt;/Table&gt;
+
+     &lt;Relationship name=&quot;orders&quot; primaryKeyTable=&quot;CUSTOMER&quot; foreignKeyTable=&quot;ANORDER&quot; many=&quot;true&quot;&gt;
+        &lt;KeyPair primaryKeyColumn=&quot;ID&quot; foreignKeyColumn=&quot;CUSTOMER_ID&quot;/&gt;
+     &lt;/Relationship&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This config file specifies the primary keys of the related tables and then the relationship between them. It also provides a convenient name for the relationship. In short, this config specifies that the CUSTOMER table and ANORDER table are related via ANORDERs column named &quot;CUSTOMER_ID&quot; which references CUSTOMERS column named &quot;ID&quot;. The name of the relationship is &quot;orders&quot;</P>
+
+<P>As a side note, the config in this example is not required since the table definitions follow a &quot;convention&quot; recognized by the DAS. See <A href="workingwithconventions.html" title="WorkingWithConventions">WorkingWithConventions</A>. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithstaticdataobjects.html b/site/trunk/site-publish/workingwithstaticdataobjects.html
new file mode 100644
index 0000000000..1604f0e287
--- /dev/null
+++ b/site/trunk/site-publish/workingwithstaticdataobjects.html
@@ -0,0 +1,169 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithStaticDataObjects</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52821">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithStaticDataObjects">WorkingWithStaticDataObjects</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithStaticDataObjects-WorkingWithStaticDataObjects%26nbsp%3B"></A>WorkingWithStaticDataObjects&nbsp;</H1>
+
+<P>Although the RDBDAS default behavior is to produce graphs of dynamic DataObjects (see <A href="resultsetdrivendataobjecttypes.html" title="ResultSetDrivenDataObjectTypes">ResultSetDrivenDataObjectTypes</A>), the DAS allows users to work with Static DataObjects as well.</P>
+
+<P>Clients can designate a set of Types by providing a piece of configuration (usually in the form of a configuration XML file) to the DAS and the DAS will then use these Types for the DataObject model.</P>
+
+<P>Without any name mapping configuration specified, the DAS will attempt to use DataObject Type and Property names equivalent to database Table and Column names. For example, if the database table name is &quot;BANK_EMPLOYEE&quot;, the DAS will attempt to create DataObject instances of type BANK_EMPLOYEE. If this Type doesn't exist in the provided Types, an exception will be thrown by SDO.</P>
+
+<P>To map these database tables and columns to your SDO types and properties, you can provide a &quot;Type Name&quot; and &quot;Property Name&quot; (see <A href="workingwithnamemapping.html" title="WorkingWithNameMapping">WorkingWithNameMapping</A>). In the above example, if we specify a Type name of &quot;employee&quot;, the DAS will attempt to create DataObject instances of type &quot;employee&quot; from the information in the BANK_EMPLOYEE table.</P>
+
+<P>It is not necessary to specify any sort of mapping between database column data types and your Property data types. If the data types do not match, a conversion will be made between the two when the property is set on the SDO model. The possible data type conversions are specified in the SDO specification. If there is no valid conversion available between the two data types, you can specify a Converter (see <A href="workingwithcolumnconverters.html" title="WorkingWithColumnConverters">WorkingWithColumnConverters</A>) that the DAS will use to convert the data before setting the value in the DataObject.</P>
+
+<P>The following example demostrates the RDB DAS wih Static SDO Types:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> SDOUtil.registerStaticTypes(CustomerFactory.class);</P>
+
+<P> DAS das = DAS.FACTORY.createDAS(getConfig(&quot;staticCustomerOrder.xml&quot;), getConnection());<BR>
+ Command select = das.getCommand(&quot;Customer and Orders&quot;);<BR>
+ select.setParameter(1, Integer.valueOf(1));<BR>
+ DataObject root = select.executeQuery();</P>
+
+<P> // Modify a customer<BR>
+ Customer customer = (Customer) root.getDataObject(&quot;Customer[1]&quot;);<BR>
+ customer.setLastName(&quot;Pavick&quot;);</P>
+
+<P> // Modify an order<BR>
+ AnOrder order = (AnOrder) customer.getOrders().get(0);<BR>
+ order.setProduct(&quot;Kitchen Sink 001&quot;);</P>
+
+<P> // Flush changes<BR>
+ das.applyChanges((DataObject) root);</P>
+</DIV></DIV>
+<P>And, here is the associated config file:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+     dataObjectModel=&quot;http:///org.apache.tuscany.das.rdb.test/customer.xsd&quot;&gt;
+
+    &lt;Command name=&quot;Customer and Orders&quot; SQL=&quot;SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?&quot; kind=&quot;Select&quot;/&gt;
+
+    &lt;Table tableName=&quot;CUSTOMER&quot; typeName=&quot;Customer&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+    &lt;/Table&gt;
+
+    &lt;Table tableName=&quot;ANORDER&quot; typeName=&quot;AnOrder&quot;&gt;
+      &lt;Column columnName=&quot;ID&quot; primaryKey=&quot;true&quot;/&gt;
+      &lt;Column columnName=&quot;CUSTOMER_ID&quot;/&gt;
+    &lt;/Table&gt;
+
+    &lt;Relationship name=&quot;orders&quot; primaryKeyTable=&quot;CUSTOMER&quot; foreignKeyTable=&quot;ANORDER&quot; many=&quot;true&quot;&gt;
+       &lt;KeyPair primaryKeyColumn=&quot;ID&quot; foreignKeyColumn=&quot;CUSTOMER_ID&quot;/&gt;
+    &lt;/Relationship&gt;
+
+   &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>The first line of the example registers the Static model with the SDO runtime. This step would not normally be intermixed with the data access code but the Types must be registered by some part of the applicaiton. The DAS is provided with the URI or the static types via the config file via the dataObjectModel attribute.</P>
+
+<P>You can see that the sample makes use of the Types provided. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithstoredprocedures.html b/site/trunk/site-publish/workingwithstoredprocedures.html
new file mode 100644
index 0000000000..197c9715f6
--- /dev/null
+++ b/site/trunk/site-publish/workingwithstoredprocedures.html
@@ -0,0 +1,150 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithStoredProcedures</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52827">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithStoredProcedures">WorkingWithStoredProcedures</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithStoredProcedures-WorkingWithStoredProcedures"></A>WorkingWithStoredProcedures</H1>
+
+<P>The DAS can work with stored procedures in the same way it works with SQL statements. The following example should look familiar except that a stored prcedure call statement replaces the typical SELECT statement:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P>DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+Command read = das.createCommand(&quot;{call GETALLCOMPANIES()}&quot;);<BR>
+DataObject root = read.executeQuery();</P>
+</DIV></DIV>
+<P>The predefined stored procedure &quot;GETALLCOMPANIES&quot; returnes a result just like &quot;select * from company&quot; would. There are, however, procedures that do not return<BR>
+results and these calls can also be executed with the same programming model. In fact any arbitrary stored procedure can be invoked in this way. The follwing example calls a proc that deletes an identified company:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConnection());<BR>
+ Command delete = das.createCommand(&quot;{call DELETECUSTOMER(&#63;)}&quot;);<BR>
+ delete.setParameter(1, 1234);<BR>
+ delete.execute();</P>
+</DIV></DIV>
+<P>Stored procedures may also provide IN/OUT and OUT parameters. The following illustrates the use of a stored procedure that returns a result set as well as an OUT parameter:</P>
+<DIV class="panel" style="border-width: 1px;"><DIV class="panelContent">
+<P> DAS das = DAS.FACTORY.createDAS(getConfig(&quot;storedProcTest.xml&quot;), getConnection());<BR>
+ Command read = das.getCommand(&quot;getNamedCustomers&quot;);<BR>
+ read.setParameter(1, &quot;Williams&quot;);<BR>
+ DataObject root = read.executeQuery();</P>
+
+<P> Integer customersRead = (Integer) read.getParameter(2);</P>
+</DIV></DIV>
+<P>This example makes use of a configuration file to define the command including the OUT parameter:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;   &lt;Command name=&quot;getNamedCustomers&quot; SQL=&quot;{call GETNAMEDCUSTOMERS(?,?)}&quot; kind=&quot;procedure&quot;&gt;
+
+     &lt;Parameter direction=&quot;IN&quot; columnType=&quot;commonj.sdo.String&quot;/&gt;
+
+     &lt;Parameter direction=&quot;OUT&quot; columnType=&quot;commonj.sdo.IntObject&quot;/&gt;
+
+   &lt;/Command&gt;
+
+ &lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+<P>This stored procedure is defined such that the first argument provides a name to match when looking for customers and the second argument is an OUT parameter and providing the number of customers that match the provided name. The proc also returns the list of matching Customers. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/workingwithtransactions.html b/site/trunk/site-publish/workingwithtransactions.html
new file mode 100644
index 0000000000..a7e94c72ea
--- /dev/null
+++ b/site/trunk/site-publish/workingwithtransactions.html
@@ -0,0 +1,153 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WorkingWithTransactions</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52835">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WorkingWithTransactions">WorkingWithTransactions</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WorkingWithTransactions-%26nbsp%3BWorkingWithTransactions"></A>&nbsp;WorkingWithTransactions</H1>
+
+<P>By default, the RDB DAS assumes responsibility for managing transaction boundaries by executing commit and rollback operations against the database. The boundaries of these transactions are as follows:</P>
+
+<H3><A name="WorkingWithTransactions-ReadingData"></A>Reading Data</H3>
+
+<P>Queries to the database are always made by calling DAS command's &quot;executeQuery()&quot; method. The associated transaction lives for the duration of this method execution. That is, the transaction can be thought to start when control is transferred to &quot;executeQuery&quot; and the transaction ends just prior to return from this method.</P>
+
+<H3><A name="WorkingWithTransactions-WritingData"></A>Writing Data</H3>
+
+<P>Writes can be accomplished by two DAS APIs. First is calling the DAS &quot;execute()&quot; command against a command the will perform write operations and, in this case, the transaction boundaries are the same as read queries. That is the transaction life matches the life of the &quot;execute&quot; processing. If the method returns without exception then the application can assume that any changes were successfully committed to the database. If an exception is returned then the changes will have all been rolled back.</P>
+
+<P>The second API used by clients is the DAS applyChanges() method (see <A href="changesummaryprocessing.html" title="ChangeSummaryProcessing">ChangeSummaryProcessing</A>). Again, the boundaries of the transaction match the boundaries fo the call to the method. The DAS will create a set of INSERT/UPDATE and DELETE statments to flush the graph changes to the database and all of these statements will be executed as part of a single transaction. If the method returns without exception then the application can assume that all changes were successfully committed to the database. If an exception is returned then the changes will have all been rolled back.</P>
+
+<H3><A name="WorkingWithTransactions-ExternalTransactions"></A>External Transactions</H3>
+
+<P>The RDB DAS provides a straightforward mechanism for working with external transactions. As mentioned above, the DAS, by default, acts as the transaction manager and commits and rolls back transactions accordingly. However, that DAS can also be configured to not issue commit/rollback and this is the behavior needed to have the DAS participate in a larger transaction since some external party is responsible for these actions. The following pseudo-code illustrates this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+tx.begin();
+<SPAN class="code-keyword">try</SPAN> {
+     doSomeJMSStuff();
+     doSomeDASStuff();
+     tx.commit();
+} <SPAN class="code-keyword">catch</SPAN> (AnyException ex) {
+     tx.rollback();
+}
+</PRE>
+</DIV></DIV>
+<P>In the example above, the DAS has been configured to not managed transactions since this is handled by the calling program.</P>
+
+<P>The DAS is set to behave this way by a piece of configuration (typically via a configuration xml file). The following config file snippet illustrates this setting:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>&lt;Config xsi:noNamespaceSchemaLocation=&quot;http:///org.apache.tuscany.das.rdb/config.xsd&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
+
+        &lt;ConnectionInfo managedtx=&quot;false&quot;/&gt;
+
+        &lt;Command name=&quot;get a customer&quot; SQL=&quot;Select * from CUSTOMER where ID = 1&quot; kind=&quot;select&quot;/&gt;
+
+&lt;/Config&gt;
+</PRE>
+</DIV></DIV>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/writeoperationordering.html b/site/trunk/site-publish/writeoperationordering.html
new file mode 100644
index 0000000000..e5707156a9
--- /dev/null
+++ b/site/trunk/site-publish/writeoperationordering.html
@@ -0,0 +1,121 @@
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+		<!-- generateKeywords macro -->
+	    <META name="description" content="Apache Tuscany">
+        <META name="keywords" content="apache, apache tuscany, tuscany, service, services, fabric, soa, service oriented architecture,  sca, service component architecture, das, sdo, csa, ruby, opensource">
+		<!-- generateKeywords macro end -->
+		
+        <LINK type="text/css" rel="stylesheet" href="http://tuscany.apache.org/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="https://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>Apache Tuscany : WriteOperationOrdering</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        <!-- topNav macro -->
+		<TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+			<TR>
+				<TD valing="top" align="left">
+					<A href="https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://tuscany.apache.org/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+				</TD>
+				<TD>
+					<A href="http://tuscany.apache.org/"><IMG src="http://tuscany.apache.org/images/TuscanyLogo.jpg" border="0"></A>
+				</TD>
+				
+				<TD width="100%">
+					&nbsp;
+				</TD>
+
+				<!-- Adds the edit page link to the top banner-->
+				<TD valign="bottom">
+					<DIV style="padding: 2px 10px; margin: 0px;">
+						<A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=52817">
+						<IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+					</DIV>
+				</TD>
+
+			</TR>
+		</TABLE>
+        <!-- topNav macro end -->
+
+		<!-- breadCrumbs macro -->
+		<TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+			<TR class="topBar">
+				<TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+					&nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="das-java.html" title="DAS Java">DAS Java</A>&nbsp;&gt;&nbsp;<A href="das-java-documentation-menu.html" title="DAS Java Documentation Menu">DAS Java Documentation Menu</A>&nbsp;&gt;&nbsp;<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">DAS Java Developer Guide</A>&nbsp;&gt;&nbsp;<A href="rdb-das-java.html" title="RDB DAS Java">RDB DAS Java</A>&nbsp;&gt;&nbsp;<A href="rdb-das-user-guide.html" title="RDB DAS - User Guide">RDB DAS - User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="WriteOperationOrdering">WriteOperationOrdering</A>
+				</TD>
+				
+				<TD align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+				<A href="http://mail-archives.apache.org/mod_mbox/tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+				</TD>
+			</TR>
+		</TABLE>
+		<!-- breadCrumbs macro end -->
+
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+
+					<!-- pageContent macro -->
+					<DIV id="PageContent">
+												
+						<DIV class="pagecontent">
+							<DIV class="wiki-content">
+								<H1><A name="WriteOperationOrdering-%26nbsp%3BWriteOperationOrdering"></A>&nbsp;WriteOperationOrdering</H1>
+
+<P>Relational databases often use <A href="http://en.wikipedia.org/wiki/Referential_integrity" class="external-link" rel="nofollow">Referential Integrity (RI)</A>constraints to maintain database consistency. When RI is enabled, database operations must be performed in a specific order that prevents invalid references. If this order is not adhered to then the database will throw an exception rather than let the write succeed.</P>
+
+<P>When an application makes modifications to a data graph and then asks the RDB DAS to &quot;apply changes&quot;, the DAS will create a &quot;batch&quot; of database writes that must be sorted and then executed in the correct order to avoid RI Constraint exceptions. A simple example will help here. Assume a database with two tables CUSTOMER and ORDER. Also assume that the ORDER table has a <A href="http://en.wikipedia.org/wiki/Foreign_key" class="external-link" rel="nofollow">foreign key</A>reference to the CUSTOMER table. Now assume that the application has made modifications to a data graph that was retrieved by the DAS using a SELECT statement like the following:</P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>SELECT * FROM CUSTOMER LEFT JOIN ORDER ON CUSTOMER.ID = ORDER.CUSTOMER_ID WHERE CUSTOMER.NAME = ?
+</PRE>
+</DIV></DIV>
+<P>The resulting data graph will contain all matching customers as well as their related orders. Now assume the application uses the SDO API's to delete some customer from the graph and then also deletes the related orders. Although the application deleted the customer first, the DAS must delete the orders first from the database since deleting the customer, with existing referencing orders, would violate the RI constraints and result in an exception. </P>
+							</DIV>
+						</DIV>
+					</DIV>	
+		            <!-- pageContent macro end -->
+					
+                </TD>
+            </TR>
+        </TABLE>
+
+		<!-- footer macro -->
+				<SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+		</SCRIPT>
+		<SCRIPT type="text/javascript">
+		   _uacct = "UA-1174707-5";
+		   urchinTracker();
+		</SCRIPT>
+		
+				<A href="http://www.statcounter.com/" target="_blank"><IMG src="http://c26.statcounter.com/counter.php?sc_project=2619156&java=0&security=94bd7e7d&invisible=0" alt="website stats" border="0"></A>    
+
+		<DIV class="footer">
+			Copyright � 2003-2012, The Apache Software Foundation&nbsp;&nbsp;</BR>
+                        Apache Tuscany and the Apache Tuscany project logo are trademarks of The Apache Software Foundation.
+		</DIV>
+		<!-- footer macro end -->
+
+    </BODY>
+</HTML>
diff --git a/site/trunk/site-publish/xquery-java-das.html b/site/trunk/site-publish/xquery-java-das.html
new file mode 100644
index 0000000000..117e884036
--- /dev/null
+++ b/site/trunk/site-publish/xquery-java-das.html
@@ -0,0 +1,100 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <LINK type="text/css" rel="stylesheet" href="http://incubator.apache.org/tuscany/stylesheets/default.css">
+        <LINK rel="SHORTCUT ICON" href="http://cwiki.apache.org/confluence/display/TUSCANY/$images/favicon.ico">   
+        <TITLE>XQuery Java DAS : Apache Tuscany</TITLE>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+    
+    <BODY onload="init()">
+        
+            <TABLE valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg">
+        <TR>
+            <TD valing="top" align="left">
+			    <A href="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=TUSCANY&title=$siteroot"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogoNEW_Text_120px_bg.jpg" height="91" width="25" border="0"></A>
+			</TD>
+			<TD>
+                <A href="http://incubator.apache.org/tuscany/"><IMG src="http://incubator.apache.org/tuscany/images/TuscanyLogo.jpg" border="0"></A>
+            </TD>
+            
+            <TD width="100%">
+                &nbsp;
+            </TD>
+            <TD align="right">
+                <IMG src="http://incubator.apache.org/tuscany/images/apache-incubator-logo.png" border="0">
+            </TD>
+
+            <!-- Adds the edit page link to the top banner-->
+            <TD valign="bottom">
+                <DIV style="padding: 2px 10px; margin: 0px;">
+                    <A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=50969">
+                    <IMG src="http://incubator.apache.org/tuscany/images/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+                </DIV>
+            </TD>
+
+        </TR>
+    </TABLE>
+
+            <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+        <TR class="topBar">
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                &nbsp;<A href="home.html" title="Apache Tuscany">Apache Tuscany</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="das-overview.html" title="DAS Overview">DAS Overview</A>&nbsp;&gt;&nbsp;<A href="" title="XQuery Java DAS">XQuery Java DAS</A>
+            </TD>
+            
+            <TD align="left" valign="middle" class="topBarDiv" nowrap="true">
+            <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-user">User List</A> | <A href="http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev">Dev List</A> | <A href="http://issues.apache.org/jira/browse/Tuscany">Issue Tracker</A>&nbsp;&nbsp;
+            </TD>
+        </TR>
+    </TABLE>
+
+        <TABLE border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+            <TR>
+                <TD align="left" valign="top">
+                        <DIV id="PageContent">
+                
+        <DIV class="pagecontent">
+            <DIV class="wiki-content">
+                <TABLE class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><TBODY><TR>
+<TD class="confluenceTd" valign="top" width="12%">
+<H4><A name="XQueryJavaDAS-General"></A>General</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XQuery%20DAS%20Java%20-%20FAQ&linkCreation=true&fromPageId=50969" title="Create Page: XQuery DAS Java - FAQ" class="createlink">FAQ<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-downloads.html" title="DAS Downloads">Downloads</A><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=What's%20New%20in%20DAS%20JAVA&linkCreation=true&fromPageId=50969" title="Create Page: What's New in DAS JAVA" class="createlink">What's new?<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="XQueryJavaDAS-Guides"></A>Guides</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XQuery%20DAS%20Java%20User%20Guide&linkCreation=true&fromPageId=50969" title="Create Page: XQuery DAS Java User Guide" class="createlink">User Guide <SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XQuery%20DAS%20Java%20Architecture%20Guide&linkCreation=true&fromPageId=50969" title="Create Page: XQuery DAS Java Architecture Guide" class="createlink">Architecture Guide<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=XQuery%20DAS%20Java%20Doc&linkCreation=true&fromPageId=50969" title="Create Page: XQuery DAS Java Doc" class="createlink">Java Doc<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+
+<H4><A name="XQueryJavaDAS-Development"></A>Development</H4>
+<P><SPAN class="nobr"><A href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=TUSCANY&title=Source%20Code&linkCreation=true&fromPageId=50969" title="Create Page: Source Code" class="createlink">Source Code<SUP><IMG class="rendericon" src="http://cwiki.apache.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN><BR>
+<A href="das-java-developer-guide.html" title="DAS Java Developer Guide">Get Involved</A></P></TD>
+<TD class="confluenceTd" valign="top" width="88%">
+
+
+<H4><A name="XQueryJavaDAS-WhatisXQueryDataAccessService%3F"></A>What is XQuery Data Access Service?</H4>
+
+<P>This project is in progress. Please see mailing list for more detail.<BR>
+Please help to update this page. Thank you <IMG class="emoticon" src="http://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0"></P>
+</TD></TR></TBODY></TABLE>
+            </DIV>
+        </DIV>
+    </DIV>
+                </TD>
+            </TR>
+        </TABLE>
+
+                <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </SCRIPT>
+    <SCRIPT type="text/javascript">
+       _uacct = "UA-1174707-5";
+       urchinTracker();
+    </SCRIPT>
+
+    <DIV class="footer">
+        Copyright &copy; 2003-2007, The Apache Software Foundation&nbsp;&nbsp;
+    </DIV>
+
+    </BODY>
+</HTML>
+\ No newline at end of file
author	coreyg <coreyg@13f79535-47bb-0310-9956-ffa450edef68>	2014-11-21 09:30:19 +0000
committer	coreyg <coreyg@13f79535-47bb-0310-9956-ffa450edef68>	2014-11-21 09:30:19 +0000
commit	200a40b332420f94992eb39a6d0ea1cf1490ffc4 (patch)
tree	1c76ef1d254c7bfc91128a313d319bd60da9d01e
parent	85f53ab6ab4f664d63774c94b672a875c9e52b8a (diff)